15821768 SUNBT7203918 openldap "make test" should only test distributed backends
authordoug leavitt <doug.leavitt@oracle.com>
Tue, 06 Aug 2013 14:25:22 -0700
changeset 1423 27b01995039c
parent 1422 77fbb0a4cf53
child 1424 cf1a67ff5b86
15821768 SUNBT7203918 openldap "make test" should only test distributed backends 15857036 pkg contents: slapd.conf overlay=allow requested 16538104 Starting svc:/network/ldap/server:openldap_24 fails 17165604 slapd and tools should be LP64 only 17177215 Enable ASLR for OpenLDAP 17191782 The OpenLDAP Server Administration exec_attr entries are out of date
components/openldap/Makefile
components/openldap/Solaris/exec_attr
components/openldap/Solaris/ldap-olslapd
components/openldap/Solaris/ldap-olslapd.xml
components/openldap/openldap.p5m
components/openldap/patches/00-test-makefile.patch
--- a/components/openldap/Makefile	Mon Aug 05 23:01:17 2013 -0700
+++ b/components/openldap/Makefile	Tue Aug 06 14:25:22 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 
@@ -50,7 +50,6 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-
 COMPONENT_PRE_CONFIGURE_ACTION = \
         ($(CLONEY) $(SOURCE_DIR) $(@D))
 
@@ -93,6 +92,9 @@
 COMPONENT_TEST_ENV += LD_LIBRARY_PATH="$(PROTOULD):$(PROTOULD)/$(MACH64):"
 COMPONENT_TEST_ARGS += -e
 
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:	$(BUILD_32_and_64)
 	(cd $(BUILD_DIR_32)/doc/guide/admin; \
--- a/components/openldap/Solaris/exec_attr	Mon Aug 05 23:01:17 2013 -0700
+++ b/components/openldap/Solaris/exec_attr	Tue Aug 06 14:25:22 2013 -0700
@@ -1,9 +1,1 @@
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slapd:uid=openldap;gid=openldap;privs=basic,net_privaddr
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slapacl:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slapadd:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slapauth:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slapcat:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slapdn:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slapindex:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slappasswd:uid=openldap;gid=openldap
-OpenLDAP Server Administration:suser:cmd:RO::/usr/sbin/slaptest:uid=openldap;gid=openldap
+OpenLDAP Server Administration:solaris:cmd:RO::/usr/lib/slapd:uid=openldap;gid=openldap;privs=basic,net_privaddr,file_dac_read,file_dac_write,file_dac_search
--- a/components/openldap/Solaris/ldap-olslapd	Mon Aug 05 23:01:17 2013 -0700
+++ b/components/openldap/Solaris/ldap-olslapd	Tue Aug 06 14:25:22 2013 -0700
@@ -21,13 +21,14 @@
 # CDDL HEADER END
 #
 
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 source /lib/svc/share/smf_include.sh
 
 typeset -r LDAPUSR=openldap
 typeset -r LDAPGRP=openldap
-typeset -r VARRUNDIR=/var/run/openldap
+typeset -r VARRUNDIR=/var/openldap/run
+typeset -r VARDATADIR=/var/openldap/openldap-data
 typeset -r PIDFILE=${VARRUNDIR}/slapd.pid
 typeset -r CONF_FILE=/etc/openldap/slapd.conf
 typeset -r SLAPD="/usr/lib/slapd -u ${LDAPUSR} -g ${LDAPGRP} -f ${CONF_FILE}"
@@ -38,12 +39,14 @@
 case "$1" in
 start)
         if [[ ! -d ${VARRUNDIR} ]] ; then
-		/usr/bin/mkdir -m 755 ${VARRUNDIR} || exit $SMF_EXIT_ERR_CONFIG
+		/usr/bin/mkdir -m 700 ${VARRUNDIR} || exit $SMF_EXIT_ERR_CONFIG
 		/usr/bin/chown ${LDAPUSR}:${LDAPGRP} ${VARRUNDIR}
         else
 		/bin/rm -f ${PIDFILE}
 	fi
 
+	cd ${VARDATADIR}
+	/usr/bin/db_recover >/dev/null 2>&1
         exec ${SLAPD} 2>&1
         ;;
 stop)
--- a/components/openldap/Solaris/ldap-olslapd.xml	Mon Aug 05 23:01:17 2013 -0700
+++ b/components/openldap/Solaris/ldap-olslapd.xml	Tue Aug 06 14:25:22 2013 -0700
@@ -22,7 +22,7 @@
 
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-    Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <service_bundle type='manifest' name='SUNWopenldapr:slapd'>
@@ -65,6 +65,12 @@
 		    name='start'
 		    exec='/lib/svc/method/ldap-olslapd start'
 		    timeout_seconds='60'>
+		    <method_context>
+			<method_credential
+			    user='openldap'
+			    group='openldap'
+			    privileges='basic,net_privaddr,file_dac_read,file_dac_write,file_dac_search' />
+		    </method_context>
 		</exec_method>
 
 		<exec_method
--- a/components/openldap/openldap.p5m	Mon Aug 05 23:01:17 2013 -0700
+++ b/components/openldap/openldap.p5m	Tue Aug 06 14:25:22 2013 -0700
@@ -25,23 +25,23 @@
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 <transform file path=(.+)/man/man1oldap/(.+).1oldap$ -> \
-	set action.hash %<\1>/man/man1/%<\2>.1>
+    set action.hash %<\1>/man/man1/%<\2>.1>
 <transform file path=(.+)/man/man3oldap/(.+).3oldap$ -> \
-	set action.hash %<\1>/man/man3/%<\2>.3>
+    set action.hash %<\1>/man/man3/%<\2>.3>
 <transform file path=(.+)/man/man5oldap/(.+).5oldap$ -> \
-	set action.hash %<\1>/man/man5/%<\2>.5>
+    set action.hash %<\1>/man/man5/%<\2>.5>
 <transform file path=(.+)/man/man8oldap/(.+).8oldap$ -> \
-	set action.hash %<\1>/man/man8/%<\2>.8>
+    set action.hash %<\1>/man/man8/%<\2>.8>
 <transform file path=usr/share/doc/openldap/images/(.+)$ -> \ 
