write justme headers at the end

diff --git a/procmail/addheaders b/procmail/addheaders
new file mode 100644 (file)
index 0000000..dc37f13
--- /dev/null
+++ b/procmail/addheaders
@@ -0,0 +1,5 @@
+:0 fw
+* JUSTME ?? .
+|$FORMAIL -A"X-Justme: $JUSTME"
+
+# vim:set ft=procmail

diff --git a/procmail/defines b/procmail/defines
index 2d775554818e1a245a341929ea5a309746be95c7..7df70cd0996212dc0dd61cd8df74baf67a69a02a 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -171,3 +171,7 @@ SPAM_UNKNOWN
 # RETRAIN
 # if set, causes spamfilters to be retrained, according to the variable's value
 RETRAIN
 # RETRAIN
 # if set, causes spamfilters to be retrained, according to the variable's value
 RETRAIN

+
+# JUSTME
+# if set, contains reason why justme message was passed
+JUSTME

diff --git a/procmail/justme b/procmail/justme
index f6edc50d32b7590a727f52950a81b380540524aa..e4b9c60c0155681b30da1c802de85396eadd0ade 100644 (file)
--- a/procmail/justme
+++ b/procmail/justme
@@ -4,61 +4,54 @@
   :0 H
   *$ MSGID ?? ^<.+@$RE_MYDOMAIN>
   {
   :0 H
   *$ MSGID ?? ^<.+@$RE_MYDOMAIN>
   {

-    LOG="justme:      passing; from machine in my domain$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: from machine in my domain'
+    JUSTME="from machine in my domain"
+    LOG="justme:      passing; $JUSTME$NL"

     SKIP_SPAMCHECKS=from-mydomain
   }
 
   :0 EH
   *$ ^(References|In-Reply-To):.*<.+@$RE_MYDOMAIN>
   {
     SKIP_SPAMCHECKS=from-mydomain
   }
 
   :0 EH
   *$ ^(References|In-Reply-To):.*<.+@$RE_MYDOMAIN>
   {

-    LOG="justme:      passing; in-reply-to/referenced$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: in-reply-to/referenced'
+    JUSTME="in-reply-to/referenced"
+    LOG="justme:      passing; $JUSTME$NL"

     SKIP_SPAMCHECKS=in-reply-to/referenced
   }
 
   :0 E
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions
   { 
     SKIP_SPAMCHECKS=in-reply-to/referenced
   }
 
   :0 E
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions
   { 

-    LOG="justme:      passing; explicitly excepted address$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: in-reply-to/referenced'
+    JUSTME="explicitly excepted address"
+    LOG="justme:      passing; $JUSTME$NL"

   }
 
   :0 EBH
   *$ 1^0 B ?? $RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME
   *$ 1^0 B ?? $RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME
   {
   }
 
   :0 EBH
   *$ 1^0 B ?? $RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME
   *$ 1^0 B ?? $RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME
   {

-    LOG="justme:      passing; full name reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: full name reference'
+    JUSTME="full name reference"
+    LOG="justme:      passing; $JUSTME$NL"

   }
 
   :0 EBH
   *$ B ?? $RE_LASTNAME
   {
   }
 
   :0 EBH
   *$ B ?? $RE_LASTNAME
   {

-    LOG="justme:      passing; last name reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: last name reference'
+    JUSTME="last name reference"
+    LOG="justme:      passing; $JUSTME$NL"

   }
 
   :0 EBH
   *  1^0 B ?? madduck
   * -1^0 B ?? mass\.madduck\.net
   {
   }
 
   :0 EBH
   *  1^0 B ?? madduck
   * -1^0 B ?? mass\.madduck\.net
   {

-    LOG="justme:      passing; nickname reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: nickname reference'
+    JUSTME="nickname reference"
+    LOG="justme:      passing; $JUSTME$NL"

   }
 
   :0 EBH
   *$ ? $EGREP -qif $CONF/justme-keyword-exceptions
   {
   }
 
   :0 EBH
   *$ ? $EGREP -qif $CONF/justme-keyword-exceptions
   {

-    LOG="justme:      passing; keyword reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: keyword reference'
+    JUSTME="keyword reference"
+    LOG="justme:      passing; $JUSTME$NL"

   }
 
   :0 E
   }
 
   :0 E

diff --git a/procmail/procmailrc b/procmail/procmailrc
index 0d322477a69c5b0d91ca102caccfe5d9f101f49f..35dbd26ae491c51a0e0a5bbeaacb1304d84a3c0e 100755 (executable)
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -66,6 +66,8 @@ INCLUDERC=$PMDIR/spamfilter
 
 #INCLUDERC=$PMDIR/autoreplies
 
 
 #INCLUDERC=$PMDIR/autoreplies
 

+INCLUDERC=$PMDIR/addheaders
+

 INCLUDERC=$PMDIR/lurker
 
 INCLUDERC=$PMRULES/all
 INCLUDERC=$PMDIR/lurker
 
 INCLUDERC=$PMRULES/all