From 77e621049f1970fc615db7c2d997c52f837b4990 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 8 Oct 2020 19:10:20 +0200
Subject: remove unused options (not explicitly set the empty value)

---
 postfix/postfix.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'postfix')

diff --git a/postfix/postfix.sh b/postfix/postfix.sh
index cb4b86c..78eed19 100755
--- a/postfix/postfix.sh
+++ b/postfix/postfix.sh
@@ -264,28 +264,24 @@ $postconf -c "$tempdir" -e "unverified_recipient_reject_code = 550"
 
 if [ -n "$dovecot_lmtp" ]; then
 	$postconf -c "$tempdir" -e mailbox_transport=lmtp:unix:private/dovecot-lmtp
-	$postconf -c "$tempdir" -e mailbox_command=
+	$postconf -c "$tempdir" -X mailbox_command
 elif [ -n "$dovecot_deliver" ]; then
-	$postconf -c "$tempdir" -e mailbox_transport=
+	$postconf -c "$tempdir" -X mailbox_transport
 	$postconf -c "$tempdir" -e mailbox_command=/usr/lib/dovecot/deliver
 else
-	$postconf -c "$tempdir" -e mailbox_transport=
-	$postconf -c "$tempdir" -e mailbox_command=
+	$postconf -c "$tempdir" -X mailbox_transport
+	$postconf -c "$tempdir" -X mailbox_command
 fi
 if [ -n "$sasl" ]; then
 	$postconf -c "$tempdir" -e smtpd_sasl_type=dovecot
 	$postconf -c "$tempdir" -e smtpd_sasl_path=private/auth
 fi
-# Avoid smtpd_tls_CApath or smtpd_tls_CAfile to trick outlook.com
-# See <http://postfix.1071664.n5.nabble.com/Problems-with-incoming-mails-from-outlook-com-td78356.html>
 if [ -n "$sslcert" ]; then
 	$postconf -c "$tempdir" -e 'smtpd_tls_cert_file = /etc/ssl/certs/postfix.pem'
 	$postconf -c "$tempdir" -e 'smtpd_tls_loglevel = 1'
 	$postconf -c "$tempdir" -e 'smtpd_use_tls = yes'
 	$postconf -c "$tempdir" -e 'smtp_tls_CApath = /etc/ssl/certs'
-	$postconf -c "$tempdir" -e 'smtpd_tls_CApath = '
 	$postconf -c "$tempdir" -e 'lmtp_tls_CApath = /etc/ssl/certs'
-	$postconf -c "$tempdir" -e 'smtpd_tls_CAfile = '
 	$postconf -c "$tempdir" -e smtp_tls_CAfile="${cacert_smtp:-$cacert_default}"
 	$postconf -c "$tempdir" -e lmtp_tls_CAfile="${cacert_lmtp:-$cacert_default}"
 	$postconf -c "$tempdir" -e 'smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache'
@@ -294,7 +290,6 @@ if [ -n "$sslcert" ]; then
 	$postconf -c "$tempdir" -e 'smtpd_tls_auth_only = yes'
 	$postconf -c "$tempdir" -e 'smtpd_sasl_auth_enable = no' # SASL is enabled explicitly with TLS transport
 	$postconf -c "$tempdir" -e 'smtpd_sasl_security_options = noanonymous'
-	$postconf -c "$tempdir" -e 'smtpd_sasl_local_domain = '
 	$postconf -c "$tempdir" -e 'smtpd_tls_received_header = yes'
 	$postconf -c "$tempdir" -e 'broken_sasl_auth_clients = yes'
 	$postconf -c "$tempdir" -e 'tls_random_source = dev:/dev/urandom'
@@ -319,6 +314,11 @@ if [ -n "$sslcert" ]; then
 		warn "No client-side TLS - requires private SSL certificate at /etc/ssl/private/postfix.pem."
 	fi
 fi
+$postconf -c "$tempdir" -X smtpd_sasl_local_domain
+# Avoid smtpd_tls_CApath or smtpd_tls_CAfile to trick outlook.com
+# See <http://postfix.1071664.n5.nabble.com/Problems-with-incoming-mails-from-outlook-com-td78356.html>
+$postconf -c "$tempdir" -X smtpd_tls_CApath
+$postconf -c "$tempdir" -X smtpd_tls_CAfile
 
 if [ -n "$amavis" ]; then
 	$postconf -c "$tempdir" -e 'max_use = 10' # Avoid too much reuse
@@ -398,8 +398,8 @@ pickup	fifo	n	-	-	60	1	pickup
 EOF
 	fi
 else
-	$postconf -c "$tempdir" -e content_filter=
-	$postconf -c "$tempdir" -e receive_override_options=
+	$postconf -c "$tempdir" -X content_filter
+	$postconf -c "$tempdir" -X receive_override_options
 fi
 
 diff -ruN "$confdir" "$tempdir" || if [ $? -gt 1 ]; then exit $?; else needs_reload="1"; fi
-- 
cgit v1.2.3