-        set action.hash $(MACH32)/doc/guide/admin/%<1> >
+    set action.hash $(MACH32)/doc/guide/admin/%<1> >
 <transform file path=usr/share/doc/openldap/admin24/(.+)$ -> \
-        set action.hash $(MACH32)/doc/guide/admin/%<1> >
+    set action.hash $(MACH32)/doc/guide/admin/%<1> >
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value=OpenLDAP
 set name=pkg.description \
     value="OpenLDAP is an open source implementation of the Lightweight Directory Access Protocol."
-set name=pkg.summary value="OpenLDAP"
-set name=com.oracle.info.description value="OpenLDAP"
+set name=com.oracle.info.description value=OpenLDAP
 set name=com.oracle.info.tpno value=5295
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
@@ -49,11 +49,9 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2010/180
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=var/openldap/run
-
 file path=etc/openldap/DB_CONFIG.example
-file path=etc/openldap/ldap.conf mode=0644 owner=root group=openldap preserve=true
+file path=etc/openldap/ldap.conf owner=root group=openldap mode=0644 \
+    overlay=allow preserve=true
 file path=etc/openldap/ldap.conf.default
 file path=etc/openldap/schema/README
 file path=etc/openldap/schema/collective.schema
@@ -75,31 +73,24 @@
 file path=etc/openldap/schema/openldap.schema
 file path=etc/openldap/schema/pmi.schema
 file path=etc/openldap/schema/ppolicy.schema
-file path=etc/openldap/slapd.conf mode=0640 owner=root group=openldap preserve=true
+file path=etc/openldap/slapd.conf owner=openldap group=openldap mode=0600 \
+    overlay=allow preserve=true
 file path=etc/openldap/slapd.conf.default
 file Solaris/exec_attr path=etc/security/exec_attr.d/library:openldap
 file Solaris/prof_attr path=etc/security/prof_attr.d/library:openldap
 file Solaris/ldap-olslapd.xml \
     path=lib/svc/manifest/network/ldap/ldap-olslapd.xml
 file Solaris/ldap-olslapd path=lib/svc/method/ldap-olslapd
-file usr/bin/$(MACH64)/ldapcompare path=usr/bin/$(MACH64)/openldapcompare
-file usr/bin/$(MACH64)/ldapdelete path=usr/bin/$(MACH64)/openldapdelete
-file usr/bin/$(MACH64)/ldapexop path=usr/bin/$(MACH64)/openldapexop
-file usr/bin/$(MACH64)/ldapmodify path=usr/bin/$(MACH64)/openldapmodify
-file usr/bin/$(MACH64)/ldapmodrdn path=usr/bin/$(MACH64)/openldapmodrdn
-file usr/bin/$(MACH64)/ldappasswd path=usr/bin/$(MACH64)/openldappasswd
-file usr/bin/$(MACH64)/ldapsearch path=usr/bin/$(MACH64)/openldapsearch
-file usr/bin/$(MACH64)/ldapurl path=usr/bin/$(MACH64)/openldapurl
-file usr/bin/$(MACH64)/ldapwhoami path=usr/bin/$(MACH64)/openldapwhoami
-file usr/bin/ldapcompare path=usr/bin/openldapcompare
-file usr/bin/ldapdelete path=usr/bin/openldapdelete
-file usr/bin/ldapexop path=usr/bin/openldapexop
-file usr/bin/ldapmodify path=usr/bin/openldapmodify
-file usr/bin/ldapmodrdn path=usr/bin/openldapmodrdn
-file usr/bin/ldappasswd path=usr/bin/openldappasswd
-file usr/bin/ldapsearch path=usr/bin/openldapsearch
-file usr/bin/ldapurl path=usr/bin/openldapurl
-file usr/bin/ldapwhoami path=usr/bin/openldapwhoami
+link path=usr/bin/openldapadd target=openldapmodify
+file usr/bin/$(MACH64)/ldapcompare path=usr/bin/openldapcompare
+file usr/bin/$(MACH64)/ldapdelete path=usr/bin/openldapdelete
+file usr/bin/$(MACH64)/ldapexop path=usr/bin/openldapexop
+file usr/bin/$(MACH64)/ldapmodify path=usr/bin/openldapmodify
+file usr/bin/$(MACH64)/ldapmodrdn path=usr/bin/openldapmodrdn
+file usr/bin/$(MACH64)/ldappasswd path=usr/bin/openldappasswd
+file usr/bin/$(MACH64)/ldapsearch path=usr/bin/openldapsearch
+file usr/bin/$(MACH64)/ldapurl path=usr/bin/openldapurl
+file usr/bin/$(MACH64)/ldapwhoami path=usr/bin/openldapwhoami
 file path=usr/include/openldap/lber.h
 file path=usr/include/openldap/lber_types.h
 file path=usr/include/openldap/ldap.h
@@ -109,14 +100,48 @@
 file path=usr/include/openldap/ldap_utf8.h
 file path=usr/include/openldap/ldif.h
 file path=usr/include/openldap/slapi-plugin.h
+link path=usr/lib/$(MACH64)/liblber-2.4.so target=liblber-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/liblber-2.4.so.2 target=liblber-2.4.so.2.8.3
 file path=usr/lib/$(MACH64)/liblber-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/liblber.so target=liblber-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap-2.4.so target=libldap-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap-2.4.so.2 target=libldap-2.4.so.2.8.3
 file path=usr/lib/$(MACH64)/libldap-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap_r-2.4.so target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/$(MACH64)/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.8.3
 file path=usr/lib/$(MACH64)/libldap_r-2.4.so.2.8.3
-file path=usr/lib/$(MACH64)/slapd mode=0555
+link path=usr/lib/$(MACH64)/libldap_r.so target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/liblber-2.4.so target=liblber-2.4.so.2.8.3
+link path=usr/lib/liblber-2.4.so.2 target=liblber-2.4.so.2.8.3
 file path=usr/lib/liblber-2.4.so.2.8.3
+link path=usr/lib/liblber.so target=liblber-2.4.so.2.8.3
+link path=usr/lib/libldap-2.4.so target=libldap-2.4.so.2.8.3
+link path=usr/lib/libldap-2.4.so.2 target=libldap-2.4.so.2.8.3
 file path=usr/lib/libldap-2.4.so.2.8.3
