diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-10-13 07:54:07 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-10-13 07:54:07 +0000 |
| commit | 8e4b1391b57ca5078c5c1816992b30fba67c95f7 (patch) | |
| tree | 9514c094992c33e10fbd788b38124c5b69756c32 | |
| parent | 06be69949fdaac5748c26bac9c34d64e4dd539a6 (diff) | |
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@
| -rw-r--r-- | etc/rc | 9 | ||||
| -rw-r--r-- | etc/rc.d/ypldap | 4 |
2 files changed, 8 insertions, 5 deletions
@@ -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 # or after single-user. @@ -397,6 +397,7 @@ make_keys echo -n 'starting early daemons:' start_daemon syslogd ldattach pflogd named nsd ntpd isakmpd iked sasyncd +start_daemon ldapd echo '.' if [ X"${ipsec}" != X"NO" ]; then @@ -502,9 +503,9 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then 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 '.' if [ X"${spamd_flags}" != X"NO" ]; then diff --git a/etc/rc.d/ypldap b/etc/rc.d/ypldap index 6d1d31879a1..98a51d6254a 100644 --- a/etc/rc.d/ypldap +++ b/etc/rc.d/ypldap @@ -1,9 +1,11 @@ #!/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" . /etc/rc.d/rc.subr +pexp="ypldap: ldap client" + rc_cmd $1 |