diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2014-09-23 20:22:43 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2014-09-23 20:22:43 +0200 |
| commit | 4b8451d844c627ad4710c0efec58ad6de8defe9e (patch) | |
| tree | 314cc457cb9ec5bc9aeca6c29f7d666e5ce427ac /postfix | |
| parent | 42504c14a8038bad59c8e89f92619e7154c922e1 (diff) | |
Really fix suppress dkimproxy restriction when not used.
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 2860cdc..dce2c4e 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -193,7 +193,7 @@ getlinesfromfile() { case "$subparam" in *=) oldparam="`echo $subparam | awk -F= '{print $1}'`" - replacements="$replacements;s/$oldparam[^,]*,\?//" + replacements="$replacements;s/,*[^,]*$oldparam[^,]*,*/,/" continue ;; *=*=*) @@ -248,7 +248,7 @@ $postconf -c "$tempdir" -e "`getlinesfromfile permit_mx_backup_networks`" $postconf -c "$tempdir" -e "maps_rbl_domains =" $postconf -c "$tempdir" -e "`getlinesfromfile smtpd_client_restrictions reject_rhsbl_client`" $postconf -c "$tempdir" -e "`getlinesfromfile smtpd_helo_restrictions`" -$postconf -c "$tempdir" -e "`getlinesfromfile smtpd_sender_restrictions reject_rhsbl_sender ${dkimproxy:-check_sender_access=}`" +$postconf -c "$tempdir" -e "`getlinesfromfile smtpd_sender_restrictions reject_rhsbl_sender ${dkimproxy:-sender_access_regex=}`" $postconf -c "$tempdir" -e "`getlinesfromfile smtpd_recipient_restrictions reject_maps_rbl=reject_rbl_client=maps_rbl_domains`" $postconf -c "$tempdir" -e "`getlinesfromfile smtpd_data_restrictions`" |