Browse Source

Start ldapd(8) earlier so that ypldap(8) can properly run (an LDAP

server _must_ be running and accessible before ypldap is started).
Add a proper pexp in the ypldap rc script.
discussed with pyr@ robert@ deraadt@
ok deraadt@
OPENBSD_5_1
ajacoutot 13 years ago
parent
commit
2d0331d584
2 changed files with 8 additions and 5 deletions
  1. +5
    -4
      src/etc/rc
  2. +3
    -1
      src/etc/rc.d/ypldap

+ 5
- 4
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.395 2011/10/07 16:36:26 deraadt Exp $
# $OpenBSD: rc,v 1.396 2011/10/13 07:54:06 ajacoutot Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -397,6 +397,7 @@ make_keys
echo -n 'starting early daemons:' echo -n 'starting early daemons:'
start_daemon syslogd ldattach pflogd named nsd ntpd isakmpd iked sasyncd start_daemon syslogd ldattach pflogd named nsd ntpd isakmpd iked sasyncd
start_daemon ldapd
echo '.' echo '.'
if [ X"${ipsec}" != X"NO" ]; then if [ X"${ipsec}" != X"NO" ]; then
@ -502,9 +503,9 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
fi fi
fi fi
start_daemon hostapd rwhod lpd ldapd sendmail smtpd httpd ftpd
start_daemon ftpproxy identd inetd rarpd bootparamd rbootd mopd
start_daemon popa3d spamd spamlogd kdc kadmind kpasswdd aucat
start_daemon hostapd rwhod lpd sendmail smtpd httpd ftpd ftpproxy
start_daemon identd inetd rarpd bootparamd rbootd mopd popa3d
start_daemon spamd spamlogd kdc kadmind kpasswdd aucat
echo '.' echo '.'
if [ X"${spamd_flags}" != X"NO" ]; then if [ X"${spamd_flags}" != X"NO" ]; then


+ 3
- 1
src/etc/rc.d/ypldap View File

@ -1,9 +1,11 @@
#!/bin/sh #!/bin/sh
# #
# $OpenBSD: ypldap,v 1.1 2011/07/07 01:52:58 robert Exp $
# $OpenBSD: ypldap,v 1.2 2011/10/13 07:54:06 ajacoutot Exp $
daemon="/usr/sbin/ypldap" daemon="/usr/sbin/ypldap"
. /etc/rc.d/rc.subr . /etc/rc.d/rc.subr
pexp="ypldap: ldap client"
rc_cmd $1 rc_cmd $1

Loading…
Cancel
Save