From: rpe <rpe@openbsd.org>
Date: Sun, 20 Jul 2014 08:37:07 +0000 (+0000)
Subject: Stop using the (now) internal rc.subr functions _rc_do() and _rc_wait().
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5850e9c22ab2da28c0643457845728d70553b925;p=openbsd

Stop using the (now) internal rc.subr functions _rc_do() and _rc_wait().
- no need to start spamd in background mode
- return from rc_start() in case spamd failed to start
- execute spamd-setup without explicitly waiting for spamd

prodded by, discussed with and OK ajacoutot@
---

diff --git a/etc/rc.d/spamd b/etc/rc.d/spamd
index e8183f58fee..cbdb4cc0c58 100644
--- a/etc/rc.d/spamd
+++ b/etc/rc.d/spamd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: spamd,v 1.5 2014/07/17 15:00:06 ajacoutot Exp $
+# $OpenBSD: spamd,v 1.6 2014/07/20 08:37:07 rpe Exp $
 
 daemon="/usr/libexec/spamd"
 
@@ -16,11 +16,11 @@ rc_pre() {
 }
 
 rc_start() {
-	${rcexec} "${daemon} ${daemon_flags} ${_bg}"
+	${rcexec} "${daemon} ${daemon_flags}" || return 1
 	spamd_setup_flags="-D"
 	[ X"${spamd_black}" != X"NO" ] && \
 		spamd_setup_flags="-b ${spamd_setup_flags}"
-	_rc_do _rc_wait start && /usr/libexec/spamd-setup ${spamd_setup_flags}
+	/usr/libexec/spamd-setup ${spamd_setup_flags}
 }
 
 rc_cmd $1