Fix Mailman bounce reception

diff --git a/conf.d/acl/30_exim4-config_check_rcpt b/conf.d/acl/30_exim4-config_check_rcpt
index 870ed29..ac8bc53 100644 (file)
--- a/conf.d/acl/30_exim4-config_check_rcpt
+++ b/conf.d/acl/30_exim4-config_check_rcpt
@@ -120,12 +120,16 @@ acl_check_rcpt:
   warn
     message = X-WhitelistedRCPT-nohdrfromcallback: Yes
     condition = ${if and {{match{$local_part}{(.*)-bounces\+.*}} \
-                          {exists {MAILMAN_LISTCHK}}} \
+                          {def:domain} \
+                          {eq {${lookup{$local_part}lsearch{MAILMAN_DB}}} \
+                              {$domain}}} \
                      {yes}{no}}
 
   accept
     condition = ${if and {{match{$local_part}{(.*)-bounces\+.*}} \
-                          {exists {MAILMAN_LISTCHK}}} \
+                          {def:domain} \
+                          {eq {${lookup{$local_part}lsearch{MAILMAN_DB}}} \
+                              {$domain}}} \
                      {yes}{no}}
 
   # Verify senders listed in local_sender_callout with a callout.

diff --git a/conf.d/main/20_mailman-macros b/conf.d/main/20_mailman-macros
index d25032a..38bd7c1 100644 (file)
--- a/conf.d/main/20_mailman-macros
+++ b/conf.d/main/20_mailman-macros
@@ -18,9 +18,5 @@ MAILMAN_GROUP=list
 # These values are derived from the ones above and should not need
 # editing unless you have munged your mailman installation
 
-# The path of the list config file (used as a required file when
-# verifying list addresses)
-#MAILMAN_LISTCHK=MAILMAN_HOME/lists/${lc::$local_part}/config.pck
-
 # hcoop-change: Used for looking up a user and domain Mailman mapping.
 MAILMAN_DB=/etc/exim4/mailmandb