diff options
author | Eric Wong <e@80x24.org> | 2016-06-16 22:45:31 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-06-17 00:41:49 +0000 |
commit | 749d63840bc1603686954043f2ae6a7acb24a379 (patch) | |
tree | f12aa9df3e8b7c13ab5c9dcc31de7b8a1f4883ad | |
parent | a578518f00a646ba7595c94c6b8b928afd65bda6 (diff) | |
download | public-inbox-749d63840bc1603686954043f2ae6a7acb24a379.tar.gz |
SpamAssassin often misses messages which contain viruses, so ClamAV should fill that gap nicely.
-rwxr-xr-x | scripts/dc-dlvr | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr index 2f82ff2a..5ebca3fe 100755 --- a/scripts/dc-dlvr +++ b/scripts/dc-dlvr @@ -4,6 +4,7 @@ # This is installed as /etc/dc-dcvr on my system # to use with postfix main.cf: mailbox_command = /etc/dc-dlvr "$EXTENSION" DELIVER=/usr/lib/dovecot/deliver +CLAMDSCAN=clamdscan # change if your spamc/spamd listens elsewhere spamc='spamc' @@ -17,19 +18,27 @@ trainham,) exec $spamc -L ham > /dev/null 2>&1 ;; esac TMPMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1) -rm_list=$TMPMSG +CDMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1) +rm_list="$TMPMSG $CDMSG" + +cat >$CDMSG +$CLAMDSCAN --quiet - <$CDMSG +if test $? -eq 1 +then + exec $DELIVER -m INBOX.spam <$CDMSG +fi # pre-filter, for infrequently read lists which do their own spam filtering: if test -r ~/.dc-dlvr.pre then set -e - cat > $TMPMSG + mv -f $CDMSG $TMPMSG DEFAULT_INBOX=$(. ~/.dc-dlvr.pre) case $DEFAULT_INBOX in '') exec rm -f $rm_list ;; INBOX) ;; # do nothing *) - $DELIVER -m $DEFAULT_INBOX < $TMPMSG + $DELIVER -m $DEFAULT_INBOX <$TMPMSG exec rm -f $rm_list ;; esac @@ -37,9 +46,9 @@ then rm_list="$rm_list $PREMSG" set +e mv -f $TMPMSG $PREMSG - $spamc -E --headers < $PREMSG > $TMPMSG + $spamc -E --headers <$PREMSG >$TMPMSG else - $spamc -E --headers > $TMPMSG + $spamc -E --headers <$CDMSG >$TMPMSG fi err=$? |