20 lines
946 B
Plaintext
20 lines
946 B
Plaintext
$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
|