+link path=usr/lib/libldap_r-2.4.so target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.8.3
 file path=usr/lib/libldap_r-2.4.so.2.8.3
-file path=usr/lib/slapd mode=0555
+link path=usr/lib/libldap_r.so target=libldap_r-2.4.so.2.8.3
+link path=usr/lib/openldap/bin/ldapadd target=../../../bin/openldapmodify
+link path=usr/lib/openldap/bin/ldapcompare target=../../../bin/openldapcompare
+link path=usr/lib/openldap/bin/ldapdelete target=../../../bin/openldapdelete
+link path=usr/lib/openldap/bin/ldapexop target=../../../bin/openldapexop
+link path=usr/lib/openldap/bin/ldapmodify target=../../../bin/openldapmodify
+link path=usr/lib/openldap/bin/ldapmodrdn target=../../../bin/openldapmodrdn
+link path=usr/lib/openldap/bin/ldappasswd target=../../../bin/openldappasswd
+link path=usr/lib/openldap/bin/ldapsearch target=../../../bin/openldapsearch
+link path=usr/lib/openldap/bin/ldapurl target=../../../bin/openldapurl
+link path=usr/lib/openldap/bin/ldapwhoami target=../../../bin/openldapwhoami
+file usr/lib/$(MACH64)/slapd path=usr/lib/slapd mode=0555
+link path=usr/sbin/slapacl target=../lib/slapd
+link path=usr/sbin/slapadd target=../lib/slapd
+link path=usr/sbin/slapauth target=../lib/slapd
+link path=usr/sbin/slapcat target=../lib/slapd
+link path=usr/sbin/slapdn target=../lib/slapd
+link path=usr/sbin/slapindex target=../lib/slapd
+link path=usr/sbin/slappasswd target=../lib/slapd
+link path=usr/sbin/slapschema target=../lib/slapd
+link path=usr/sbin/slaptest target=../lib/slapd
 file path=usr/share/doc/openldap/admin24/guide.html
 file path=usr/share/doc/openldap/admin24/index.html
 file path=usr/share/doc/openldap/images/allmail-en.png
@@ -138,6 +163,7 @@
 file path=usr/share/doc/openldap/images/set-following-references.png
 file path=usr/share/doc/openldap/images/set-memberUid.png
 file path=usr/share/doc/openldap/images/set-recursivegroup.png
+link path=usr/share/man/man1oldap/ldapadd.1oldap target=ldapmodify.1oldap
 file path=usr/share/man/man1oldap/ldapcompare.1oldap
 file path=usr/share/man/man1oldap/ldapdelete.1oldap
 file path=usr/share/man/man1oldap/ldapexop.1oldap
@@ -147,49 +173,272 @@
 file path=usr/share/man/man1oldap/ldapsearch.1oldap
 file path=usr/share/man/man1oldap/ldapurl.1oldap
 file path=usr/share/man/man1oldap/ldapwhoami.1oldap
+link path=usr/share/man/man3oldap/ber_alloc_t.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_bvarray_add.3oldap \
+    target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_bvarray_free.3oldap \
+    target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_bvdup.3oldap target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_bvecadd.3oldap target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_bvecfree.3oldap target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_bvfree.3oldap target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_bvstr.3oldap target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_bvstrdup.3oldap target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_dupbv.3oldap target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_first_element.3oldap \
+    target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_flush.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_free.3oldap target=lber-types.3oldap
+link path=usr/share/man/man3oldap/ber_get_bitstring.3oldap \
+    target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_get_boolean.3oldap \
+    target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_get_enum.3oldap target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_get_int.3oldap target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_get_next.3oldap target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_get_null.3oldap target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_get_stringa.3oldap \
+    target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_get_stringb.3oldap \
+    target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_next_element.3oldap \
+    target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_peek_tag.3oldap target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_printf.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_put_enum.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_put_int.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_put_null.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_put_ostring.3oldap \
+    target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_put_seq.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_put_set.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_put_string.3oldap \
+    target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_scanf.3oldap target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_skip_tag.3oldap target=lber-decode.3oldap
+link path=usr/share/man/man3oldap/ber_start_set.3oldap target=lber-encode.3oldap
+link path=usr/share/man/man3oldap/ber_str2bv.3oldap target=lber-types.3oldap
 file path=usr/share/man/man3oldap/lber-decode.3oldap
 file path=usr/share/man/man3oldap/lber-encode.3oldap
 file path=usr/share/man/man3oldap/lber-memory.3oldap
 file path=usr/share/man/man3oldap/lber-sockbuf.3oldap
 file path=usr/share/man/man3oldap/lber-types.3oldap
+link path=usr/share/man/man3oldap/ld_errno.3oldap target=ldap_error.3oldap
 file path=usr/share/man/man3oldap/ldap.3oldap
 file path=usr/share/man/man3oldap/ldap_abandon.3oldap
+link path=usr/share/man/man3oldap/ldap_abandon_ext.3oldap \
+    target=ldap_abandon.3oldap
 file path=usr/share/man/man3oldap/ldap_add.3oldap
+link path=usr/share/man/man3oldap/ldap_add_ext.3oldap target=ldap_add.3oldap
+link path=usr/share/man/man3oldap/ldap_add_ext_s.3oldap target=ldap_add.3oldap
+link path=usr/share/man/man3oldap/ldap_add_s.3oldap target=ldap_add.3oldap
+link path=usr/share/man/man3oldap/ldap_attributetype2name.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_attributetype2str.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_attributetype_free.3oldap \
+    target=ldap_schema.3oldap
 file path=usr/share/man/man3oldap/ldap_bind.3oldap
+link path=usr/share/man/man3oldap/ldap_bind_s.3oldap target=ldap_bind.3oldap
 file path=usr/share/man/man3oldap/ldap_compare.3oldap
+link path=usr/share/man/man3oldap/ldap_compare_ext.3oldap \
+    target=ldap_compare.3oldap
+link path=usr/share/man/man3oldap/ldap_compare_ext_s.3oldap \
+    target=ldap_compare.3oldap
+link path=usr/share/man/man3oldap/ldap_compare_s.3oldap \
+    target=ldap_compare.3oldap
+link path=usr/share/man/man3oldap/ldap_control_create.3oldap \
+    target=ldap_controls.3oldap
+link path=usr/share/man/man3oldap/ldap_control_dup.3oldap \
+    target=ldap_controls.3oldap
+link path=usr/share/man/man3oldap/ldap_control_find.3oldap \
+    target=ldap_controls.3oldap
+link path=usr/share/man/man3oldap/ldap_control_free.3oldap \
+    target=ldap_controls.3oldap
 file path=usr/share/man/man3oldap/ldap_controls.3oldap
