d735959a95
* The snapshot of the wiki documentation is now included within the main tmda-1.1.x.tgz tarball in the 'doc' directory rather than in a separate tmda-1.1.x-doc.tgz tarball. * New feature courtesy of Vitor Espindola. A new configuration variable, TIMEOUT_UNITS, to give users the ability to customize the timeout unit value strings in the templates instead of using the English defaults of "years", "months", "weeks", "days", "hours", "minutes", and "seconds". For more information, see http://wiki.tmda.net/ConfigurationVariables#TIMEOUT_UNITS * Virtual domain improvements to tmda-pending courtesy of Lloyd Zusman. A '--vhost-script' command-line option has been added to match tmda-ofmipd and tmda-filter. Also two new options have been added, '--vhost-user' and '--vhost-domain'. See the tmda-pending --help output for more information, or for greater detail, see http://article.gmane.org/gmane.mail.spam.tmda.devel/6584 * An alternative "simpler" example of how to use TLS with tmda-ofmipd via stunnel has been added. See the contrib/ofmipd-stunnel-daemons/ directory. * A bug that broke tmda-filter's '-e' command-line option has been fixed.
19 lines
946 B
Text
19 lines
946 B
Text
$NetBSD: patch-ab,v 1.2 2007/02/26 03:44:21 schmonz Exp $
|
|
|
|
--- TMDA/Util.py.orig 2007-02-23 15:20:10.000000000 -0500
|
|
+++ TMDA/Util.py
|
|
@@ -584,7 +584,13 @@ def sendmail(msgstr, envrecip, envsender
|
|
Defaults.MAIL_TRANSFER_AGENT in ('postfix', 'qmail') and \
|
|
Defaults.MAIL_TRANSPORT == 'sendmail':
|
|
envsender = ''
|
|
- if Defaults.MAIL_TRANSPORT == 'sendmail':
|
|
+ if Defaults.MAIL_TRANSPORT == 'sendmail' and \
|
|
+ Defaults.MAIL_TRANSFER_AGENT == 'qmail':
|
|
+ # skip "-i" for qmail-inject (invalid option, and it's the default)
|
|
+ cmd = (Defaults.SENDMAIL_PROGRAM,
|
|
+ '-f', envsender, '--', envrecip)
|
|
+ pipecmd(cmd, msgstr)
|
|
+ elif Defaults.MAIL_TRANSPORT == 'sendmail':
|
|
# You can avoid the shell by passing a tuple of arguments as
|
|
# the command instead of a string. This will cause the
|
|
# popen2.Popen3() code to execvp() "/usr/bin/sendmail" with
|