summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRobert Nagy <robert@cvs.openbsd.org>2011-07-08 00:17:16 +0000
committerRobert Nagy <robert@cvs.openbsd.org>2011-07-08 00:17:16 +0000
commit284d0b51e7f64730fee6c675e1a6c458825c0eed (patch)
treeef0eb0ff9dd0a758db23ec5eedaf6222e57e276e /etc
parent879d0002c024e51e2ba78905098134147bdcf48a (diff)
only start spamlogd if spamd_flags != NO and spamd_black = NO
spotted by halex@
Diffstat (limited to 'etc')
-rw-r--r--etc/rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index 5a39c5b924e..1feea5a798a 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.368 2011/07/08 00:15:19 robert Exp $
+# $OpenBSD: rc,v 1.369 2011/07/08 00:17:15 robert Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -570,7 +570,7 @@ start_daemon spamd
[ X"${spamd_flags}" != X"NO" ] && \
/usr/libexec/spamd-setup -D
-if [ X"${spamd_black}" = X"NO" ]; then
+if [ X"${spamd_flags}" != X"NO" -a X"${spamd_black}" = X"NO" ]; then
echo -n ' spamlogd'
/usr/libexec/spamlogd ${spamlogd_flags}
fi