CVS: tmda/TMDA ChangeLog,1.302,1.303 Util.py,1.111,1.112

Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1:/tmp/cvs-serv30734

Modified Files:
	ChangeLog Util.py 
Log Message:
bugfix applied from release-1-0 branch

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- ChangeLog	10 Dec 2003 07:36:55 -0000	1.302
+++ ChangeLog	9 Jan 2004 19:23:15 -0000	1.303
@@ -1,3 +1,9 @@
+2004-01-09  Jason R. Mastaler  <[email protected]>
+
+	* Util.py (confirm_append_address): Return the envelope sender
+	address immediately if either the Return-Path address or
+	X-Primary-Address is not in user@hostname format.
+
 2003-12-10  Tim Legant  <[email protected]>
 
 	* Pending.py (Message.show): Change implementation to catch

Index: Util.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Util.py,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- Util.py	1 Jan 2004 23:22:19 -0000	1.111
+++ Util.py	9 Jan 2004 19:23:15 -0000	1.112
@@ -461,9 +461,11 @@
     rp is the envelope sender address.
 
     Compare the two addresses, and return the address appropriate for
-    CONFIRM_APPEND use based on the PRIMARY_ADDRESS_MATCH setting.
+    CONFIRM_APPEND based on the PRIMARY_ADDRESS_MATCH setting.
     """
     if not xp:
+        return rp
+    if '@' not in rp or '@' not in xp:
         return rp
     import Defaults
     rpl = rp.lower()