X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/0b5cd2ac0d5ce283ed5c9eb3107975978ded9c58..8642e7bb74b4737f3bb296d7fff6e241f4af88e0:/procmail/justme

diff --git a/procmail/justme b/procmail/justme
index ac3dbd6..7941e89 100644
--- a/procmail/justme
+++ b/procmail/justme
@@ -3,7 +3,7 @@
 {
   JUSTME="from machine in my domain"
   LOG="justme:      passing; $JUSTME$NL"
-  SKIP_SPAMCHECKS=from-mydomain
+#  SKIP_SPAMCHECKS=from-mydomain
 }
 
 :0 EH
@@ -23,24 +23,24 @@
     JUSTME="explicitly excepted address"
     LOG="justme:      passing; $JUSTME$NL"
   }
-
+  
   :0 E
-  *$ 1^0 B ?? $RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME
-  *$ 1^0 B ?? $RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME
+  *$ 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"
   }
 
   :0 E
-  *$ B ?? $RE_LASTNAME
+  *$ B ?? .*\<$RE_LASTNAME\>
   {
     JUSTME="last name reference"
     LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 E
-  *  1^0 B ?? madduck
+  *  1^0 B ?? .*\<madduck\>
   * -1^0 B ?? mass\.madduck\.net
   {
     JUSTME="nickname reference"