fixed writing to log for DNSBL check

This commit is contained in:
Matthew Saunders Brown 2022-02-03 14:46:53 -08:00
parent d57821c329
commit dbf15265ab

View File

@ -608,17 +608,13 @@ acl_rcpt_to:
condition = ${if >{$runrc}{6}{yes}{no}} condition = ${if >{$runrc}{6}{yes}{no}}
log_message = Unexpected error in SPF check. spfquery returned $runrc log_message = Unexpected error in SPF check. spfquery returned $runrc
# check DNSbl(s) and if found add header for filtering to Junk # check DNSBL(s) and if found add header for filtering to Junk
accept accept
## condition = ${if and { \ !condition = ${if eq {$header_X-Whitelist-Flag:}{YES}}
## { ! def:header_X-DNS-Whitelist: } \ dnslists = zen.spamhaus.org
## { eq {$header_X-Whitelist-Flag:}{YES}} \ logwrite = Warning: $sender_host_address is listed in DNSBL $dnslist_domain ${if def:dnslist_text {($dnslist_text)}}
## } {yes}{no}} add_header = X-DNS-Blacklist: $sender_host_address is listed in $dnslist_domain ${if def:dnslist_text {($dnslist_text)}}
condition = ${if !eq {$header_X-Whitelist-Flag:}{YES}} add_header = X-Junk-Flag: YES
dnslists = zen.spamhaus.org
log_message = $sender_host_address is listed in $dnslist_domain ${if def:dnslist_text {($dnslist_text)}}
add_header = X-DNS-Blacklist: $sender_host_address is listed in $dnslist_domain ${if def:dnslist_text {($dnslist_text)}}
add_header = X-Junk-Flag: YES
# will never get here if X-Whitelist-Flag or X-Junk-Flag (gets set with X-DNS-Blacklist) or X-DNS-Whitelist headers are set above # will never get here if X-Whitelist-Flag or X-Junk-Flag (gets set with X-DNS-Blacklist) or X-DNS-Whitelist headers are set above
.ifdef GREYLIST_ENABLED .ifdef GREYLIST_ENABLED