+link path=usr/share/man/man3oldap/ldap_controls_dup.3oldap \
+    target=ldap_controls.3oldap
+link path=usr/share/man/man3oldap/ldap_controls_free.3oldap \
+    target=ldap_controls.3oldap
+link path=usr/share/man/man3oldap/ldap_count_entries.3oldap \
+    target=ldap_first_entry.3oldap
+link path=usr/share/man/man3oldap/ldap_count_messages.3oldap \
+    target=ldap_first_message.3oldap
+link path=usr/share/man/man3oldap/ldap_count_references.3oldap \
+    target=ldap_first_reference.3oldap
+link path=usr/share/man/man3oldap/ldap_count_values.3oldap \
+    target=ldap_get_values.3oldap
+link path=usr/share/man/man3oldap/ldap_count_values_len.3oldap \
+    target=ldap_get_values.3oldap
+link path=usr/share/man/man3oldap/ldap_dcedn2dn.3oldap target=ldap_get_dn.3oldap
 file path=usr/share/man/man3oldap/ldap_delete.3oldap
+link path=usr/share/man/man3oldap/ldap_delete_ext.3oldap \
+    target=ldap_delete.3oldap
+link path=usr/share/man/man3oldap/ldap_delete_ext_s.3oldap \
+    target=ldap_delete.3oldap
+link path=usr/share/man/man3oldap/ldap_delete_s.3oldap target=ldap_delete.3oldap
+link path=usr/share/man/man3oldap/ldap_destroy.3oldap target=ldap_dup.3oldap
+link path=usr/share/man/man3oldap/ldap_dn2ad_canonical.3oldap \
+    target=ldap_get_dn.3oldap
+link path=usr/share/man/man3oldap/ldap_dn2dcedn.3oldap target=ldap_get_dn.3oldap
+link path=usr/share/man/man3oldap/ldap_dn2str.3oldap target=ldap_get_dn.3oldap
+link path=usr/share/man/man3oldap/ldap_dn2ufn.3oldap target=ldap_get_dn.3oldap
 file path=usr/share/man/man3oldap/ldap_dup.3oldap
+link path=usr/share/man/man3oldap/ldap_err2string.3oldap \
+    target=ldap_error.3oldap
+link path=usr/share/man/man3oldap/ldap_errlist.3oldap target=ldap_error.3oldap
 file path=usr/share/man/man3oldap/ldap_error.3oldap
+link path=usr/share/man/man3oldap/ldap_explode_dn.3oldap \
+    target=ldap_get_dn.3oldap
+link path=usr/share/man/man3oldap/ldap_explode_rdn.3oldap \
+    target=ldap_get_dn.3oldap
 file path=usr/share/man/man3oldap/ldap_extended_operation.3oldap
+link path=usr/share/man/man3oldap/ldap_extended_operation_s.3oldap \
+    target=ldap_extended_operation.3oldap
 file path=usr/share/man/man3oldap/ldap_first_attribute.3oldap
 file path=usr/share/man/man3oldap/ldap_first_entry.3oldap
 file path=usr/share/man/man3oldap/ldap_first_message.3oldap
 file path=usr/share/man/man3oldap/ldap_first_reference.3oldap
+link path=usr/share/man/man3oldap/ldap_free_urldesc.3oldap \
+    target=ldap_url.3oldap
 file path=usr/share/man/man3oldap/ldap_get_dn.3oldap
 file path=usr/share/man/man3oldap/ldap_get_option.3oldap
 file path=usr/share/man/man3oldap/ldap_get_values.3oldap
+link path=usr/share/man/man3oldap/ldap_get_values_len.3oldap \
+    target=ldap_get_values.3oldap
+link path=usr/share/man/man3oldap/ldap_init.3oldap target=ldap_open.3oldap
+link path=usr/share/man/man3oldap/ldap_init_fd.3oldap target=ldap_open.3oldap
+link path=usr/share/man/man3oldap/ldap_initialize.3oldap target=ldap_open.3oldap
+link path=usr/share/man/man3oldap/ldap_install_tls.3oldap target=ldap_tls.3oldap
+link path=usr/share/man/man3oldap/ldap_is_ldap_url.3oldap target=ldap_url.3oldap
+link path=usr/share/man/man3oldap/ldap_matchingrule2name.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_matchingrule2str.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_matchingrule_free.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_memalloc.3oldap target=ldap_memory.3oldap
+link path=usr/share/man/man3oldap/ldap_memcalloc.3oldap \
+    target=ldap_memory.3oldap
+link path=usr/share/man/man3oldap/ldap_memfree.3oldap target=ldap_memory.3oldap
 file path=usr/share/man/man3oldap/ldap_memory.3oldap
+link path=usr/share/man/man3oldap/ldap_memrealloc.3oldap \
+    target=ldap_memory.3oldap
+link path=usr/share/man/man3oldap/ldap_memvfree.3oldap target=ldap_memory.3oldap
 file path=usr/share/man/man3oldap/ldap_modify.3oldap
+link path=usr/share/man/man3oldap/ldap_modify_ext.3oldap \
+    target=ldap_modify.3oldap
+link path=usr/share/man/man3oldap/ldap_modify_ext_s.3oldap \
+    target=ldap_modify.3oldap
+link path=usr/share/man/man3oldap/ldap_modify_s.3oldap target=ldap_modify.3oldap
 file path=usr/share/man/man3oldap/ldap_modrdn.3oldap
