Make the 'To:' header configurable. (Defaulting to on, and off

for FreeBSD).

3 files changed, 8 insertions, 3 deletions

diff --git a/CVSROOT/cfg.pm b/CVSROOT/cfg.pm
index 81ce6c1e4cf5..728c1d360bdc 100755
--- a/CVSROOT/cfg.pm
+++ b/CVSROOT/cfg.pm
@@ -15,7 +15,7 @@ package cfg;
 use strict;
 use vars qw($DEBUG $FILE_PREFIX $MAILADDRS $MAILBANNER $MAILCMD
 	    $MAIL_BRANCH_HDR $MAIL_ON_DIR_CREATION $MAIL_TRANSFORM
-	    $TMPDIR %TEMPLATE_HEADERS
+	    $ADD_TO_LINE $TMPDIR %TEMPLATE_HEADERS
 	    $CHECK_HEADERS $LAST_FILE $PID $IDHEADER $UNEXPAND_RCSID);
 
 
@@ -111,6 +111,9 @@ $MAIL_ON_DIR_CREATION = 0;
 # Use "" if you don't want one.
 $MAIL_BRANCH_HDR  = "X-CVS-Branch";
 
+# Include a 'To:' header in the generated commit mail?
+$ADD_TO_LINE = 1;
+
 # This is a way to post-process the log email before it is mailed.
 # Some people find it useful to use this to create URLs in their
 # commit mails to show the patch in a web page (using cvsweb) for
diff --git a/CVSROOT/cfg_local.pm b/CVSROOT/cfg_local.pm
index dc0c369b278c..38e3a5d232e4 100644
--- a/CVSROOT/cfg_local.pm
+++ b/CVSROOT/cfg_local.pm
@@ -28,6 +28,7 @@ $UNEXPAND_RCSID = 1;
 
 $MAILCMD = "/usr/local/bin/mailsend -H";
 $MAIL_BRANCH_HDR  = "X-FreeBSD-CVS-Branch";
+$ADD_TO_LINE = 0;
 
 
 # Wrap this in a hostname check to prevent mail to the FreeBSD
diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl
index 9159addd2bea..aef253943b1e 100755
--- a/CVSROOT/log_accum.pl
+++ b/CVSROOT/log_accum.pl
@@ -441,9 +441,10 @@ sub mail_notification {
 #	}
 #	print(MAIL "\n");
 
-	my $to = $cfg::MAILADDRS;
+	my @email = ();
 
-	my @email = ("To: $to");
+	my $to = $cfg::MAILADDRS;
+	push @email, "To: $to" if $cfg::ADD_TO_LINE;
 
 	my $subject = 'Subject: cvs commit:';
 	my @subj = &read_logfile($SUBJ_FILE);