]> git.donarmstrong.com Git - debbugs.git/commitdiff
fix the received regex in add_return_path
authorDon Armstrong <don@donarmstrong.com>
Sat, 16 Dec 2017 00:37:15 +0000 (16:37 -0800)
committerDon Armstrong <don@donarmstrong.com>
Sat, 16 Dec 2017 00:37:15 +0000 (16:37 -0800)
bin/debbugs-spam

index 25ba7c66cc455192e7d2db5e673913bd03fed053..37deeb5f4921d14fa7bf5d7ff20df9c24a8a722e 100755 (executable)
@@ -346,8 +346,8 @@ sub add_return_path {
     ## ", and doesn't have a Return-Path. Fix that up so spamassassin
     ## is happy.
     $message =~
-        s{^(Received: at \S+\ by \S+;[^\n]+\n)(From (\S+) [^\n]+\n)}
-        {${1}Return-Path: $3\n$2};
+        s{^(Received: \(at \S+\) by \S+;[^\n]+\n)(From (\S+) [^\n]+\n)}
+        {${2}Return-Path: $3\n$1};
     return $message;
 }