Bug#376549: add override macros to turn ACL warn into deny

[Robert Millan]

Package: exim4-config
Version: 4.62-1
Severity: wishlist
Tags: patch

The following patch adds override macros to turn ACL warns in
30_exim4-config_check_rcpt into denys.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-1-amd64-k8
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)

Versions of packages exim4-config depends on:
ii  adduser                       3.87       Add and remove users and groups
ii  debconf [debconf-2.0]         1.5.2      Debian configuration management sy

exim4-config recommends no packages.

-- debconf information excluded
-------------- next part --------------
diff -ur exim4-4.62.old/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt exim4-4.62/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt
--- exim4-4.62.old/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt	2006-07-03 17:20:52.000000000 +0200
+++ exim4-4.62/debian/debconf/conf.d/acl/30_exim4-config_check_rcpt	2006-07-03 17:53:21.000000000 +0200
@@ -201,8 +201,13 @@
   # this instead of !verify = reverse_host_lookup to catch deferrals
   # as well as outright failures.
   .ifdef CHECK_RCPT_REVERSE_DNS
+  .ifdef CHECK_RCPT_REVERSE_DNS_DENY
+  deny
+    message = Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}})
+  .else
   warn
     message = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}})
+  .endif
      condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\
                       {yes}{no}}
   .endif
@@ -211,8 +216,13 @@
   # Check against classic DNS "black" lists (DNSBLs) which list
   # sender IP addresses
   .ifdef CHECK_RCPT_IP_DNSBLS
+  .ifdef CHECK_RCPT_IP_DNSBLS_DENY
+  deny
+    message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
+  .else
   warn
     message = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
+  .endif
     log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
     dnslists = CHECK_RCPT_IP_DNSBLS
   .endif
@@ -222,8 +232,13 @@
   # whitelist certain domains that might be blacklisted. If you want one
   # blacklist per domain, you need to replicate the stanza for each DNSBL.
   .ifdef CHECK_RCPT_DOMAIN_DNSBLS
+  .ifdef CHECK_RCPT_DOMAIN_DNSBLS_DENY
+  deny
+    message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
+  .else
   warn
     message = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
+  .endif
     log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
     !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\
                     {CONFDIR/local_domain_dnsbl_whitelist}\