Fix for bug 125516: the recent fix for emails truncating when a period occurred on a line by itself broke Exim because it

needs the -t and -i as separate parameters instead of stacked (the original patch had -ti)
Patch by Tobias Burnus <burnus@gmx.de>
r= justdave, gerv
This commit is contained in:
justdave%syndicomm.com 2002-02-17 08:22:31 +00:00
parent 4f84a8b219
commit 065a93f81a
8 changed files with 10 additions and 10 deletions

View File

@ -101,7 +101,7 @@ sub MailPasswordToken {
my $emailsuffix = &::Param('emailsuffix');
$token = &::url_quote($token);
open SENDMAIL, "|/usr/lib/sendmail -ti";
open SENDMAIL, "|/usr/lib/sendmail -t -i";
print SENDMAIL qq|From: bugzilla-daemon
To: $emailaddress$emailsuffix
@ -144,7 +144,7 @@ sub Cancel {
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
# Notify the user via email about the cancellation.
open SENDMAIL, "|/usr/lib/sendmail -ti";
open SENDMAIL, "|/usr/lib/sendmail -t -i";
print SENDMAIL qq|From: bugzilla-daemon
To: $username
Subject: "$tokentype" token cancelled

View File

@ -762,7 +762,7 @@ sub MailPassword {
"login" => $login,
"password" => $password});
open SENDMAIL, "|/usr/lib/sendmail -ti";
open SENDMAIL, "|/usr/lib/sendmail -t -i";
print SENDMAIL $msg;
close SENDMAIL;
}

View File

@ -101,7 +101,7 @@ sub MailPasswordToken {
my $emailsuffix = &::Param('emailsuffix');
$token = &::url_quote($token);
open SENDMAIL, "|/usr/lib/sendmail -ti";
open SENDMAIL, "|/usr/lib/sendmail -t -i";
print SENDMAIL qq|From: bugzilla-daemon
To: $emailaddress$emailsuffix
@ -144,7 +144,7 @@ sub Cancel {
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
# Notify the user via email about the cancellation.
open SENDMAIL, "|/usr/lib/sendmail -ti";
open SENDMAIL, "|/usr/lib/sendmail -t -i";
print SENDMAIL qq|From: bugzilla-daemon
To: $username
Subject: "$tokentype" token cancelled

View File

@ -1432,7 +1432,7 @@ sub RemoveVotes {
if (Param('sendmailnow')) {
$sendmailparm = '';
}
if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -ti")) {
if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -t -i")) {
my %substs;
$substs{"to"} = $name;

View File

@ -114,7 +114,7 @@ sub MailMessage {
$header.= "Subject: $subject\n\n";
open(SENDMAIL,
"|/usr/lib/sendmail -ODeliveryMode=background -ti") ||
"|/usr/lib/sendmail -ODeliveryMode=background -t -i") ||
die "Can't open sendmail";
print SENDMAIL $header . $message . "\n";
close SENDMAIL;

View File

@ -154,7 +154,7 @@ $msg .= "Subject: Moving bug(s) $buglist\n\n";
$msg .= $xml . "\n";
open(SENDMAIL,
"|/usr/lib/sendmail -ODeliveryMode=background -ti") ||
"|/usr/lib/sendmail -ODeliveryMode=background -t -i") ||
die "Can't open sendmail";
print SENDMAIL $msg;
close SENDMAIL;

View File

@ -771,7 +771,7 @@ sub NewProcessOnePerson ($$$$$$$$$$$$) {
}
if ($enableSendMail == 1) {
open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -ti") ||
open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t -i") ||
die "Can't open sendmail";
print SENDMAIL trim($msg) . "\n";

View File

@ -64,7 +64,7 @@ foreach my $email (sort (keys %bugs)) {
}
my $sendmailparam = Param('sendmailnow') ? '' : "-ODeliveryMode=deferred";
open SENDMAIL, "|/usr/lib/sendmail $sendmailparam -ti"
open SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t -i"
or die "Can't open sendmail";
print SENDMAIL $msg;
close SENDMAIL;