Sends rejection copies to record etc.

diff --git a/.gitignore b/.gitignore
index 180fe791a69d4ec9d53cca0afb99892ebde37d61..8dc5a05844d818e49760ccaddaaa7a2885045067 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /xlog/log/*/event.log
 /xlog/log/*/event.log.[0-9]
 /xlog/log/*/event.log.[0-9].gz
+/xlog/log/*/nr-*.txt
 /crontab.part
 /stump/etc/modenv
 /stump/etc/added-headers

diff --git a/forward-suffix.part.INO b/forward-suffix.part.INO
index def37b370ba12087b1299fb1eb85faf5c7146fc2..bf5121a596d1fd62beb0630f7383a4b2b5c9c4e2 100644 (file)
--- a/forward-suffix.part.INO
+++ b/forward-suffix.part.INO
@@ -36,6 +36,6 @@ endif
 
 if $local_part_suffix is +%ABBREV%-internal-reject-copy
 then
-       seen deliver %ABBREV%-rejections@chiark.greenend.org.uk
+       seen deliver %REJECTIONSLIST%
        finish
 endif

diff --git a/get-settings b/get-settings
index dda3f5156674149e2c293075be4e4ad41eed265d..f9b3d6f07e54450f4e3dad9a5ba502804c413620 100644 (file)
--- a/get-settings
+++ b/get-settings
@@ -5,7 +5,7 @@ pas="$paskeys"
 for k in $pas; do eval "$k=''"; export $k; done
 
 . settings
-export GROUP ABBREV INFOHEADER MODEMAIL GROUPURL
+export GROUP ABBREV INFOHEADER MODEMAIL GROUPURL REJECTIONSLIST
 
 . ../global-settings
 export ROOTBASEDIR CGIBASEURL DOMAIN SLIMYDOMAIN OURUSER ADMIN

diff --git a/stump/etc/modenv.INO b/stump/etc/modenv.INO
index e403b4237e4eff01b230b48343de2d149a22e1f1..ed322f6c63930267fd499a89a6081d14f2a0f041 100755 (executable)
--- a/stump/etc/modenv.INO
+++ b/stump/etc/modenv.INO
@@ -50,6 +50,9 @@ MAILOUT_REJECT_FORMAIL_ARGS='
        -I Bcc:%OURUSER%+%ABBREV%-internal-log+mailout@%DOMAIN%
        -I Bcc:%OURUSER%+%ABBREV%-internal-reject-copy@%DOMAIN%
 '
+export MAILOUT_RECVACK_FORMAIL_ARGS
+export MAILOUT_ACCEPTACK_FORMAIL_ARGS
+export MAILOUT_REJECT_FORMAIL_ARGS
 
 #######################################################################
 # STUMP enforces limitations on the maximum number of newsgroups

diff --git a/xlog/bin/record b/xlog/bin/record
index 27ca36bc414b25ebc6329a7eba0d71c812fb0608..a62819575b6584d67c92da38f713c89236243aae 100755 (executable)
--- a/xlog/bin/record
+++ b/xlog/bin/record
@@ -11,6 +11,8 @@ $dir =~ s,/[^/]+$,,;
 $dir =~ s,/bin$,/log,;
 $dir .= "/$ARGV[1]";
 
+my $message;
+
 sub parse__headerline () {
     $f{Subject}= $' if m/^Subject:\s*/i; #';
     $f{MessageID}= $' if m/^Message\-ID:\s*/i; #';
@@ -71,12 +73,29 @@ sub parse_webstump2stump () {
 }
 
 sub parse_mailout () {
+    my $keepheader= 1;
     while (<STDIN>) {
+       $keepheader= 1 unless m/^[ \t]/;
+       $keepheader= 0
+           if m/^(?: received )/ix;
+       $keepheader= 'mangle'
+           if m/^(?: to
+                  | from
+                  | return-path
+                  | reply-to
+                  | errors-to
+                  )/ix;
+       if ($keepheader) {
+           my $line= $_;
+           $line =~ s/\@.{0,2}/ at ../g if $keepheader eq 'mangle';
+           $message .= $line;
+       }
        chomp;
        $f{Event}= "notify $'" if m/^X-Webstump-Event:\s*/i; #';
        last if m/^$/;
     }
     while (<STDIN>) {
+       $message .= $_;
        chomp;
        next unless s/^\> //;
        last if m/^$/;
@@ -86,11 +105,18 @@ sub parse_mailout () {
 
 $f{Event}= '?';
 &{"parse_$ARGV[0]"};
-while (<STDIN>) { }
+while (<STDIN>) { $message .= $_; }
 STDIN->error and die $!;
 
 $f{Now}= time;
 
+if ($f{Event} =~ m/^notify reject /) {
+    #$ref= $f{MessageID}
+    open I, ">$dir/nr-$f{MessageNum}.txt" or die $!;
+    print I $message or die $!;
+    close I or die $!;
+}
+
 open L, ">>$dir/event.log" or die $!;
 
 my @s= map {