merge and commit again

1 files changed, 6 insertions, 5 deletions

diff --git a/Mailman/Bouncers/SMTP32.py b/Mailman/Bouncers/SMTP32.py
index 3ad7ce44..f2397b24 100644
--- a/Mailman/Bouncers/SMTP32.py
+++ b/Mailman/Bouncers/SMTP32.py
@@ -1,17 +1,17 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
@@ -38,9 +38,10 @@ acre = re.compile(r'''
     |delivery\ failed[^:]*:                       # wild...
     |unknown\ user[^:]*:
     |undeliverable\ +to
+    |delivery\ userid[^:]*:
     )
     \s*                                           # space separator
-    (?P<addr>.*)                                  # and finally, the address
+    (?P<addr>[^\s]*)                              # and finally, the address
     ''', re.IGNORECASE | re.VERBOSE)