SF.net SVN: tmda: [2127] trunk/tmda/bin

Revision: 2127
          http://svn.sourceforge.net/tmda/?rev=2127&view=rev
Author:   srwarren
Date:     2006-11-14 14:21:44 -0800 (Tue, 14 Nov 2006)

Log Message:
-----------
tmda-ofmipd: Use -f option when calling sendmail_program, so the SMTP enveloper sender is passed from MUA to MTA

Modified Paths:
--------------
    trunk/tmda/bin/ChangeLog
    trunk/tmda/bin/tmda-ofmipd

Modified: trunk/tmda/bin/ChangeLog
===================================================================
--- trunk/tmda/bin/ChangeLog	2006-11-14 02:15:32 UTC (rev 2126)
+++ trunk/tmda/bin/ChangeLog	2006-11-14 22:21:44 UTC (rev 2127)
@@ -1,3 +1,9 @@
+2006-11-14  Stephen Warren  <[email protected]>
+
+	* tmda-ofmipd: Import part of Robert P. Thille's patch;
+	Pass "-f sender" option to sendmail program, so the SMTP envelope
+	sender is passed along the chain from the MUA to the MTA.
+
 2006-10-29  Jason R. Mastaler  <[email protected]>
 
 	* tmda-ofmipd (FQDN): Fall back to gethostname() if getfqdn() only

Modified: trunk/tmda/bin/tmda-ofmipd
===================================================================
--- trunk/tmda/bin/tmda-ofmipd	2006-11-14 02:15:32 UTC (rev 2126)
+++ trunk/tmda/bin/tmda-ofmipd	2006-11-14 22:21:44 UTC (rev 2127)
@@ -1120,7 +1120,7 @@
                                              (vhomedir, '.tmda', 'config')):
             sendmail_program = os.environ.get('TMDA_SENDMAIL_PROGRAM') \
                                or '/usr/sbin/sendmail'
-            inject_cmd = [sendmail_program, '-i', '--'] + rcpttos
+            inject_cmd = [sendmail_program, '-f', mailfrom, '-i', '--'] + rcpttos
         try:
             Util.pipecmd(inject_cmd, data)
         except Exception, err:
@@ -1147,7 +1147,7 @@
         if opts.pure_proxy and not os.path.exists(tmda_configfile):
             sendmail_program = os.environ.get('TMDA_SENDMAIL_PROGRAM') \
                                or '/usr/sbin/sendmail'
-            inject_cmd = [sendmail_program, '-i', '--'] + rcpttos
+            inject_cmd = [sendmail_program, '-f', mailfrom, '-i', '--'] + rcpttos
         else:
             execdir = os.path.dirname(os.path.abspath(program))
             inject_path = os.path.join(execdir, 'tmda-inject')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.