fix rules/admin eqdomain spamtrapping

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index c3188ff55d82eebcb050f25a80ce1edd7fcf813f..ca6bef4477ee9da82034e8cc113e8ddbbb7c7e9e 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,30 +1,27 @@
 :0
 :0

-* DEST ?? .
-{
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
-
-  :0
-  *$ DEST ?? ^$BASE/\/.+
-  { DEST="$MATCH" }
+* ! DEST ?? .
+{ DEST=/ }

 
 

-  :0
-  *$ DEST ?? ^\.
-  { }
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }

 
 

-  :0 E
-  { DEST=".$DEST" }
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }

 
 

-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  DEST="$BASE/$DEST"
-  :0
-  $DEST
-}
+:0
+*$ DEST ?? ^\.
+{ }

 
 :0 E
 
 :0 E

+{ DEST=".$DEST" }
+
+:0

 {
 {

-  LOG="deliver:     delivering message $MSGID to default destination$NL"
+  LOG="deliver:     delivering message $MSGID to $DEST$NL"
+  TRAP="$TRAP; echo \"delivered:   \$DESTFILE\" >> '$THISLOGFILE'"
+

   :0
   :0

-  $DEFAULT
+  $BASE/$DEST

 }
 }