From 2d0331d5844b4994dd26d99b132c2070ad8e9b4a Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Thu, 13 Oct 2011 07:54:06 +0000
Subject: [PATCH] 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@
---
 src/etc/rc          | 9 +++++----
 src/etc/rc.d/ypldap | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 79873469..959c2299 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -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/src/etc/rc.d/ypldap b/src/etc/rc.d/ypldap
index 6d1d3187..98a51d62 100644
--- a/src/etc/rc.d/ypldap
+++ b/src/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