[Pkg-mailman-hackers] Pkg-mailman commit - rev 777 - in trunk/debian: . contrib

[Thijs Kinkhorst]

Author: thijs
Date: 2015-05-14 14:43:14 +0000 (Thu, 14 May 2015)
New Revision: 777

Modified:
   trunk/debian/changelog
   trunk/debian/contrib/postfix-to-mailman.py
Log:
Make postfix-to-mailman.py work with the full recipient email
address, solving an issue when recipient_delimiter = "-".
To take advantage of this, change "${user}" to "${recipient}"
in Postfix' master.cf. Patch by Brian O'Connor (Closes: #578986)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-05-14 14:29:28 UTC (rev 776)
+++ trunk/debian/changelog	2015-05-14 14:43:14 UTC (rev 777)
@@ -4,6 +4,10 @@
     - Drop obsolete patches:
       92_CVE-2015-2775.patch
   * Checked for policy 3.9.6, no changes.
+  * Make postfix-to-mailman.py work with the full recipient email
+    address, solving an issue when recipient_delimiter = "-".
+    To take advantage of this, change "${user}" to "${recipient}"
+    in Postfix' master.cf. Patch by Brian O'Connor (Closes: #578986)
 
  -- Thijs Kinkhorst <thijs at debian.org>  Thu, 14 May 2015 14:09:42 +0000
 

Modified: trunk/debian/contrib/postfix-to-mailman.py
===================================================================
--- trunk/debian/contrib/postfix-to-mailman.py	2015-05-14 14:29:28 UTC (rev 776)
+++ trunk/debian/contrib/postfix-to-mailman.py	2015-05-14 14:43:14 UTC (rev 777)
@@ -52,7 +52,7 @@
 # /etc/postfix/master.cf
 #    mailman unix  -       n       n       -       -       pipe
 #      flags=FR user=list 
-#      argv=/var/lib/mailman/bin/postfix-to-mailman.py ${nexthop} ${user}
+#      argv=/var/lib/mailman/bin/postfix-to-mailman.py ${nexthop} ${recipient}
 #
 # /etc/postfix/transport:
 #   lists.example.com   mailman:
@@ -100,7 +100,8 @@
         MailmanOwner = 'postmaster at localhost'
 
     try:
-        domain, local = [ a.lower() for a in sys.argv[1:] ]
+        domain, full = [ a.lower() for a in sys.argv[1:] ]
+        local = full.split("@")[0]
     except:
         # This might happen if we're not using Postfix or
         # /etc/postfix/master.cf is badly misconfigured