fix devlivery of messages, now last match wins

[etc/mailfilter.git] / procmail / rules / admin

diff --git a/procmail/rules/admin b/procmail/rules/admin
index 6d8f0ede36584265b2b0b0087d188f89b07391ae..2873572da416e208020b811ed7f2f45e3690297b 100644 (file)
--- a/procmail/rules/admin
+++ b/procmail/rules/admin
@@ -6,24 +6,26 @@
   :0
   *$ !^Delivered-To: .+@$EQ_DOMAIN
   {
-    LOG="spamtrap message as it was never delivered to $EQ_DOMAIN
-"
+    LOG="spamtrap message as it was never delivered to $EQ_DOMAIN$NL"
     :0 fw
     |$FORMAIL -A'X-Spamtrapped: not delivered to eqdomain'
     SPAMTRAPPED
   }
 
-  DESTDIR="$INBOX/.admin.`echo $EQ_DOMAIN | tr . _"
-
   :0
-  {
-    :0
-    * EQ_LOCAL ?? (logcheck|apticron)
-    ${DESTDIR}.$EQ_LOCAL/
+  { DEST=admin }
 
-    :0
-    ${DESTDIR}/
-  }
+#  DESTDIR="$BASE/.admin.`echo $EQ_DOMAIN | tr . _"
+#
+#  :0
+#  {
+#    :0
+#    * EQ_LOCAL ?? (logcheck|apticron)
+#    ${DESTDIR}.$EQ_LOCAL/
+#
+#    :0
+#    ${DESTDIR}/
+#  }
 }
 
 # vim:ft=procmail