2 files changed, 8 insertions, 3 deletions

diff --git a/checksetup.pl b/checksetup.pl
index 17e510940..f0a7a3d77 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -1639,6 +1639,8 @@ if ( CountIndexes('cc') != 3 ) {
     DropIndexes('cc');
     $dbh->do("ALTER TABLE cc ADD UNIQUE (bug_id,who)");
     $dbh->do("ALTER TABLE cc ADD INDEX (who)");
+
+    $regenerateshadow=1; # cc fields no longer have spaces in them
 }    
 
 if ( CountIndexes('keywords') != 3 ) {
@@ -1649,6 +1651,7 @@ if ( CountIndexes('keywords') != 3 ) {
     DropIndexes('keywords');
     $dbh->do("ALTER TABLE keywords ADD INDEX (keywordid)");
     $dbh->do("ALTER TABLE keywords ADD UNIQUE (bug_id,keywordid)");
+
 }    
 
 #
@@ -1670,3 +1673,4 @@ if ($regenerateshadow) {
 
 unlink "data/versioncache";
 print "Reminder: Bugzilla now requires version 3.22.5 or later of MySQL.\n";
+print "Reminder: Bugzilla now requires version 8.7 or later of sendmail.\n";
diff --git a/processmail b/processmail
index 8c8ad8719..b81398680 100755
--- a/processmail
+++ b/processmail
@@ -582,7 +582,7 @@ sub NewProcessOnePerson ($$\@\%\%\%$$$$) {
     my $template = Param("newchangedmail");
     
     my $msg = PerformSubsts($template, \%substs);
-    open(SENDMAIL, "|/usr/lib/sendmail -t") ||
+    open(SENDMAIL, "|/usr/lib/sendmail -ODeliveryMode=deferred -t") ||
       die "Can't open sendmail";
     
     print SENDMAIL trim($msg) . "\n";
@@ -645,8 +645,9 @@ sub ProcessOneBug {
             if (!$regenerate) {
                 # Note: fixaddresses may result in a Cc: only.  This seems
                 # harmless.
-                open(SENDMAIL, "|/usr/lib/sendmail -t") ||
-                    die "Can't open sendmail";
+                open(SENDMAIL, 
+                     "|/usr/lib/sendmail -ODeliveryMode=deferred -t") ||
+                       die "Can't open sendmail";
 
                 print SENDMAIL $msg;
                 close SENDMAIL;