+link path=usr/share/man/man3oldap/ldap_modrdn2.3oldap target=ldap_modrdn.3oldap
+link path=usr/share/man/man3oldap/ldap_modrdn2_s.3oldap \
+    target=ldap_modrdn.3oldap
+link path=usr/share/man/man3oldap/ldap_modrdn_s.3oldap target=ldap_modrdn.3oldap
+link path=usr/share/man/man3oldap/ldap_mods_free.3oldap \
+    target=ldap_modify.3oldap
+link path=usr/share/man/man3oldap/ldap_msgfree.3oldap target=ldap_result.3oldap
+link path=usr/share/man/man3oldap/ldap_msgid.3oldap target=ldap_result.3oldap
+link path=usr/share/man/man3oldap/ldap_msgtype.3oldap target=ldap_result.3oldap
+link path=usr/share/man/man3oldap/ldap_next_attribute.3oldap \
+    target=ldap_first_attribute.3oldap
+link path=usr/share/man/man3oldap/ldap_next_entry.3oldap \
+    target=ldap_first_entry.3oldap
+link path=usr/share/man/man3oldap/ldap_next_message.3oldap \
+    target=ldap_first_message.3oldap
+link path=usr/share/man/man3oldap/ldap_next_reference.3oldap \
+    target=ldap_first_reference.3oldap
+link path=usr/share/man/man3oldap/ldap_objectclass2name.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_objectclass2str.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_objectclass_free.3oldap \
+    target=ldap_schema.3oldap
 file path=usr/share/man/man3oldap/ldap_open.3oldap
+link path=usr/share/man/man3oldap/ldap_parse_extended_result.3oldap \
+    target=ldap_parse_result.3oldap
 file path=usr/share/man/man3oldap/ldap_parse_reference.3oldap
 file path=usr/share/man/man3oldap/ldap_parse_result.3oldap
+link path=usr/share/man/man3oldap/ldap_parse_sasl_bind_result.3oldap \
+    target=ldap_parse_result.3oldap
 file path=usr/share/man/man3oldap/ldap_parse_sort_control.3oldap
 file path=usr/share/man/man3oldap/ldap_parse_vlv_control.3oldap
+link path=usr/share/man/man3oldap/ldap_perror.3oldap target=ldap_error.3oldap
 file path=usr/share/man/man3oldap/ldap_rename.3oldap
+link path=usr/share/man/man3oldap/ldap_rename_s.3oldap target=ldap_rename.3oldap
 file path=usr/share/man/man3oldap/ldap_result.3oldap
+link path=usr/share/man/man3oldap/ldap_result2error.3oldap \
+    target=ldap_error.3oldap
+link path=usr/share/man/man3oldap/ldap_sasl_bind.3oldap target=ldap_bind.3oldap
+link path=usr/share/man/man3oldap/ldap_sasl_bind_s.3oldap \
+    target=ldap_bind.3oldap
 file path=usr/share/man/man3oldap/ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_scherr2str.3oldap \
+    target=ldap_schema.3oldap
 file path=usr/share/man/man3oldap/ldap_search.3oldap
+link path=usr/share/man/man3oldap/ldap_search_ext.3oldap \
+    target=ldap_search.3oldap
+link path=usr/share/man/man3oldap/ldap_search_ext_s.3oldap \
+    target=ldap_search.3oldap
+link path=usr/share/man/man3oldap/ldap_search_s.3oldap target=ldap_search.3oldap
+link path=usr/share/man/man3oldap/ldap_search_st.3oldap \
+    target=ldap_search.3oldap
+link path=usr/share/man/man3oldap/ldap_set_option.3oldap \
+    target=ldap_get_option.3oldap
+link path=usr/share/man/man3oldap/ldap_set_rebind_proc.3oldap \
+    target=ldap_bind.3oldap
+link path=usr/share/man/man3oldap/ldap_set_urllist_proc.3oldap \
+    target=ldap_open.3oldap
+link path=usr/share/man/man3oldap/ldap_simple_bind.3oldap \
+    target=ldap_bind.3oldap
+link path=usr/share/man/man3oldap/ldap_simple_bind_s.3oldap \
+    target=ldap_bind.3oldap
 file path=usr/share/man/man3oldap/ldap_sort.3oldap
+link path=usr/share/man/man3oldap/ldap_sort_entries.3oldap \
+    target=ldap_sort.3oldap
+link path=usr/share/man/man3oldap/ldap_sort_strcasecmp.3oldap \
+    target=ldap_sort.3oldap
+link path=usr/share/man/man3oldap/ldap_sort_values.3oldap \
+    target=ldap_sort.3oldap
+link path=usr/share/man/man3oldap/ldap_start_tls.3oldap target=ldap_tls.3oldap
+link path=usr/share/man/man3oldap/ldap_start_tls_s.3oldap target=ldap_tls.3oldap
+link path=usr/share/man/man3oldap/ldap_str2attributetype.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_str2dn.3oldap target=ldap_get_dn.3oldap
+link path=usr/share/man/man3oldap/ldap_str2matchingrule.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_str2objectclass.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_str2syntax.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_strdup.3oldap target=ldap_memory.3oldap
 file path=usr/share/man/man3oldap/ldap_sync.3oldap
+link path=usr/share/man/man3oldap/ldap_syntax2name.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_syntax2str.3oldap \
+    target=ldap_schema.3oldap
+link path=usr/share/man/man3oldap/ldap_syntax_free.3oldap \
+    target=ldap_schema.3oldap
 file path=usr/share/man/man3oldap/ldap_tls.3oldap
+link path=usr/share/man/man3oldap/ldap_tls_inplace.3oldap target=ldap_tls.3oldap
+link path=usr/share/man/man3oldap/ldap_unbind.3oldap target=ldap_bind.3oldap
+link path=usr/share/man/man3oldap/ldap_unbind_ext.3oldap target=ldap_bind.3oldap
+link path=usr/share/man/man3oldap/ldap_unbind_ext_s.3oldap \
+    target=ldap_bind.3oldap
+link path=usr/share/man/man3oldap/ldap_unbind_s.3oldap target=ldap_bind.3oldap
 file path=usr/share/man/man3oldap/ldap_url.3oldap
+link path=usr/share/man/man3oldap/ldap_url_parse.3oldap target=ldap_url.3oldap
+link path=usr/share/man/man3oldap/ldap_value_free.3oldap \
+    target=ldap_get_values.3oldap
+link path=usr/share/man/man3oldap/ldap_value_free_len.3oldap \
+    target=ldap_get_values.3oldap
 file path=usr/share/man/man5oldap/ldap.conf.5oldap
 file path=usr/share/man/man5oldap/ldif.5oldap
 file path=usr/share/man/man5oldap/slapd-bdb.5oldap
 file path=usr/share/man/man5oldap/slapd-config.5oldap
 file path=usr/share/man/man5oldap/slapd-dnssrv.5oldap
