summaryrefslogtreecommitdiff
path: root/etc/rc.d
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2017-02-17 16:42:42 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2017-02-17 16:42:42 +0000
commit099f39d1a36764410b8bb9ff1ac35b8beb5e8865 (patch)
tree58ca3fa611343dce3b9ebf6ced77fe59ddd3ef68 /etc/rc.d
parent8fa48723d9e5af3e435c9613d5a8278f3dfa7834 (diff)
Stop supporting the historical way of starting ypbind(8); that is setting
'ypbind_flags=""' when domainname is set and /var/yp/binding exists. This can lead to inconsistent behavior at startup since /var may not be mounted yet and /etc/rc's start_daemon() will not start ypbind. A.K.A. make ypbind startup consistent with all other OpenBSD daemons. ok deraadt@
Diffstat (limited to 'etc/rc.d')
-rw-r--r--etc/rc.d/rc.subr7
1 files changed, 1 insertions, 6 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr
index 33ca068790c..12544734efa 100644
--- a/etc/rc.d/rc.subr
+++ b/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.subr,v 1.117 2017/01/24 01:11:11 ajacoutot Exp $
+# $OpenBSD: rc.subr,v 1.118 2017/02/17 16:42:41 ajacoutot Exp $
#
# Copyright (c) 2010, 2011, 2014-2016 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -115,11 +115,6 @@ _rc_quirks() {
[ X"${nfsd_flags}" = X"NO" ] && nfsd_flags="-tun 4"
[ X"${mountd_flags}" = X"NO" ] && mountd_flags=
fi
-
- # in case domainname is set and /var/yp/binding exists enable ypbind
- if [ X"`domainname`" != X"" -a -d /var/yp/binding ]; then
- ypbind_flags=
- fi
}
_rc_parse_conf() {