- Updated contrib/mm-handler-2.1.10 to better handle lists with names that

  look like admin addresses.  Bug #697161.

2 files changed, 9 insertions, 2 deletions

diff --git a/contrib/README.mm-handler-2.1.10 b/contrib/README.mm-handler-2.1.10
index 579f3e44..1a65541c 100644
--- a/contrib/README.mm-handler-2.1.10
+++ b/contrib/README.mm-handler-2.1.10
@@ -27,3 +27,5 @@ installation", "anti-backscatter mm-handler ..." and "mm-handler 2.1.10 ..."
 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.
diff --git a/contrib/mm-handler-2.1.10 b/contrib/mm-handler-2.1.10
index a920b10d..1ff5703d 100644
--- a/contrib/mm-handler-2.1.10
+++ b/contrib/mm-handler-2.1.10
@@ -176,7 +176,12 @@ sub split_addr {
 		# 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 split_addr {
 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;
 }