From c556da6ebde33437de410e3af3dae9ea256467c8 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Thu, 23 Mar 2017 10:10:54 +0000
Subject: [PATCH] Don't check for spamd_black twice in rc_pre and rc_start;
 just do everything in rc_pre.

prodded by and ok jmc@, ok halex@
---
 src/etc/rc.d/spamd | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/etc/rc.d/spamd b/src/etc/rc.d/spamd
index 87003ce8..873fe7b7 100644
--- a/src/etc/rc.d/spamd
+++ b/src/etc/rc.d/spamd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: spamd,v 1.7 2015/07/15 13:50:54 ajacoutot Exp $
+# $OpenBSD: spamd,v 1.8 2017/03/23 10:10:54 ajacoutot Exp $
 
 daemon="/usr/libexec/spamd"
 
@@ -10,17 +10,15 @@ pexp="spamd: \[priv\].*"
 rc_reload=NO
 
 rc_pre() {
-	[ X"${spamd_black}" != X"NO" ] && \
+	if [ X"${spamd_black}" != X"NO" ]; then
 		daemon_flags="-b ${daemon_flags}"
-	return 0
+		spamd_setup_flags="-b"
+	fi
 }
 
 rc_start() {
 	${rcexec} "${daemon} ${daemon_flags}" || return 1
-	spamd_setup_flags="-D"
-	[ X"${spamd_black}" != X"NO" ] && \
-		spamd_setup_flags="-b ${spamd_setup_flags}"
-	/usr/libexec/spamd-setup ${spamd_setup_flags}
+	/usr/libexec/spamd-setup -D ${spamd_setup_flags}
 }
 
 rc_cmd $1