Browse Source

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@
OPENBSD_6_1
ajacoutot 7 years ago
parent
commit
c556da6ebd
1 changed files with 5 additions and 7 deletions
  1. +5
    -7
      src/etc/rc.d/spamd

+ 5
- 7
src/etc/rc.d/spamd View File

@ -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

Loading…
Cancel
Save