]> Sergey Matveev's repositories - public-inbox.git/commitdiff
mda: don't clobber existing List-Id header
authorEric Wong <e@80x24.org>
Mon, 25 Apr 2016 05:07:26 +0000 (05:07 +0000)
committerEric Wong <e@80x24.org>
Mon, 25 Apr 2016 05:07:26 +0000 (05:07 +0000)
We may be importing mail from other lists, so do not
clobber the existing List-Id header.

lib/PublicInbox/MDA.pm

index 26681c2f3f10a06d5ce3b9e57081004029323525..2d3b9bd8daa3bba761a1980c55e38d9063c4a243 100644 (file)
@@ -66,15 +66,20 @@ sub alias_specified {
 
 sub set_list_headers {
        my ($class, $simple, $dst) = @_;
-       my $pa = $dst->{-primary_address};
-
-       $simple->header_set("List-Id", "<$pa>"); # RFC2919
+       unless (defined $simple->header('List-Id')) {
+               my $pa = $dst->{-primary_address};
+               $simple->header_set("List-Id", "<$pa>"); # RFC2919
+       }
 
-       # remove Delivered-To: prevent training loops
-       # The rest are taken from Mailman 2.1.15, some may be used for phishing
-       foreach my $h (qw(delivered-to approved approve x-approved x-approve
-                       urgent return-receipt-to disposition-notification-to
-                       x-confirm-reading-to x-pmrqc)) {
+       foreach my $h (qw(delivered-to), # prevent training loops
+                       # The rest are taken from Mailman 2.1.15
+                       # could contain passwords:
+                       qw(approved approve x-approved x-approve urgent),
+                       # could be used phishing:
+                       qw(return-receipt-to disposition-notification-to
+                          x-confirm-reading-to),
+                       # Pegasus mail:
+                       qw(x-pmrqc)) {
                $simple->header_set($h);
        }
 }