From 5850e9c22ab2da28c0643457845728d70553b925 Mon Sep 17 00:00:00 2001 From: rpe Date: Sun, 20 Jul 2014 08:37:07 +0000 Subject: [PATCH] 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@ --- etc/rc.d/spamd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.20.1