X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/011310e64f3cf2dbf3e06def04379aca28df9013..be279c4fb7e0f46bdbd14b1dafe9e0eb460ffbe6:/procmail/justme

diff --git a/procmail/justme b/procmail/justme
index f6edc50..e4b9c60 100644
--- a/procmail/justme
+++ b/procmail/justme
@@ -4,61 +4,54 @@
   :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>
   {
-    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
   { 
-    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
   {
-    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
   {
-    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
   {
-    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
   {
-    LOG="justme:      passing; keyword reference$NL"
-    :0 fw
-    |$FORMAIL -I'X-Justme: keyword reference'
+    JUSTME="keyword reference"
+    LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 E