** NOTICE: **

* OpenLDAP 2.0 is no longer actively maintained by the OpenLDAP Project.
* You are strongly encouraged to update to OpenLDAP 2.1
* Port maintainers: Please respect the default in bsd.port.mk
* I plan to remove OpenLDAP 2.0 from the FreeBSD ports tree May 2004

- Update net/openldap21-client and net/openldap21-server to version 2.1.23
- Update net/openldap22-client and net/openldap22-server to version 2.2.2.b,
  fix ITS#2747 from CVS
- some fixes for net/openldap20-server from CVS, seems like there won't be
  a 2.0.28 release anymore
- remove conflict with deleted port net/openldap12
- use PORTDOCS
- use USE_OPENSSL
- don't use _REENTRANT
- add a deinstall message

PR:		58278
Submitted by:	me
Approved by:	marcus (mentor)

8 files changed, 203 insertions, 90 deletions

diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index a46b162..1479fb7 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-PORTVERSION=		${OPENLDAP_VERSION}
+PORTVERSION=		2.0.27
 PORTREVISION=		${OPENLDAP_PORTVERSION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -31,11 +31,8 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		eik@FreeBSD.org
 COMMENT?=		Open source LDAP server implementation
 
-OPENLDAP_VERSION=	2.0.27
-
 LATEST_LINK=		${PKGNAMEPREFIX}openldap20${PKGNAMESUFFIX}
-CONFLICTS=		openldap12-* \
-			${PKGNAMEPREFIX}${PORTNAME}-client-2.[1-9].*
+CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[1-9].*
 
 WANT_OPENLDAP_VER?=	20
 .if ${WANT_OPENLDAP_VER} != 20
@@ -47,26 +44,35 @@ OPENLDAP_PORTVERSION=	0
 OPENLDAP_PKGNAMESUFFIX?=-client
 OPENLDAP_PKGFILESUFX?=	.client
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=		drafts rfc
+.endif
+
 .if defined(USE_OPENLDAP)
 .error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
 .endif
 .else
-OPENLDAP_PORTVERSION=	2
+OPENLDAP_PORTVERSION=	3
 OPENLDAP_PKGNAMESUFFIX?=-server
 OPENLDAP_PKGFILESUFX?=
 
-USE_OPENLDAP=		yes
+RUN_DEPENDS=		${LOCALBASE}/lib/libldap.so.2:${PORTSDIR}/net/openldap20-client
 CONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-server-2.[1-9].*
 .endif
 
-#USE_OPENSSL=		yes
+USE_OPENSSL=		yes
 USE_REINPLACE=		yes
 USE_LIBTOOL_VER=	13
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
-PLIST=			${WRKDIR}/pkg-plist
+PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
 PKGINSTALL=		${WRKDIR}/pkg-install
 PKGMESSAGE=		${WRKDIR}/pkg-message
+PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
+
+SCHEMATA=		corba core cosine \
+			inetorgperson java krb5-kdc \
+			misc nis openldap
 
 LDAP_RUN_DIR?=		${DESTDIR}/var/run/openldap
 LOCALSTATEDIR?=		${DESTDIR}/var/db
@@ -79,7 +85,8 @@ PLIST_SUB+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 
 SED_SCRIPT=		-e 's,%%PREFIX%%,${PREFIX},g' \
 			-e 's,%%LDAP_RUN_DIR%%,${LDAP_RUN_DIR},g' \
-			-e 's,%%DATABASEDIR%%,${DATABASEDIR},g'
+			-e 's,%%DATABASEDIR%%,${DATABASEDIR},g' \
+			-e 's,%%SLURPDIR%%,${SLURPDIR},g'
 
 CONFIGURE_ARGS=		--with-threads \
 			--with-tls=openssl \
@@ -155,8 +162,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 # end of client/server specific configuration
 .endif
 
-# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=		-D_REENTRANT ${PTHREAD_CFLAGS} \
+CPPFLAGS+=		${PTHREAD_CFLAGS} \
 			-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
@@ -218,9 +224,9 @@ post-build:
 .for script in slapd slurpd
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh >${WRKDIR}/${script}.sh
 .endfor
-.for text in pkg-install pkg-message
-	@if [ -f ${MASTERDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \
-		${SED} ${SED_SCRIPT} ${MASTERDIR}/${text}${OPENLDAP_PKGFILESUFX} \
+.for text in pkg-install pkg-message pkg-deinstall
+	@if [ -f ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \
+		${SED} ${SED_SCRIPT} ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} \
 		>${WRKDIR}/${text}; \
 	fi
 .endfor
@@ -232,18 +238,6 @@ test: build
 .endif
 
 pre-install:
-	@${CP} ${MASTERDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} ${PLIST}
-.if defined(CLIENT_ONLY)
-.if !defined(NOPORTDOCS)
-	@for dir in rfc drafts; do \
-		${FIND} ${WRKSRC}/doc/$${dir} -maxdepth 1 -type f \
-			| ${SED} -e "s,^${WRKSRC}/doc/,%%DOCSDIR%%/," \
-			>>${PLIST}; \
-		${ECHO_CMD} "@dirrm %%DOCSDIR%%/$${dir}" >>${PLIST}; \
-	done
-	@${ECHO_CMD} "@dirrm %%DOCSDIR%%" >>${PLIST}
-.endif
-.endif
 	@if [ -f ${PKGINSTALL} ]; then \
 		${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \
 	fi
@@ -252,15 +246,28 @@ post-install:
 .if defined(CLIENT_ONLY)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@for dir in rfc drafts; do \
+	@for dir in drafts rfc; do \
 		${MKDIR} ${DOCSDIR}/$${dir}; \
-		${FIND} ${WRKSRC}/doc/$${dir} -maxdepth 1 -type f \
-			-exec ${INSTALL_DATA} {} ${DOCSDIR}/$${dir} \; ; \
+		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \
 	done
 .endif
 .else
+	@for schema in ${SCHEMATA}; do \
+		${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \
+			"%D/etc/openldap/schema/$${schema}.schema.default; then" \
+			"rm -f %D/etc/openldap/schema/$${schema}.schema; fi" >>${TMPPLIST}; \
+		${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default" >>${TMPPLIST}; \
+		${ECHO_CMD} "@exec [ -f %B/$${schema}.schema ] || cp %B/%f %B/$${schema}.schema" >>${TMPPLIST}; \
+	done
+	@${ECHO_CMD} "@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST}
+#	currently the only way to participate in rcorder(8)
+	@if [ "${RC_DIR}" != "${PREFIX}" ]; then \
+		${ECHO_CMD} "@cwd ${RC_DIR}" >>${TMPPLIST}; \
+	fi
 .for script in slapd slurpd
 	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${RC_DIR}/${script}${RC_SUFX}
+	@${ECHO_CMD} "${script}${RC_SUFX}" >>${TMPPLIST}
 .endfor
 	@${MKDIR} ${LDAP_RUN_DIR}
 .endif
diff --git a/net/openldap20-server/distinfo b/net/openldap20-server/distinfo
index 39837c5..a501cdd 100644
--- a/net/openldap20-server/distinfo
+++ b/net/openldap20-server/distinfo
@@ -1 +1,3 @@
 MD5 (openldap-2.0.27.tgz) = a1e6508c471dd47205a3492cf57110a6
+SHA1 (openldap-2.0.27.tgz) = 6867890ed0a0a07d022290fa4b3429de50e1d0f3
+SIZE (openldap-2.0.27.tgz) = 1305050
diff --git a/net/openldap20-server/files/patch-servers::slapd::back-ldbm::idl.c b/net/openldap20-server/files/patch-servers::slapd::back-ldbm::idl.c
new file mode 100644
index 0000000..b41a8d9
--- /dev/null
+++ b/net/openldap20-server/files/patch-servers::slapd::back-ldbm::idl.c
@@ -0,0 +1,106 @@
+#
+# ITS#2348: Index corruption and crash in back-ldbm
+#
+--- servers/slapd/back-ldbm/idl.c.orig	Fri Aug 23 20:09:40 2002
++++ servers/slapd/back-ldbm/idl.c	Wed Mar 12 12:42:29 2003
+@@ -478,9 +478,9 @@
+ 	 */
+ 
+ 	/* select the block to try inserting into *//* XXX linear search XXX */
+-	for ( i = 0; !ID_BLOCK_NOID(idl, i) && id > ID_BLOCK_ID(idl, i); i++ )
++	for ( i = 0; !ID_BLOCK_NOID(idl, i) && id >= ID_BLOCK_ID(idl, i); i++ )
+ 		;	/* NULL */
+-
++	
+ 	if ( i != 0 ) {
+ 		i--;
+ 		first = 0;
+@@ -488,6 +488,11 @@
+ 		first = 1;
+ 	}
+ 
++	/* At this point the following condition must be true:
++	 * ID_BLOCK_ID(idl, i) <= id && id < ID_BLOCK_ID(idl, i+1)
++	 * except when i is the first or the last block.
++	 */
++
+ 	/* get the block */
+ 	cont_alloc( &k2, &key );
+ 	cont_id( &k2, ID_BLOCK_ID(idl, i) );
+@@ -533,15 +538,16 @@
+ 
+ 		/* is there a next block? */
+ 		if ( !first && !ID_BLOCK_NOID(idl, i + 1) ) {
++			Datum k3;
+ 			/* read it in */
+-			cont_alloc( &k2, &key );
+-			cont_id( &k2, ID_BLOCK_ID(idl, i + 1) );
+-			if ( (tmp2 = idl_fetch_one( be, db, k2 )) == NULL ) {
++			cont_alloc( &k3, &key );
++			cont_id( &k3, ID_BLOCK_ID(idl, i + 1) );
++			if ( (tmp2 = idl_fetch_one( be, db, k3 )) == NULL ) {
+ 				Debug( LDAP_DEBUG_ANY,
+ 				    "idl_insert_key: idl_fetch_one returned NULL\n",
+ 				    0, 0, 0 );
+ 				/* split the original block */
+-				cont_free( &k2 );
++				cont_free( &k3 );
+ 				goto split;
+ 			}
+ 
+@@ -552,9 +558,6 @@
+ 			 */
+ 			if (id < ID_BLOCK_ID(tmp, ID_BLOCK_NIDS(tmp) - 1)) {
+ 			    ID id2 = ID_BLOCK_ID(tmp, ID_BLOCK_NIDS(tmp) - 1);
+-			    Datum k3;
+-
+-			    ldbm_datum_init( k3 );
+ 
+ 			    --ID_BLOCK_NIDS(tmp);
+ 			    /* This must succeed since we just popped one
+@@ -562,16 +565,11 @@
+ 			     */
+ 			    rc = idl_insert( &tmp, id, db->dbc_maxids );
+ 
+-				k3.dptr = ch_malloc(k2.dsize);
+-				k3.dsize = k2.dsize;
+-				AC_MEMCPY(k3.dptr, k2.dptr, k3.dsize);
+-			    if ( (rc = idl_store( be, db, k3, tmp )) != 0 ) {
++			    if ( (rc = idl_store( be, db, k2, tmp )) != 0 ) {
+ 				Debug( LDAP_DEBUG_ANY,
+ 			    "idl_insert_key: idl_store returned %d\n", rc, 0, 0 );
+ 			    }
+ 
+-				free( k3.dptr );
+-
+ 			    id = id2;
+ 			    /* This new id will necessarily be inserted
+ 			     * as the first id of the next block by the
+@@ -583,7 +581,7 @@
+ 			    db->dbc_maxids )) ) {
+ 			case 1:		/* id inserted first in block */
+ 				rc = idl_change_first( be, db, key, idl,
+-				    i + 1, k2, tmp2 );
++				    i + 1, k3, tmp2 );
+ 				/* FALL */
+ 
+ 			case 2:		/* id already there - how? */
+@@ -598,8 +596,10 @@
+ 					    id, 0, 0 );
+ 				}
+ 
++				cont_free( &k3 );
+ 				idl_free( tmp );
+ 				idl_free( tmp2 );
++				cont_free( &k2 );
+ 				idl_free( idl );
+ 				return( 0 );
+ 
+@@ -607,6 +607,7 @@
+ 				break;
+ 			}
+ 
++			cont_free( &k3 );
+ 			idl_free( tmp2 );
+ 		}
+ 
diff --git a/net/openldap20-server/files/patch-servers::slapd::daemon.c b/net/openldap20-server/files/patch-servers::slapd::daemon.c
index 75fced2..efa32ea 100644
--- a/net/openldap20-server/files/patch-servers::slapd::daemon.c
+++ b/net/openldap20-server/files/patch-servers::slapd::daemon.c
@@ -1,28 +1,21 @@
---- servers/slapd/daemon.c.orig	Thu Apr 24 07:51:08 2003
-+++ servers/slapd/daemon.c	Thu Apr 24 07:52:05 2003
-@@ -863,6 +863,7 @@
- 
- 			char	*dnsname = NULL;
- 			char	*peeraddr;
-+			char	peeraddr6[INET6_ADDRSTRLEN];
- #ifdef LDAP_PF_LOCAL
- 			char	peername[MAXPATHLEN + sizeof("PATH=")];
- #elif defined(LDAP_PF_INET6)
-@@ -995,12 +996,12 @@
- 					 peeraddr != NULL ? peeraddr : "unknown",
+#
+# ITS#1918: slapd panics with real ipv6 addresses
+#
+--- servers/slapd/daemon.c.orig	Tue Sep 23 17:21:54 2003
++++ servers/slapd/daemon.c	Tue Sep 23 17:25:02 2003
+@@ -996,10 +996,12 @@
  					 (unsigned) ntohs( from.sa_in6_addr.sin6_port ) );
  			} else {
--				char addr[INET6_ADDRSTRLEN];
--				sprintf( peername, "IP=%s %d",
+ 				char addr[INET6_ADDRSTRLEN];
++
++				peeraddr = (char *) inet_ntop( AF_INET6,
++						      &from.sa_in6_addr.sin6_addr,
++						      addr, sizeof addr );
+ 				sprintf( peername, "IP=%s %d",
 -					 inet_ntop( AF_INET6,
 -						    &from.sa_in6_addr.sin6_addr,
 -						    addr, sizeof addr) ? addr : "unknown",
-+				const char *addr = inet_ntop( AF_INET6,
-+																&from.sa_in6_addr.sin6_addr,
-+																peeraddr6, sizeof peeraddr6);
-+				sprintf( peername, "IP=%s %d", addr ? addr : "unknown",
++					 peeraddr != NULL ? peeraddr : "unknown",
  					 (unsigned) ntohs( from.sa_in6_addr.sin6_port ) );
-+				if (addr) peeraddr = addr;
  			}
  			break;
- #  endif /* LDAP_PF_INET6 */
diff --git a/net/openldap20-server/pkg-deinstall b/net/openldap20-server/pkg-deinstall
new file mode 100644
index 0000000..2a5ec1e
--- /dev/null
+++ b/net/openldap20-server/pkg-deinstall
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+ECHO_CMD=echo
+
+case $2 in
+POST-DEINSTALL)
+  ${ECHO_CMD}
+  ${ECHO_CMD} "The OpenLDAP server package has been deleted."
+  ${ECHO_CMD} "If you're *not* upgrading and won't be using"
+  ${ECHO_CMD} "it any longer, you may want to issue the"
+  ${ECHO_CMD} "following commands:"
+  ${ECHO_CMD}
+  if [ -d %%DATABASEDIR%% ]; then
+    ${ECHO_CMD} "- to delete the OpenLDAP database permanently (losing all data):"
+    ${ECHO_CMD} "  rm -Rf %%DATABASEDIR%%"
+    ${ECHO_CMD}
+  fi
+  if [ -d %%SLURPDIR%% ]; then
+    ${ECHO_CMD} "- to remove the OpenLDAP replication directory:"
+    ${ECHO_CMD} "  rm -Rf %%SLURPDIR%%"
+    ${ECHO_CMD}
+  fi
+  ${ECHO_CMD} "- to remove the OpenLDAP user:"
+  ${ECHO_CMD} "  pw userdel ldap"
+  ${ECHO_CMD}
+  ${ECHO_CMD} "If you are upgrading, don't forget to restart"
+  ${ECHO_CMD} "slapd and slurpd."
+  ${ECHO_CMD}
+  ;;
+esac
diff --git a/net/openldap20-server/pkg-install b/net/openldap20-server/pkg-install
index 47b2ea8..ee0a9e8 100644
--- a/net/openldap20-server/pkg-install
+++ b/net/openldap20-server/pkg-install
@@ -13,9 +13,9 @@ FTPUSERS=/etc/ftpusers
 case $2 in
 PRE-INSTALL)
   if ! ${PW} usershow -n ldap >/dev/null 2>&1; then
+    ${ECHO_CMD}
     if ! ${PW} groupshow -n ldap >/dev/null 2>&1; then
       if ! ${PW} groupadd -n ldap -g 389; then
-        ${ECHO_CMD}
         ${ECHO_CMD} "*** Failed to add a group ldap with id 389."
         ${ECHO_CMD}
         ${ECHO_CMD} "Please add the ldap user manually with"
@@ -24,12 +24,10 @@ PRE-INSTALL)
         ${ECHO_CMD} "and retry installing this package."
         exit 1
       fi
+      ${ECHO_CMD} "===>  Group 'ldap' created."
     fi
-    if ${PW} useradd -n ldap -u 389 -g ldap -c 'OpenLDAP Server' \
+    if ! ${PW} useradd -n ldap -u 389 -g ldap -c 'OpenLDAP Server' \
         -d /nonexistent -s /sbin/nologin -h -; then
-      ${GREP} -qs '^ldap$' ${FTPUSERS} || ${ECHO_CMD} ldap >> ${FTPUSERS}
-    else
-      ${ECHO_CMD}
       ${ECHO_CMD} "*** Failed to add an user ldap with id 389."
       ${ECHO_CMD}
       ${ECHO_CMD} "Please add the ldap user manually with"
@@ -38,6 +36,8 @@ PRE-INSTALL)
       ${ECHO_CMD} "and retry installing this package."
       exit 1
     fi
+    ${GREP} -qs '^ldap$' ${FTPUSERS} || ${ECHO_CMD} ldap >> ${FTPUSERS}
+    ${ECHO_CMD} "===>  Account 'ldap' created."
   fi
   ;;
 esac
diff --git a/net/openldap20-server/pkg-message.client b/net/openldap20-server/pkg-message.client
index ef3234f..92ef70d 100644
--- a/net/openldap20-server/pkg-message.client
+++ b/net/openldap20-server/pkg-message.client
@@ -6,4 +6,8 @@ Edit
   %%PREFIX%%/etc/openldap/ldap.conf
 to change the system-wide client defaults.
 
+Try `man ldap.conf' and visit the OpenLDAP FAQ-O-Matic at
+  http://www.OpenLDAP.org/faq/index.cgi?file=3
+for more information.
+
 ************************************************************
diff --git a/net/openldap20-server/pkg-plist b/net/openldap20-server/pkg-plist
index 0a4d061..e7a7ae7 100644
--- a/net/openldap20-server/pkg-plist
+++ b/net/openldap20-server/pkg-plist
@@ -1,38 +1,9 @@
 @comment $FreeBSD$
-@unexec %%RC_DIR%%/slapd%%RC_SUFX%% stop 2>/dev/null || true
-@unexec %%RC_DIR%%/slurpd%%RC_SUFX%% stop 2>/dev/null || true
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ -f %B/corba.schema ] || cp %B/%f %B/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ -f %B/core.schema ] || cp %B/%f %B/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ -f %B/cosine.schema ] || cp %B/%f %B/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ -f %B/inetorgperson.schema ] || cp %B/%f %B/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ -f %B/java.schema ] || cp %B/%f %B/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ -f %B/krb5-kdc.schema ] || cp %B/%f %B/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ -f %B/misc.schema ] || cp %B/%f %B/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ -f %B/nis.schema ] || cp %B/%f %B/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ -f %B/openldap.schema ] || cp %B/%f %B/openldap.schema
+@unexec %%RC_DIR%%/slapd%%RC_SUFX%% stop 2>&1 >/dev/null || true
+@unexec %%RC_DIR%%/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true
 @unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
 @exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf
-@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true
-@unexec rmdir %D/etc/openldap 2>/dev/null || true
 libexec/slapd
 libexec/slurpd
 sbin/slapadd
@@ -42,9 +13,6 @@ sbin/slappasswd
 @exec mkdir -p %%LDAP_RUN_DIR%%
 @exec mkdir -p %%DATABASEDIR%%
 @exec mkdir -p %%SLURPDIR%%
-@unexec rmdir %%LDAP_RUN_DIR%%
+@unexec rmdir %%LDAP_RUN_DIR%% 2>/dev/null || true
 @unexec rmdir %%DATABASEDIR%% 2>/dev/null || true
 @unexec rmdir %%SLURPDIR%% 2>/dev/null || true
-@cwd %%RC_DIR%%
-slapd%%RC_SUFX%%
-slurpd%%RC_SUFX%%