properly log ignored messages

diff --git a/procmail/ignore b/procmail/ignore
index e49b667488ca991817565658929f2ff975c8bbcd..a5ae61fa3a3700e33f0a3998b6319c8896461d0b 100644 (file)
--- a/procmail/ignore
+++ b/procmail/ignore
@@ -1,7 +1,7 @@
 :0 BH
 * ? $EGREP -qif $CONF/ignore
 {
 :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
 }
 
   SWITCHRC=$PMDIR/discard
 }
 

diff --git a/procmail/procmailrc b/procmail/procmailrc
index 6dcd3b4308eac4caefe3963f0b397ac1c33751b1..117f552913727b4e3f8c0d87d1bfa6bbcdf3a48e 100755 (executable)
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -10,15 +10,15 @@ INCLUDERC=$PMDIR/defer
 
 INCLUDERC=$PMDIR/defines
 
 
 INCLUDERC=$PMDIR/defines
 

-INCLUDERC=$PMDIR/ignore
-
-INCLUDERC=$PMDIR/smsmail
-

 #VERBOSE=yes
 
 INCLUDERC=$PMDIR/logging
 #INCLUDERC=$PMDIR/msgid-index
 
 #VERBOSE=yes
 
 INCLUDERC=$PMDIR/logging
 #INCLUDERC=$PMDIR/msgid-index
 

+INCLUDERC=$PMDIR/ignore
+
+INCLUDERC=$PMDIR/smsmail
+

 INCLUDERC=$PMDIR/flag-test-messages
 
 INCLUDERC=$PMDIR/dejavu
 INCLUDERC=$PMDIR/flag-test-messages
 
 INCLUDERC=$PMDIR/dejavu

diff --git a/procmail/smsmail b/procmail/smsmail
index 9702f8aa1c4bdeb06a57f1b7322a8ef18a9e781c..5a6f63c1d4a016d81f53ca530b382a60ef6e65ec 100644 (file)
--- a/procmail/smsmail
+++ b/procmail/smsmail
@@ -4,6 +4,7 @@
   :0 W
   |$HOME/.bin/proc_smsmail
 
   :0 W
   |$HOME/.bin/proc_smsmail
 

+  TRAP

   EXITCODE=$?
   HOST
 }
   EXITCODE=$?
   HOST
 }