CVS: tmda/TMDA ChangeLog,1.309,1.310 Defaults.py,1.196,1.197

Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31927/TMDA

Modified Files:
	ChangeLog Defaults.py 
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: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- ChangeLog	5 Feb 2004 21:03:50 -0000	1.309
+++ ChangeLog	5 Feb 2004 21:11:51 -0000	1.310
@@ -22,9 +22,6 @@
 	* Pending.py (Message.release): Use Util.make_date() for
 	X-TMDA-Released.
 	
-	* Defaults.py (TMDAINJECT): Look for $TMDAINJECT in the
-	environment first.
-	
 2004-01-09  Jason R. Mastaler  <[email protected]>
 
 	* Defaults.py (DATED_TIMEOUT): TIMEOUT renamed.

Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- Defaults.py	5 Feb 2004 21:03:50 -0000	1.196
+++ Defaults.py	5 Feb 2004 21:11:51 -0000	1.197
@@ -1464,19 +1464,14 @@
 #       existing Message-ID fields.  Normally tmda-inject only adds a
 #       Message-ID field if the incoming message lacks one.
 #
-# TMDAINJECT is looked for in the environment first.
-#
 # Examples:
 #
 # TMDAINJECT = "i"
 # TMDAINJECT = "di"
 #
 # No default.
-env_TMDAINJECT = os.environ.get('TMDAINJECT')
-if env_TMDAINJECT:
-    TMDAINJECT = env_TMDAINJECT
-elif not vars().has_key('TMDAINJECT'):
-    TMDAINJECT = ''
+if not vars().has_key('TMDAINJECT'):
+    TMDAINJECT = None
 
 # MAIL_FOLLOWUP_TO
 # Inspired by qmail-inject's QMAILMFTFILE feature, MAIL_FOLLOWUP_TO