diff options
| author | root <root@jones.dk> | 2013-01-29 20:31:34 +0100 |
|---|---|---|
| committer | root <root@jones.dk> | 2013-01-29 20:31:34 +0100 |
| commit | 592fdbc6b3c9105274e3a4c09c5614b58559f833 (patch) | |
| tree | e4c9ca54f91de311fd5c3c565993969afd9b66e4 | |
| parent | 45f087de3b944d28019c8e842605ebfd7ae7a63b (diff) | |
Fix clear dkimproxy if previously used.
| -rwxr-xr-x | postfix/postfix.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 21a0555..3f5467a 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -237,6 +237,7 @@ $postconf -c "$tempdir" -e "`getlinesfromfile smtpd_sender_restrictions reject_r $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`" +# FIXME: clear only specific line (not whole file) when dkimproxy unused if [ -n "$dkimproxy" ]; then [ -f "$tempdir/sender_access_regex" ] \ && grep -q -F '/^/ FILTER dkimsign:[127.0.0.1]:10026' "$tempdir/sender_access_regex" \ @@ -244,10 +245,11 @@ if [ -n "$dkimproxy" ]; then else if [ -f "$tempdir/sender_access_regex" ]; then if grep -q -F '/^/ FILTER dkimsign:[127.0.0.1]:10026' "$tempdir/sender_access_regex"; then - echo "touch \"$confdir/sender_access_regex\"" >> "$tempdir/COMMANDS" + echo "echo '' > \"$confdir/sender_access_regex\"" >> "$tempdir/COMMANDS" fi fi fi +postmapfiles="$postmapfiles sender_access_regex" # Support exceptions to default response # (Day Old Bread (dob) lists need to reject only temporarily) |