refactor justme

diff --git a/procmail/justme b/procmail/justme
index f414ac51357d62be3f0c9a82a77db2d273348620..dad2725bc19c7612f882555eb6462f13892e66b1 100644 (file)
--- a/procmail/justme
+++ b/procmail/justme
@@ -2,7 +2,6 @@
 *$ MSGID ?? ^<.+@$RE_MYDOMAIN>
 {
   JUSTME="from machine in my domain"
 *$ MSGID ?? ^<.+@$RE_MYDOMAIN>
 {
   JUSTME="from machine in my domain"

-  LOG="justme:      passing; $JUSTME$NL"

 #  SKIP_SPAMCHECKS=from-mydomain
 }
 
 #  SKIP_SPAMCHECKS=from-mydomain
 }
 


@@ -10,7 +9,6 @@
 *$ ^(References|In-Reply-To):.*<.+@$RE_MYDOMAIN>
 {
   JUSTME="in-reply-to/referenced"
 *$ ^(References|In-Reply-To):.*<.+@$RE_MYDOMAIN>
 {
   JUSTME="in-reply-to/referenced"

-  LOG="justme:      passing; $JUSTME$NL"

   SKIP_SPAMCHECKS=in-reply-to/referenced
 }
 
   SKIP_SPAMCHECKS=in-reply-to/referenced
 }
 


@@ -19,40 +17,25 @@
 {
   :0
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions
 {
   :0
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions

-  {
-    JUSTME="explicitly excepted address"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
-  
+  { JUSTME="explicitly excepted address" }
+

   :0 E
   *$ 1^0 B ?? .*\<$RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME\>
   *$ 1^0 B ?? .*\<$RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME\>
   :0 E
   *$ 1^0 B ?? .*\<$RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME\>
   *$ 1^0 B ?? .*\<$RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME\>

-  {
-    JUSTME="full name reference"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="full name reference" }

 
   :0 E
   *$ B ?? .*\<$RE_LASTNAME\>
 
   :0 E
   *$ B ?? .*\<$RE_LASTNAME\>

-  {
-    JUSTME="last name reference"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="last name reference" }

 
   :0 E
   *  1^0 B ?? .*\<madduck\>
   * -1^0 B ?? mass\.madduck\.net
 
   :0 E
   *  1^0 B ?? .*\<madduck\>
   * -1^0 B ?? mass\.madduck\.net

-  {
-    JUSTME="nickname reference"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="nickname reference" }

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

-  {
-    JUSTME="keyword reference"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="keyword reference" }

 
   :0 E
   * MSGID ?? ^<mailman
 
   :0 E
   * MSGID ?? ^<mailman


@@ -60,67 +43,43 @@
     :0
     * FROM ?? -request@
     * SUBJECT ?? ^confirm [0-9a-f]+$
     :0
     * FROM ?? -request@
     * SUBJECT ?? ^confirm [0-9a-f]+$

-    {
-      JUSTME="mailman confirmation"
-      LOG="justme:      passing; $JUSTME$NL"
-    }
+    { JUSTME="mailman confirmation" }

 
     :0 E
     * FROM ?? -bounces@
     * SUBJECT ?? ^You have been unsubscribed
 
     :0 E
     * FROM ?? -bounces@
     * SUBJECT ?? ^You have been unsubscribed

-    {
-      JUSTME="mailman confirmation"
-      LOG="justme:      passing; $JUSTME$NL"
-    }
+    { JUSTME="mailman confirmation" }

 
     :0 E
     * FROM ?? -bounces@
     * SUBJECT ?? .+ mailing list reminder$
 
     :0 E
     * FROM ?? -bounces@
     * SUBJECT ?? .+ mailing list reminder$

-    {
-      JUSTME="mailman password reminder"
-      LOG="justme:      passing; $JUSTME$NL"
-    }
+    { JUSTME="mailman password reminder" }

   }
 
   :0 E
   * FROM ?? ^[Mm]ajordomo@
   * SUBJECT ?? ^Confirmation for
   }
 
   :0 E
   * FROM ?? ^[Mm]ajordomo@
   * SUBJECT ?? ^Confirmation for

-  {
-    JUSTME="majordomo confirmation"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="majordomo confirmation" }

 
   :0 E
   * FROM ?? ^noreply@googlegroups\.com$
   * SUBJECT ?? ^Google Groups: Please confirm
 
   :0 E
   * FROM ?? ^noreply@googlegroups\.com$
   * SUBJECT ?? ^Google Groups: Please confirm

-  {
-    JUSTME="googlegroups confirmation"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="googlegroups confirmation" }

 
   :0 E
   * FROM ?? ^Yahoo! Groups <confirm-.+@yahoogroups\.com>$
   * SUBJECT ?? ^Please confirm your request to join
 
   :0 E
   * FROM ?? ^Yahoo! Groups <confirm-.+@yahoogroups\.com>$
   * SUBJECT ?? ^Please confirm your request to join

-  {
-    JUSTME="yahoogroups confirmation"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="yahoogroups confirmation" }

 
   :0 E
   * FROM ?? ^SmartList <.+-request@.+>
   * SUBJECT ?? ^CONFIRM s[0-9]+$
 
   :0 E
   * FROM ?? ^SmartList <.+-request@.+>
   * SUBJECT ?? ^CONFIRM s[0-9]+$

-  {
-    JUSTME="smartlist confirmation"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="smartlist confirmation" }

 
   :0 E
   * FROM ?? ^Launchpad Email Validator <noreply@launchpad\.net>
   * SUBJECT ?? ^Launchpad: Validate your email address$
 
   :0 E
   * FROM ?? ^Launchpad Email Validator <noreply@launchpad\.net>
   * SUBJECT ?? ^Launchpad: Validate your email address$

-  {
-    JUSTME="launchpad validation"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="launchpad validation" }

 
   :0 E
   {
 
   :0 E
   {


@@ -129,4 +88,11 @@
   }
 }
 
   }
 }
 

+:0
+* JUSTME ?? .
+{ LOG="justme:      passing; $JUSTME$NL" }
+
+:0 E
+{ LOG="justme:      passing; UNKNOWN$NL" }
+

 # vim:ft=procmail
 # vim:ft=procmail