diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Bouncers/Microsoft.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Mailman/Bouncers/Microsoft.py b/Mailman/Bouncers/Microsoft.py index 65d49cc1..f14268a9 100644 --- a/Mailman/Bouncers/Microsoft.py +++ b/Mailman/Bouncers/Microsoft.py @@ -1,23 +1,24 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2003 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """Microsoft's `SMTPSVC' nears I kin tell.""" import re from cStringIO import StringIO +from types import ListType scre = re.compile(r'transcript of session follows', re.IGNORECASE) @@ -32,7 +33,11 @@ def process(msg): except IndexError: # The message *looked* like a multipart but wasn't return None - body = StringIO(subpart.get_payload()) + data = subpart.get_payload() + if isinstance(data, ListType): + # The message is a multi-multipart, so not a matching bounce + return None + body = StringIO(data) state = 0 addrs = [] while 1: |