From: martin f. krafft <madduck@madduck.net>
Date: Mon, 3 Mar 2008 12:33:42 +0000 (+0100)
Subject: properly log ignored messages
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/259a4169f1bc8ece69ff289df7a47e0d84f4d418

properly log ignored messages
---

diff --git a/procmail/ignore b/procmail/ignore
index e49b667..a5ae61f 100644
--- a/procmail/ignore
+++ b/procmail/ignore
@@ -1,7 +1,7 @@
 :0 BH
 * ? $EGREP -qif $CONF/ignore
 {
-  LOG="ignore:      discarding ignored message $MSGID from $FROM to $ORIGINAL_TO$NL"
+  LOG="ignore:      discarding ignored message$NL"
   SWITCHRC=$PMDIR/discard
 }
 
diff --git a/procmail/procmailrc b/procmail/procmailrc
index 6dcd3b4..117f552 100755
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -10,15 +10,15 @@ INCLUDERC=$PMDIR/defer
 
 INCLUDERC=$PMDIR/defines
 
-INCLUDERC=$PMDIR/ignore
-
-INCLUDERC=$PMDIR/smsmail
-
 #VERBOSE=yes
 
 INCLUDERC=$PMDIR/logging
 #INCLUDERC=$PMDIR/msgid-index
 
+INCLUDERC=$PMDIR/ignore
+
+INCLUDERC=$PMDIR/smsmail
+
 INCLUDERC=$PMDIR/flag-test-messages
 
 INCLUDERC=$PMDIR/dejavu
diff --git a/procmail/smsmail b/procmail/smsmail
index 9702f8a..5a6f63c 100644
--- a/procmail/smsmail
+++ b/procmail/smsmail
@@ -4,6 +4,7 @@
   :0 W
   |$HOME/.bin/proc_smsmail
 
+  TRAP
   EXITCODE=$?
   HOST
 }