unbreak ldapd regress,
everything seems to be working fine.
;;x250 ~/src/regress/usr.sbin/ldapd> make ; echo $?
configuration ok
ldapsearch -x -H ldapi://%2ftmp%2fldapi | diff -
/home/gsoares/src/regress/usr.sbin/ldapd/out/empty.log
ldapsearch -x -p 6639 -h localhost 2>&1 | diff -
/home/gsoares/src/regress/usr.sbin/ldapd/out/empty.log
ldapsearch -x -p 6636 -h localhost 2>&1 | diff -
/home/gsoares/src/regress/usr.sbin/ldapd/out/empty.log
configuration ok
ldapadd -f /home/gsoares/src/regress/usr.sbin/ldapd/dit-example.ldif
-Dcn=admin,dc=example,dc=com -x -w secret -h localhost -p 6639 | diff -
/home/gsoares/src/regress/usr.sbin/ldapd/out/adding.log
ldapsearch -x -b dc=example,dc=com -h localhost -p 6639 | diff -
/home/gsoares/src/regress/usr.sbin/ldapd/out/example.log
ldapsearch -x -D cn=admin,dc=example,dc=com -w secret -b dc=example,dc=com -h
localhost -p 6639 | diff -
/home/gsoares/src/regress/usr.sbin/ldapd/out/example.log
configuration ok
1 ldap entries
cn=admin,dc=example,dc=com
configuration ok
ldapdelete -Dcn=admin,dc=example,dc=com -x -w secret -h localhost -p 6639 -r
dc=example,dc=com
ldapsearch -x -p 6639 -h localhost 2>&1 | diff -
/home/gsoares/src/regress/usr.sbin/ldapd/out/empty.log
0
Index: Makefile
===================================================================
RCS file: /cvs/src/regress/usr.sbin/ldapd/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 25 Jun 2017 22:06:06 -0000 1.8
+++ Makefile 25 Jun 2018 05:20:52 -0000
@@ -35,7 +35,7 @@ bootstrap:
@${SUDO} ldapd -n -r ${.OBJDIR} -f ${.OBJDIR}/ldapd1.conf
@${SUDO} ldapd -dvv -r ${.OBJDIR} -f ${.OBJDIR}/ldapd1.conf >
${.OBJDIR}/log 2>&1 &
@sleep 1
- @grep -a startup ${.OBJDIR}/log |sed -e 's/.*\[// ; s/\].*//' >
${.OBJDIR}/ldapd.pid
+ @pgrep -n ldapd > ${.OBJDIR}/ldapd.pid
.if ! (make(clean) || make(cleandir) || make(obj))
.END:
