Fix for bug 117055: Emails were being truncated if they contained a line with nothing...

sendmail and its clones to tell it to ignore periods (since we close the pipe when we're done, rather than signalling it with
a period).  Has been tested with sendmail and postfix.
Patch by Dave Miller <justdave@syndicomm.com>
r= afranke, bugzilla@bkor.dhs.org, jake

diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index f2c5fbde73f312ed120408b6dec4ae7fd9da6bb8..1cff2fac230bc154af559bac26c9c5b215e30de8 100644 (file)
--- 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 -t";
+    open SENDMAIL, "|/usr/lib/sendmail -ti";
 
     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 -t";
+    open SENDMAIL, "|/usr/lib/sendmail -ti";
     print SENDMAIL qq|From: bugzilla-daemon
 To: $username
 Subject: "$tokentype" token cancelled

diff --git a/CGI.pl b/CGI.pl
index 9875b85ddad6989efa70ce141f86866aabc64a02..ab49fffcf40e7a60c12ea3abe849c8dbd0387f3b 100644 (file)
--- a/CGI.pl
+++ b/CGI.pl
@@ -762,7 +762,7 @@ sub MailPassword {
                              "login" => $login,
                              "password" => $password});
 
-    open SENDMAIL, "|/usr/lib/sendmail -t";
+    open SENDMAIL, "|/usr/lib/sendmail -ti";
     print SENDMAIL $msg;
     close SENDMAIL;
 }

diff --git a/Token.pm b/Token.pm
index f2c5fbde73f312ed120408b6dec4ae7fd9da6bb8..1cff2fac230bc154af559bac26c9c5b215e30de8 100644 (file)
--- 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 -t";
+    open SENDMAIL, "|/usr/lib/sendmail -ti";
 
     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 -t";
+    open SENDMAIL, "|/usr/lib/sendmail -ti";
     print SENDMAIL qq|From: bugzilla-daemon
 To: $username
 Subject: "$tokentype" token cancelled

diff --git a/globals.pl b/globals.pl
index 845e6ed9ab930dfd99039aff4d9ee8a6cd0a2c1a..f88347f13d88c40d6fe97340fb57c0a4a85c028c 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -1433,7 +1433,7 @@ sub RemoveVotes {
             if (Param('sendmailnow')) {
                $sendmailparm = '';
             }
-            if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -t")) {
+            if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -ti")) {
                 my %substs;
 
                 $substs{"to"} = $name;

diff --git a/importxml.pl b/importxml.pl
index e3532c53acf905cd0cc2e02851621e9ad0577952..584855e291e2eeb699e2254c115eec33ad4c77e6 100755 (executable)
--- a/importxml.pl
+++ b/importxml.pl
@@ -114,7 +114,7 @@ sub MailMessage {
   $header.= "Subject: $subject\n\n";
 
   open(SENDMAIL,
-    "|/usr/lib/sendmail -ODeliveryMode=background -t") ||
+    "|/usr/lib/sendmail -ODeliveryMode=background -ti") ||
       die "Can't open sendmail";
   print SENDMAIL $header . $message . "\n";
   close SENDMAIL;

diff --git a/move.pl b/move.pl
index 9647aee4324dd7bbdf3cb332f7e458c06261cdd1..e82678d44cb33776dba47fc9ef9121c7c98edca8 100755 (executable)
--- a/move.pl
+++ b/move.pl
@@ -150,7 +150,7 @@ $msg .= "Subject: Moving bug(s) $buglist\n\n";
 $msg .= $xml . "\n";
 
 open(SENDMAIL,
-  "|/usr/lib/sendmail -ODeliveryMode=background -t") ||
+  "|/usr/lib/sendmail -ODeliveryMode=background -ti") ||
     die "Can't open sendmail";
 print SENDMAIL $msg;
 close SENDMAIL;

diff --git a/processmail b/processmail
index 844942728593903ecf62ed264c1495ce822ab9b3..4fcc424d2b98b2513309c0086bb6bc5bbc7d4e0d 100755 (executable)
--- a/processmail
+++ b/processmail
@@ -771,7 +771,7 @@ sub NewProcessOnePerson ($$$$$$$$$$$$) {
     }
 
     if ($enableSendMail == 1) {
-    open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t") ||
+    open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -ti") ||
       die "Can't open sendmail";
     
     print SENDMAIL trim($msg) . "\n";

diff --git a/whineatnews.pl b/whineatnews.pl
index ba258ddca3e7184b046cacb641bc3a3c89d7f7c5..0b5d78eba0c5b519916591717021ee91a6f9bf96 100755 (executable)
--- 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 -t"
+    open SENDMAIL, "|/usr/lib/sendmail $sendmailparam -ti"
         or die "Can't open sendmail";
     print SENDMAIL $msg;
     close SENDMAIL;