+link path=usr/share/man/man5oldap/slapd-hdb.5oldap target=slapd-bdb.5oldap
 file path=usr/share/man/man5oldap/slapd-ldap.5oldap
 file path=usr/share/man/man5oldap/slapd-ldbm.5oldap
 file path=usr/share/man/man5oldap/slapd-ldif.5oldap
@@ -238,354 +487,13 @@
 file path=usr/share/man/man8oldap/slappasswd.8oldap
 file path=usr/share/man/man8oldap/slapschema.8oldap
 file path=usr/share/man/man8oldap/slaptest.8oldap
+dir  path=var/openldap owner=openldap group=openldap
+dir  path=var/openldap/openldap-data owner=openldap group=openldap mode=700
+file var/openldap/openldap-data/DB_CONFIG.example \
+    path=var/openldap/openldap-data/DB_CONFIG overlay=allow preserve=true
 file path=var/openldap/openldap-data/DB_CONFIG.example
+dir  path=var/openldap/run owner=openldap group=openldap mode=700
 group groupname=openldap gid=75
-license openldap.license license="openldap license"
-link path=usr/bin/$(MACH64)/openldapadd target=openldapmodify
-link path=usr/bin/openldapadd target=openldapmodify
-link path=usr/lib/$(MACH64)/liblber-2.4.so target=liblber-2.4.so.2.8.3
-link path=usr/lib/$(MACH64)/liblber-2.4.so.2 target=liblber-2.4.so.2.8.3
-link path=usr/lib/$(MACH64)/liblber.so target=liblber-2.4.so.2.8.3
-link path=usr/lib/$(MACH64)/libldap-2.4.so target=libldap-2.4.so.2.8.3
-link path=usr/lib/$(MACH64)/libldap-2.4.so.2 target=libldap-2.4.so.2.8.3
-link path=usr/lib/$(MACH64)/libldap_r-2.4.so target=libldap_r-2.4.so.2.8.3
-link path=usr/lib/$(MACH64)/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.8.3
-link path=usr/lib/$(MACH64)/libldap_r.so target=libldap_r-2.4.so.2.8.3
-link path=usr/lib/liblber-2.4.so target=liblber-2.4.so.2.8.3
-link path=usr/lib/liblber-2.4.so.2 target=liblber-2.4.so.2.8.3
-link path=usr/lib/liblber.so target=liblber-2.4.so.2.8.3
-link path=usr/lib/libldap-2.4.so target=libldap-2.4.so.2.8.3
-link path=usr/lib/libldap_r-2.4.so target=libldap_r-2.4.so.2.8.3
-link path=usr/lib/libldap-2.4.so.2 target=libldap-2.4.so.2.8.3
-link path=usr/lib/libldap_r-2.4.so.2 target=libldap_r-2.4.so.2.8.3
-link path=usr/lib/libldap_r.so target=libldap_r-2.4.so.2.8.3
-link path=usr/lib/openldap/bin/$(MACH64)/ldapadd target=../../../../bin/openldapmodify
-link path=usr/lib/openldap/bin/$(MACH64)/ldapcompare target=../../../../bin/openldapcompare
-link path=usr/lib/openldap/bin/$(MACH64)/ldapdelete target=../../../../bin/openldapdelete
-link path=usr/lib/openldap/bin/$(MACH64)/ldapexop target=../../../../bin/openldapexop
-link path=usr/lib/openldap/bin/$(MACH64)/ldapmodify target=../../../../bin/openldapmodify
-link path=usr/lib/openldap/bin/$(MACH64)/ldapmodrdn target=../../../../bin/openldapmodrdn
-link path=usr/lib/openldap/bin/$(MACH64)/ldappasswd target=../../../../bin/openldappasswd
-link path=usr/lib/openldap/bin/$(MACH64)/ldapsearch target=../../../../bin/openldapsearch
-link path=usr/lib/openldap/bin/$(MACH64)/ldapurl target=../../../../bin/openldapurl
-link path=usr/lib/openldap/bin/$(MACH64)/ldapwhoami target=../../../../bin/openldapwhoami
-link path=usr/lib/openldap/bin/ldapadd target=../../../bin/openldapmodify
-link path=usr/lib/openldap/bin/ldapcompare target=../../../bin/openldapcompare
-link path=usr/lib/openldap/bin/ldapdelete target=../../../bin/openldapdelete
-link path=usr/lib/openldap/bin/ldapexop target=../../../bin/openldapexop
-link path=usr/lib/openldap/bin/ldapmodify target=../../../bin/openldapmodify
-link path=usr/lib/openldap/bin/ldapmodrdn target=../../../bin/openldapmodrdn
-link path=usr/lib/openldap/bin/ldappasswd target=../../../bin/openldappasswd
-link path=usr/lib/openldap/bin/ldapsearch target=../../../bin/openldapsearch
-link path=usr/lib/openldap/bin/ldapurl target=../../../bin/openldapurl
-link path=usr/lib/openldap/bin/ldapwhoami target=../../../bin/openldapwhoami
-link path=usr/sbin/$(MACH64)/slapacl target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/$(MACH64)/slapadd target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/$(MACH64)/slapauth target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/$(MACH64)/slapcat target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/$(MACH64)/slapdn target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/$(MACH64)/slapindex target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/$(MACH64)/slappasswd target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/$(MACH64)/slapschema target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/$(MACH64)/slaptest target=../../lib/$(MACH64)/slapd
-link path=usr/sbin/slapacl target=../lib/slapd
-link path=usr/sbin/slapadd target=../lib/slapd
-link path=usr/sbin/slapauth target=../lib/slapd
-link path=usr/sbin/slapcat target=../lib/slapd
-link path=usr/sbin/slapdn target=../lib/slapd
-link path=usr/sbin/slapindex target=../lib/slapd
-link path=usr/sbin/slappasswd target=../lib/slapd
-link path=usr/sbin/slapschema target=../lib/slapd
-link path=usr/sbin/slaptest target=../lib/slapd
-link path=usr/share/man/man1oldap/ldapadd.1oldap \
-	target=ldapmodify.1oldap
-link path=usr/share/man/man3oldap/ber_alloc_t.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_bvarray_add.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_bvarray_free.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_bvdup.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_bvecadd.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_bvecfree.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_bvfree.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_bvstr.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_bvstrdup.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_dupbv.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_first_element.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_flush.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_free.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ber_get_bitstring.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_get_boolean.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_get_enum.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_get_int.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_get_next.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_get_null.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_get_stringa.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_get_stringb.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_next_element.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_peek_tag.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_printf.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_put_enum.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_put_int.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_put_null.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_put_ostring.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_put_seq.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_put_set.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_put_string.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_scanf.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_skip_tag.3oldap \
-	target=lber-decode.3oldap
-link path=usr/share/man/man3oldap/ber_start_set.3oldap \
-	target=lber-encode.3oldap
-link path=usr/share/man/man3oldap/ber_str2bv.3oldap \
-	target=lber-types.3oldap
-link path=usr/share/man/man3oldap/ld_errno.3oldap \
-	target=ldap_error.3oldap
-link path=usr/share/man/man3oldap/ldap_abandon_ext.3oldap \
-	target=ldap_abandon.3oldap
-link path=usr/share/man/man3oldap/ldap_add_ext.3oldap \
-	target=ldap_add.3oldap
-link path=usr/share/man/man3oldap/ldap_add_ext_s.3oldap \
-	target=ldap_add.3oldap
-link path=usr/share/man/man3oldap/ldap_add_s.3oldap \
-	target=ldap_add.3oldap
-link path=usr/share/man/man3oldap/ldap_attributetype2name.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_attributetype2str.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_attributetype_free.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_bind_s.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_compare_ext.3oldap \
-	target=ldap_compare.3oldap
-link path=usr/share/man/man3oldap/ldap_compare_ext_s.3oldap \
-	target=ldap_compare.3oldap
-link path=usr/share/man/man3oldap/ldap_compare_s.3oldap \
-	target=ldap_compare.3oldap
-link path=usr/share/man/man3oldap/ldap_control_create.3oldap \
-	target=ldap_controls.3oldap
-link path=usr/share/man/man3oldap/ldap_control_dup.3oldap \
-	target=ldap_controls.3oldap
-link path=usr/share/man/man3oldap/ldap_control_find.3oldap \
-	target=ldap_controls.3oldap
-link path=usr/share/man/man3oldap/ldap_control_free.3oldap \
-	target=ldap_controls.3oldap
-link path=usr/share/man/man3oldap/ldap_controls_dup.3oldap \
-	target=ldap_controls.3oldap
-link path=usr/share/man/man3oldap/ldap_controls_free.3oldap \
-	target=ldap_controls.3oldap
-link path=usr/share/man/man3oldap/ldap_count_entries.3oldap \
-	target=ldap_first_entry.3oldap
-link path=usr/share/man/man3oldap/ldap_count_messages.3oldap \
-	target=ldap_first_message.3oldap
-link path=usr/share/man/man3oldap/ldap_count_references.3oldap \
-	target=ldap_first_reference.3oldap
-link path=usr/share/man/man3oldap/ldap_count_values.3oldap \
-	target=ldap_get_values.3oldap
-link path=usr/share/man/man3oldap/ldap_count_values_len.3oldap \
-	target=ldap_get_values.3oldap
-link path=usr/share/man/man3oldap/ldap_dcedn2dn.3oldap \
-	target=ldap_get_dn.3oldap
-link path=usr/share/man/man3oldap/ldap_delete_ext.3oldap \
-	target=ldap_delete.3oldap
-link path=usr/share/man/man3oldap/ldap_delete_ext_s.3oldap \
-	target=ldap_delete.3oldap
-link path=usr/share/man/man3oldap/ldap_delete_s.3oldap \
-	target=ldap_delete.3oldap
-link path=usr/share/man/man3oldap/ldap_destroy.3oldap \
-	target=ldap_dup.3oldap
-link path=usr/share/man/man3oldap/ldap_dn2ad_canonical.3oldap \
-	target=ldap_get_dn.3oldap
-link path=usr/share/man/man3oldap/ldap_dn2dcedn.3oldap \
-	target=ldap_get_dn.3oldap
-link path=usr/share/man/man3oldap/ldap_dn2str.3oldap \
-	target=ldap_get_dn.3oldap
-link path=usr/share/man/man3oldap/ldap_dn2ufn.3oldap \
-	target=ldap_get_dn.3oldap
-link path=usr/share/man/man3oldap/ldap_err2string.3oldap \
-	target=ldap_error.3oldap
-link path=usr/share/man/man3oldap/ldap_errlist.3oldap \
-	target=ldap_error.3oldap
-link path=usr/share/man/man3oldap/ldap_explode_dn.3oldap \
-	target=ldap_get_dn.3oldap
-link path=usr/share/man/man3oldap/ldap_explode_rdn.3oldap \
-	target=ldap_get_dn.3oldap
-link path=usr/share/man/man3oldap/ldap_extended_operation_s.3oldap \
-	target=ldap_extended_operation.3oldap
-link path=usr/share/man/man3oldap/ldap_free_urldesc.3oldap \
-	target=ldap_url.3oldap
-link path=usr/share/man/man3oldap/ldap_get_values_len.3oldap \
-	target=ldap_get_values.3oldap
-link path=usr/share/man/man3oldap/ldap_init.3oldap \
-	target=ldap_open.3oldap
-link path=usr/share/man/man3oldap/ldap_init_fd.3oldap \
-	target=ldap_open.3oldap
-link path=usr/share/man/man3oldap/ldap_initialize.3oldap \
-	target=ldap_open.3oldap
-link path=usr/share/man/man3oldap/ldap_install_tls.3oldap \
-	target=ldap_tls.3oldap
-link path=usr/share/man/man3oldap/ldap_is_ldap_url.3oldap \
-	target=ldap_url.3oldap
-link path=usr/share/man/man3oldap/ldap_matchingrule2name.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_matchingrule2str.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_matchingrule_free.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_memalloc.3oldap \
-	target=ldap_memory.3oldap
-link path=usr/share/man/man3oldap/ldap_memcalloc.3oldap \
-	target=ldap_memory.3oldap
-link path=usr/share/man/man3oldap/ldap_memfree.3oldap \
-	target=ldap_memory.3oldap
-link path=usr/share/man/man3oldap/ldap_memrealloc.3oldap \
-	target=ldap_memory.3oldap
-link path=usr/share/man/man3oldap/ldap_memvfree.3oldap \
-	target=ldap_memory.3oldap
-link path=usr/share/man/man3oldap/ldap_modify_ext.3oldap \
-	target=ldap_modify.3oldap
-link path=usr/share/man/man3oldap/ldap_modify_ext_s.3oldap \
-	target=ldap_modify.3oldap
-link path=usr/share/man/man3oldap/ldap_modify_s.3oldap \
-	target=ldap_modify.3oldap
-link path=usr/share/man/man3oldap/ldap_modrdn2.3oldap \
-	target=ldap_modrdn.3oldap
-link path=usr/share/man/man3oldap/ldap_modrdn2_s.3oldap \
-	target=ldap_modrdn.3oldap
-link path=usr/share/man/man3oldap/ldap_modrdn_s.3oldap \
-	target=ldap_modrdn.3oldap
-link path=usr/share/man/man3oldap/ldap_mods_free.3oldap \
-	target=ldap_modify.3oldap
-link path=usr/share/man/man3oldap/ldap_msgfree.3oldap \
-	target=ldap_result.3oldap
-link path=usr/share/man/man3oldap/ldap_msgid.3oldap \
-	target=ldap_result.3oldap
-link path=usr/share/man/man3oldap/ldap_msgtype.3oldap \
-	target=ldap_result.3oldap
-link path=usr/share/man/man3oldap/ldap_next_attribute.3oldap \
-	target=ldap_first_attribute.3oldap
-link path=usr/share/man/man3oldap/ldap_next_entry.3oldap \
-	target=ldap_first_entry.3oldap
-link path=usr/share/man/man3oldap/ldap_next_message.3oldap \
-	target=ldap_first_message.3oldap
-link path=usr/share/man/man3oldap/ldap_next_reference.3oldap \
-	target=ldap_first_reference.3oldap
-link path=usr/share/man/man3oldap/ldap_objectclass2name.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_objectclass2str.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_objectclass_free.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_parse_extended_result.3oldap \
-	target=ldap_parse_result.3oldap
-link path=usr/share/man/man3oldap/ldap_parse_sasl_bind_result.3oldap \
-	target=ldap_parse_result.3oldap
-link path=usr/share/man/man3oldap/ldap_perror.3oldap \
-	target=ldap_error.3oldap
-link path=usr/share/man/man3oldap/ldap_rename_s.3oldap \
-	target=ldap_rename.3oldap
-link path=usr/share/man/man3oldap/ldap_result2error.3oldap \
-	target=ldap_error.3oldap
-link path=usr/share/man/man3oldap/ldap_sasl_bind.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_sasl_bind_s.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_scherr2str.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_search_ext.3oldap \
-	target=ldap_search.3oldap
-link path=usr/share/man/man3oldap/ldap_search_ext_s.3oldap \
-	target=ldap_search.3oldap
-link path=usr/share/man/man3oldap/ldap_search_s.3oldap \
-	target=ldap_search.3oldap
-link path=usr/share/man/man3oldap/ldap_search_st.3oldap \
-	target=ldap_search.3oldap
-link path=usr/share/man/man3oldap/ldap_set_option.3oldap \
-	target=ldap_get_option.3oldap
-link path=usr/share/man/man3oldap/ldap_set_rebind_proc.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_set_urllist_proc.3oldap \
-	target=ldap_open.3oldap
-link path=usr/share/man/man3oldap/ldap_simple_bind.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_simple_bind_s.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_sort_entries.3oldap \
-	target=ldap_sort.3oldap
-link path=usr/share/man/man3oldap/ldap_sort_strcasecmp.3oldap \
-	target=ldap_sort.3oldap
-link path=usr/share/man/man3oldap/ldap_sort_values.3oldap \
-	target=ldap_sort.3oldap
-link path=usr/share/man/man3oldap/ldap_start_tls.3oldap \
-	target=ldap_tls.3oldap
-link path=usr/share/man/man3oldap/ldap_start_tls_s.3oldap \
-	target=ldap_tls.3oldap
-link path=usr/share/man/man3oldap/ldap_str2attributetype.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_str2dn.3oldap \
-	target=ldap_get_dn.3oldap
-link path=usr/share/man/man3oldap/ldap_str2matchingrule.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_str2objectclass.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_str2syntax.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_strdup.3oldap \
-	target=ldap_memory.3oldap
-link path=usr/share/man/man3oldap/ldap_syntax2name.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_syntax2str.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_syntax_free.3oldap \
-	target=ldap_schema.3oldap
-link path=usr/share/man/man3oldap/ldap_tls_inplace.3oldap \
-	target=ldap_tls.3oldap
-link path=usr/share/man/man3oldap/ldap_unbind.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_unbind_ext.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_unbind_ext_s.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_unbind_s.3oldap \
-	target=ldap_bind.3oldap
-link path=usr/share/man/man3oldap/ldap_url_parse.3oldap \
-	target=ldap_url.3oldap
-link path=usr/share/man/man3oldap/ldap_value_free.3oldap \
-	target=ldap_get_values.3oldap
-link path=usr/share/man/man3oldap/ldap_value_free_len.3oldap \
-	target=ldap_get_values.3oldap
-link path=usr/share/man/man5oldap/slapd-hdb.5oldap \
-	target=slapd-bdb.5oldap
 user username=openldap ftpuser=false gcos-field="OpenLDAP User" group=openldap \
     uid=75
+license openldap.license license="openldap license"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openldap/patches/00-test-makefile.patch	Tue Aug 06 14:25:22 2013 -0700
@@ -0,0 +1,11 @@
+--- openldap-2.4.30/tests/Makefile.in.old	Thu Oct 11 10:08:07 2012
++++ openldap-2.4.30/tests/Makefile.in	Thu Oct 11 10:23:23 2012
[email protected]@ -25,7 +25,6 @@
+ test tests:
+ 	@$(MAKE) bdb
+ 	@$(MAKE) hdb
+-	@$(MAKE) mdb
+ 
+ # test all backends
+ alltests: tests
+