summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobert <robert@openbsd.org>2011-07-08 00:17:15 +0000
committerrobert <robert@openbsd.org>2011-07-08 00:17:15 +0000
commit0509c90bceddcffeddaf8393f94c6dcd0a807e9b (patch)
tree93f784dbb79f6be53e8ff52a91792797316bb9eb
parentmake rc_daemons use start_daemon instead of calling the script directly (diff)
downloadwireguard-openbsd-0509c90bceddcffeddaf8393f94c6dcd0a807e9b.tar.xz
wireguard-openbsd-0509c90bceddcffeddaf8393f94c6dcd0a807e9b.zip
only start spamlogd if spamd_flags != NO and spamd_black = NO
spotted by halex@
-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