summaryrefslogtreecommitdiff
path: root/tools/qmail
diff options
context:
space:
mode:
authorJohn Denker <jsd@av8n.com>2012-07-14 01:21:21 (GMT)
committerJohn Denker <jsd@av8n.com>2012-07-14 15:53:37 (GMT)
commit4779e1644fc9dff4eb3e1745a1b3f3119f9bf544 (patch)
treefa3bdd0d42a1f821348e0514f2d928a2aaf2377f /tools/qmail
parentbc151ae914c24f8d5461b68015c12c0abe629da2 (diff)
Now apply spam filtering to all unauthenticated submissions,
including submissions that are ssl encrypted (but not authenticated)
Diffstat (limited to 'tools/qmail')
-rwxr-xr-xtools/qmail7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/qmail b/tools/qmail
index b43db75..311c784 100755
--- a/tools/qmail
+++ b/tools/qmail
@@ -13,7 +13,8 @@ tcps=$( which tcpserver )
qmaild=$(id -u qmaild )
nofiles=$(id -g qmaild )
-filters=/var/qmail/control/filters.conf
+export HI_Q_CONF=/var/qmail/control/filters.conf
+export HI_Q_AUCONF=/var/qmail/control/aufilters.conf
smtpconf=/etc/stunnel/smtp.conf
pop3conf=/etc/stunnel/pop3.conf
PEM=/etc/stunnel/stunnel.pem
@@ -160,7 +161,6 @@ case "$verb" in
else
echo -n " SMTP-server "
/bin/rm -f /var/run/$proc.pid
- HI_Q_CONF="$filters" \
QMAILQUEUE="/var/qmail/bin/hi-q" \
$PIDO /var/run/$proc.pid \
$tcps -R -x$CDB -u$qmaild -g$nofiles $mailhost smtp \
@@ -178,6 +178,7 @@ case "$verb" in
else
echo -n " SMTPS-server "
/bin/rm -f /var/run/$proc.pid
+ QMAILQUEUE="/var/qmail/bin/hi-q" \
$PIDO /var/run/$proc.pid \
$tcps -R -u$qmaild -g$nofiles $mailhost smtps \
stunnel4 $smtpconf 2>&1 \
@@ -249,7 +250,7 @@ case "$verb" in
echo " down. $pid"
fi
done
- for file in $pop3conf $smtpconf $filters \
+ for file in $pop3conf $smtpconf $HI_Q_CONF $HI_Q_AUCONF \
$CDB $PEM ; do
if ! test -r "$file" ; then
echo "Beware: file '$file' is missing."