------------------------------------------------------------
revno: 1137
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Tue 2011-01-04 15:44:56 -0800
message:
  - Updated contrib/mm-handler-2.1.10 to better handle lists with names that
    look like admin addresses.  Bug #697161.
modified:
  NEWS
  contrib/README.mm-handler-2.1.10
  contrib/mm-handler-2.1.10


--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2

Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'NEWS'
--- NEWS	2010-12-22 16:15:17 +0000
+++ NEWS	2011-01-04 23:44:56 +0000
@@ -1,5 +1,5 @@
 Mailman - The GNU Mailing List Management System
-Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
+Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 Here is a history of user visible changes to Mailman.
@@ -83,6 +83,9 @@
 
   Bug Fixes and other patches
 
+    - Updated contrib/mm-handler-2.1.10 to better handle lists with names that
+      look like admin addresses.  Bug #697161.
+
     - Added bounce recognition for a bogus Dovecot MDN.  Bug #693134.
 
     - Fixed a problem where an emailed command in the Subject: header with a

=== modified file 'contrib/README.mm-handler-2.1.10'
--- contrib/README.mm-handler-2.1.10	2008-04-21 17:53:20 +0000
+++ contrib/README.mm-handler-2.1.10	2011-01-04 23:44:56 +0000
@@ -27,3 +27,5 @@
 at <http://mail.python.org/pipermail/mailman-developers/2008-March/thread.html>
 for background and further information.
 
+Note - 2011-01-04: mm-handler-2.1.10 has been patched with the patch in the
+bug report at <https://bugs.launchpad.net/mailman/+bug/697161> which see.

=== modified file 'contrib/mm-handler-2.1.10'
--- contrib/mm-handler-2.1.10	2008-04-21 17:53:20 +0000
+++ contrib/mm-handler-2.1.10	2011-01-04 23:44:56 +0000
@@ -176,7 +176,12 @@
 		# If an undefined action, restore list name
 		$list = $addr;
 		$cmd = "post";
+	} elsif (! list_exists($list) and list_exists("$list-$cmd")) {
+	# Supposed command is actually part of list name, restore list name
+		$list = $addr;
+		$cmd = "post";
 	}
+
 	## Otherwise use $list and $cmd as already assigned
 
 	return ($list, $cmd);
@@ -186,8 +191,8 @@
 sub list_exists {
 	my ($name) = @_;
 
-	return 1 if (-f "$MMLISTDIR/$list/config.pck");
-	return 1 if (-f "$MMLISTDIR/$list/config.db");
+	return 1 if (-f "$MMLISTDIR/$name/config.pck");
+	return 1 if (-f "$MMLISTDIR/$name/config.db");
 	return 0;
 }
 

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to