summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustdave%syndicomm.com <>2002-02-17 17:22:29 +0100
committerjustdave%syndicomm.com <>2002-02-17 17:22:29 +0100
commit3d96b37a3fe7be31a11c6313746f41341ee365c8 (patch)
tree30b239a5776489429937f938449b5c48c6baafc7
parent115bce1c6eac26f5407a8b741bf6cbbe3b0366fb (diff)
downloadbugzilla-3d96b37a3fe7be31a11c6313746f41341ee365c8.tar.gz
bugzilla-3d96b37a3fe7be31a11c6313746f41341ee365c8.tar.xz
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
-rw-r--r--Bugzilla/Token.pm4
-rw-r--r--CGI.pl2
-rw-r--r--Token.pm4
-rw-r--r--globals.pl2
-rwxr-xr-ximportxml.pl2
-rwxr-xr-xmove.pl2
-rwxr-xr-xprocessmail2
-rwxr-xr-xwhineatnews.pl2
8 files changed, 10 insertions, 10 deletions
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 1cff2fac2..4f7f61882 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -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
diff --git a/CGI.pl b/CGI.pl
index ab49fffcf..f91cbd670 100644
--- a/CGI.pl
+++ b/CGI.pl
@@ -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;
}
diff --git a/Token.pm b/Token.pm
index 1cff2fac2..4f7f61882 100644
--- a/Token.pm
+++ b/Token.pm
@@ -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
diff --git a/globals.pl b/globals.pl
index deb433ab4..a1acb5a79 100644
--- a/globals.pl
+++ b/globals.pl
@@ -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;
diff --git a/importxml.pl b/importxml.pl
index 584855e29..f2ed77d5c 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -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;
diff --git a/move.pl b/move.pl
index 36b83a5fa..f38644358 100755
--- a/move.pl
+++ b/move.pl
@@ -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;
diff --git a/processmail b/processmail
index 4fcc424d2..2bea93da6 100755
--- a/processmail
+++ b/processmail
@@ -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";
diff --git a/whineatnews.pl b/whineatnews.pl
index 0b5d78eba..b364836a5 100755
--- a/whineatnews.pl
+++ b/whineatnews.pl
@@ -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;