CVS: tmda/bin tmda-inject,1.94,1.95

"Jason R. Mastaler" <[email protected]> Thu, 05 Feb 2004 13:11:53 -0800
Newsgroups gmane.mail.spam.tmda.cvs
Message-ID <[email protected]>
Update of /cvsroot/tmda/tmda/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31927/bin

Modified Files:
	tmda-inject 
Log Message:
Reverse an earlier, stupid change.  There is no need to globally
look for $TMDAINJECT since those who want to do this can easily
from their own TMDA config.


Index: tmda-inject
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-inject,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- tmda-inject	5 Feb 2004 21:03:49 -0000	1.94
+++ tmda-inject	5 Feb 2004 21:11:51 -0000	1.95
@@ -280,11 +280,13 @@
         del msg['Mail-Followup-To']
 	msg['Mail-Followup-To'] = ', '.join(new_mft_list)
     # Possibly add a `Date' field.
-    if 'd' in Defaults.TMDAINJECT or not msg.has_key('date'):
+    if ((Defaults.TMDAINJECT and 'd' in list(Defaults.TMDAINJECT))
+        or not msg.has_key('date')):
         del msg['Date']
 	msg['Date'] = Util.make_date()
     # Possibly add a `Message-ID' field.
-    if 'i' in Defaults.TMDAINJECT or not msg.has_key('message-id'):
+    if ((Defaults.TMDAINJECT and 'i' in list(Defaults.TMDAINJECT))
+        or not msg.has_key('message-id')):
         del msg['Message-ID']
 	msg['Message-ID'] = Util.make_msgid()
     # Add `X-Delivery-Agent' header.