[Pkg-openldap-devel] r881 - in openldap/vendor/openldap-release: . build clients clients/tools contrib contrib/ldapc++ contrib/ldapc++/examples contrib/ldapc++/src contrib/ldapc++/src/ac contrib/ldaptcl contrib/slapd-modules contrib/slapd-modules/acl contrib/slapd-modules/addpartial contrib/slapd-modules/allop contrib/slapd-modules/comp_match contrib/slapd-modules/denyop contrib/slapd-modules/dsaschema contrib/slapd-modules/lastmod contrib/slapd-modules/passwd contrib/slapd-modules/proxyOld contrib/slapd-modules/smbk5pwd contrib/slapd-modules/trace doc doc/devel doc/guide doc/guide/admin doc/guide/release doc/man doc/man/man1 doc/man/man3 doc/man/man5 doc/man/man8 include include/ac libraries libraries/liblber libraries/libldap libraries/libldap_r libraries/liblunicode libraries/liblunicode/ucdata libraries/liblunicode/ure libraries/liblunicode/utbm libraries/liblutil libraries/librewrite servers servers/slapd servers/slapd/back-bdb servers/slapd/back-dnssrv servers/slapd/back-hdb servers/slapd/back-ldap servers/slapd/back-ldif servers/slapd/back-meta servers/slapd/back-monitor servers/slapd/back-null servers/slapd/back-passwd servers/slapd/back-perl servers/slapd/back-relay servers/slapd/back-shell servers/slapd/back-sql servers/slapd/back-sql/rdbms_depend/ibmdb2 servers/slapd/back-sql/rdbms_depend/mysql servers/slapd/back-sql/rdbms_depend/oracle servers/slapd/back-sql/rdbms_depend/pgsql servers/slapd/back-sql/rdbms_depend/timesten servers/slapd/overlays servers/slapd/schema servers/slapd/shell-backends servers/slapd/slapi tests tests/data tests/data/regressions tests/data/regressions/its4184 tests/data/regressions/its4326 tests/data/regressions/its4336 tests/data/regressions/its4337 tests/data/regressions/its4448 tests/data/sql-concurrency tests/progs tests/scripts
Steve Langasek
vorlon at alioth.debian.org
Sat Dec 15 09:23:34 UTC 2007
Author: vorlon
Date: 2007-12-15 09:23:29 +0000 (Sat, 15 Dec 2007)
New Revision: 881
Added:
openldap/vendor/openldap-release/build/db.4.2.52.patch
openldap/vendor/openldap-release/clients/tools/ldapexop.c
openldap/vendor/openldap-release/contrib/ConfigOIDs
openldap/vendor/openldap-release/contrib/ldapc++/examples/urlTest.cpp
openldap/vendor/openldap-release/contrib/ldaptcl/
openldap/vendor/openldap-release/contrib/ldaptcl/CHANGES
openldap/vendor/openldap-release/contrib/ldaptcl/COPYRIGHT
openldap/vendor/openldap-release/contrib/ldaptcl/Makefile.in
openldap/vendor/openldap-release/contrib/ldaptcl/README
openldap/vendor/openldap-release/contrib/ldaptcl/configure
openldap/vendor/openldap-release/contrib/ldaptcl/configure.in
openldap/vendor/openldap-release/contrib/ldaptcl/install-sh
openldap/vendor/openldap-release/contrib/ldaptcl/ldap.n
openldap/vendor/openldap-release/contrib/ldaptcl/ldaperr.tcl
openldap/vendor/openldap-release/contrib/ldaptcl/man.macros
openldap/vendor/openldap-release/contrib/ldaptcl/neoXldap.c
openldap/vendor/openldap-release/contrib/ldaptcl/pkgIndex.tcl.in
openldap/vendor/openldap-release/contrib/ldaptcl/tclAppInit.c
openldap/vendor/openldap-release/contrib/ldaptcl/tkAppInit.c
openldap/vendor/openldap-release/contrib/slapd-modules/addpartial/
openldap/vendor/openldap-release/contrib/slapd-modules/addpartial/COPYRIGHT
openldap/vendor/openldap-release/contrib/slapd-modules/addpartial/LICENSE
openldap/vendor/openldap-release/contrib/slapd-modules/addpartial/Makefile
openldap/vendor/openldap-release/contrib/slapd-modules/addpartial/README
openldap/vendor/openldap-release/contrib/slapd-modules/addpartial/addpartial-overlay.c
openldap/vendor/openldap-release/contrib/slapd-modules/allop/
openldap/vendor/openldap-release/contrib/slapd-modules/allop/README
openldap/vendor/openldap-release/contrib/slapd-modules/allop/allop.c
openldap/vendor/openldap-release/contrib/slapd-modules/allop/slapo-allop.5
openldap/vendor/openldap-release/contrib/slapd-modules/denyop/
openldap/vendor/openldap-release/contrib/slapd-modules/denyop/denyop.c
openldap/vendor/openldap-release/contrib/slapd-modules/lastmod/
openldap/vendor/openldap-release/contrib/slapd-modules/lastmod/lastmod.c
openldap/vendor/openldap-release/contrib/slapd-modules/lastmod/slapo-lastmod.5
openldap/vendor/openldap-release/contrib/slapd-modules/passwd/radius.c
openldap/vendor/openldap-release/contrib/slapd-modules/proxyOld/
openldap/vendor/openldap-release/contrib/slapd-modules/proxyOld/Makefile
openldap/vendor/openldap-release/contrib/slapd-modules/proxyOld/README
openldap/vendor/openldap-release/contrib/slapd-modules/proxyOld/proxyOld.c
openldap/vendor/openldap-release/contrib/slapd-modules/trace/
openldap/vendor/openldap-release/contrib/slapd-modules/trace/trace.c
openldap/vendor/openldap-release/doc/guide/admin/README.spellcheck
openldap/vendor/openldap-release/doc/guide/admin/appendix-changes.sdf
openldap/vendor/openldap-release/doc/guide/admin/appendix-common-errors.sdf
openldap/vendor/openldap-release/doc/guide/admin/appendix-configs.sdf
openldap/vendor/openldap-release/doc/guide/admin/appendix-contrib.sdf
openldap/vendor/openldap-release/doc/guide/admin/appendix-deployments.sdf
openldap/vendor/openldap-release/doc/guide/admin/appendix-ldap-result-codes.sdf
openldap/vendor/openldap-release/doc/guide/admin/appendix-recommended-versions.sdf
openldap/vendor/openldap-release/doc/guide/admin/appendix-upgrading.sdf
openldap/vendor/openldap-release/doc/guide/admin/aspell.en.pws
openldap/vendor/openldap-release/doc/guide/admin/backends.sdf
openldap/vendor/openldap-release/doc/guide/admin/config_dit.png
openldap/vendor/openldap-release/doc/guide/admin/config_local.png
openldap/vendor/openldap-release/doc/guide/admin/config_ref.png
openldap/vendor/openldap-release/doc/guide/admin/glossary.sdf
openldap/vendor/openldap-release/doc/guide/admin/guide.book
openldap/vendor/openldap-release/doc/guide/admin/intro_dctree.png
openldap/vendor/openldap-release/doc/guide/admin/intro_tree.png
openldap/vendor/openldap-release/doc/guide/admin/maintenance.sdf
openldap/vendor/openldap-release/doc/guide/admin/overlays.sdf
openldap/vendor/openldap-release/doc/guide/admin/troubleshooting.sdf
openldap/vendor/openldap-release/doc/man/Project
openldap/vendor/openldap-release/doc/man/man3/Deprecated
openldap/vendor/openldap-release/doc/man/man3/lber-sockbuf.3
openldap/vendor/openldap-release/doc/man/man3/ldap_controls.3
openldap/vendor/openldap-release/doc/man/man3/ldap_controls.3.links
openldap/vendor/openldap-release/doc/man/man3/ldap_extended_operation.3
openldap/vendor/openldap-release/doc/man/man3/ldap_extended_operation.3.links
openldap/vendor/openldap-release/doc/man/man3/ldap_get_option.3
openldap/vendor/openldap-release/doc/man/man3/ldap_get_option.3.links
openldap/vendor/openldap-release/doc/man/man3/ldap_memory.3
openldap/vendor/openldap-release/doc/man/man3/ldap_memory.3.links
openldap/vendor/openldap-release/doc/man/man3/ldap_parse_sort_control.3
openldap/vendor/openldap-release/doc/man/man3/ldap_parse_vlv_control.3
openldap/vendor/openldap-release/doc/man/man3/ldap_rename.3
openldap/vendor/openldap-release/doc/man/man3/ldap_rename.3.links
openldap/vendor/openldap-release/doc/man/man3/ldap_sync.3
openldap/vendor/openldap-release/doc/man/man3/ldap_tls.3
openldap/vendor/openldap-release/doc/man/man3/ldap_tls.3.links
openldap/vendor/openldap-release/doc/man/man5/slapd-config.5
openldap/vendor/openldap-release/doc/man/man5/slapd.backends.5
openldap/vendor/openldap-release/doc/man/man5/slapd.overlays.5
openldap/vendor/openldap-release/doc/man/man5/slapo-constraint.5
openldap/vendor/openldap-release/doc/man/man5/slapo-dds.5
openldap/vendor/openldap-release/doc/man/man5/slapo-dyngroup.5
openldap/vendor/openldap-release/doc/man/man5/slapo-memberof.5
openldap/vendor/openldap-release/libraries/libldap/dds.c
openldap/vendor/openldap-release/libraries/libldap/ldap_sync.c
openldap/vendor/openldap-release/libraries/libldap/pagectrl.c
openldap/vendor/openldap-release/libraries/libldap/stctrl.c
openldap/vendor/openldap-release/libraries/libldap/urltest.c
openldap/vendor/openldap-release/libraries/libldap_r/rmutex.c
openldap/vendor/openldap-release/libraries/liblutil/testtavl.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/monitor.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/distproc.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/monitor.c
openldap/vendor/openldap-release/servers/slapd/overlays/constraint.c
openldap/vendor/openldap-release/servers/slapd/overlays/dds.c
openldap/vendor/openldap-release/servers/slapd/overlays/memberof.c
openldap/vendor/openldap-release/servers/slapd/schema/collective.schema
openldap/vendor/openldap-release/servers/slapd/schema/corba.schema
openldap/vendor/openldap-release/servers/slapd/schema/core.ldif
openldap/vendor/openldap-release/servers/slapd/schema/core.schema
openldap/vendor/openldap-release/servers/slapd/schema/cosine.ldif
openldap/vendor/openldap-release/servers/slapd/schema/cosine.schema
openldap/vendor/openldap-release/servers/slapd/schema/duaconf.schema
openldap/vendor/openldap-release/servers/slapd/schema/inetorgperson.ldif
openldap/vendor/openldap-release/servers/slapd/schema/java.schema
openldap/vendor/openldap-release/servers/slapd/schema/nadf.schema
openldap/vendor/openldap-release/servers/slapd/schema/nis.ldif
openldap/vendor/openldap-release/servers/slapd/schema/ppolicy.schema
openldap/vendor/openldap-release/servers/slapd/slapd.ldif
openldap/vendor/openldap-release/servers/slapd/txn.c
openldap/vendor/openldap-release/tests/data/dds.out
openldap/vendor/openldap-release/tests/data/do_bind.0
openldap/vendor/openldap-release/tests/data/memberof.out
openldap/vendor/openldap-release/tests/data/regressions/
openldap/vendor/openldap-release/tests/data/regressions/README
openldap/vendor/openldap-release/tests/data/regressions/its4184/
openldap/vendor/openldap-release/tests/data/regressions/its4184/README
openldap/vendor/openldap-release/tests/data/regressions/its4184/adds.ldif
openldap/vendor/openldap-release/tests/data/regressions/its4184/its4184
openldap/vendor/openldap-release/tests/data/regressions/its4184/mods.ldif
openldap/vendor/openldap-release/tests/data/regressions/its4184/slapd.conf
openldap/vendor/openldap-release/tests/data/regressions/its4326/
openldap/vendor/openldap-release/tests/data/regressions/its4326/its4326
openldap/vendor/openldap-release/tests/data/regressions/its4326/slapd.conf
openldap/vendor/openldap-release/tests/data/regressions/its4336/
openldap/vendor/openldap-release/tests/data/regressions/its4336/its4336
openldap/vendor/openldap-release/tests/data/regressions/its4336/slapd.conf
openldap/vendor/openldap-release/tests/data/regressions/its4337/
openldap/vendor/openldap-release/tests/data/regressions/its4337/config.out
openldap/vendor/openldap-release/tests/data/regressions/its4337/its4337
openldap/vendor/openldap-release/tests/data/regressions/its4337/slapd.conf
openldap/vendor/openldap-release/tests/data/regressions/its4448/
openldap/vendor/openldap-release/tests/data/regressions/its4448/its4448
openldap/vendor/openldap-release/tests/data/regressions/its4448/slapd-meta.conf
openldap/vendor/openldap-release/tests/data/slapd-config-naked.conf
openldap/vendor/openldap-release/tests/data/slapd-config-undo.conf
openldap/vendor/openldap-release/tests/data/slapd-dds.conf
openldap/vendor/openldap-release/tests/data/slapd-dynamic.ldif
openldap/vendor/openldap-release/tests/data/slapd-meta-target1.conf
openldap/vendor/openldap-release/tests/data/slapd-meta-target2.conf
openldap/vendor/openldap-release/tests/data/slapd-repl-slave-remote.conf
openldap/vendor/openldap-release/tests/data/slapd-syncrepl-multiproxy.conf
openldap/vendor/openldap-release/tests/data/slapd-syncrepl-slave-persist-ldap.conf
openldap/vendor/openldap-release/tests/data/sql-concurrency/do_bind.0
openldap/vendor/openldap-release/tests/progs/slapd-common.c
openldap/vendor/openldap-release/tests/progs/slapd-common.h
openldap/vendor/openldap-release/tests/scripts/its-all
openldap/vendor/openldap-release/tests/scripts/test045-syncreplication-proxied
openldap/vendor/openldap-release/tests/scripts/test046-dds
openldap/vendor/openldap-release/tests/scripts/test047-ldap
openldap/vendor/openldap-release/tests/scripts/test048-syncrepl-multiproxy
openldap/vendor/openldap-release/tests/scripts/test049-sync-config
openldap/vendor/openldap-release/tests/scripts/test050-syncrepl-multimaster
openldap/vendor/openldap-release/tests/scripts/test051-config-undo
openldap/vendor/openldap-release/tests/scripts/test052-memberof
Removed:
openldap/vendor/openldap-release/contrib/ldapc++/acconfig.h
openldap/vendor/openldap-release/contrib/ldapc++/mkinstalldirs
openldap/vendor/openldap-release/contrib/ldapc++/stamp-h.in
openldap/vendor/openldap-release/doc/guide/admin/config_dit.gif
openldap/vendor/openldap-release/doc/guide/admin/config_local.gif
openldap/vendor/openldap-release/doc/guide/admin/config_ref.gif
openldap/vendor/openldap-release/doc/guide/admin/config_x500fe.gif
openldap/vendor/openldap-release/doc/guide/admin/config_x500ref.gif
openldap/vendor/openldap-release/doc/guide/admin/intro_dctree.gif
openldap/vendor/openldap-release/doc/guide/admin/intro_tree.gif
openldap/vendor/openldap-release/doc/guide/admin/proxycache.sdf
openldap/vendor/openldap-release/doc/guide/admin/replication.gif
openldap/vendor/openldap-release/doc/guide/admin/syncrepl.sdf
openldap/vendor/openldap-release/doc/man/man5/slapd-tcl.5
openldap/vendor/openldap-release/doc/man/man5/slapd.replog.5
openldap/vendor/openldap-release/doc/man/man5/slapo-lastmod.5
openldap/vendor/openldap-release/doc/man/man8/slurpd.8
openldap/vendor/openldap-release/include/ac/krb.h
openldap/vendor/openldap-release/include/ac/krb5.h
openldap/vendor/openldap-release/libraries/libldap/groupings.c
openldap/vendor/openldap-release/libraries/libldap/kbind.c
openldap/vendor/openldap-release/servers/slapd/back-ldbm/
openldap/vendor/openldap-release/servers/slapd/back-relay/config.c
openldap/vendor/openldap-release/servers/slapd/kerberos.c
openldap/vendor/openldap-release/servers/slapd/overlays/denyop.c
openldap/vendor/openldap-release/servers/slapd/overlays/lastmod.c
openldap/vendor/openldap-release/servers/slapd/repl.c
openldap/vendor/openldap-release/servers/slurpd/
openldap/vendor/openldap-release/tests/data/slapd-meta2.conf
openldap/vendor/openldap-release/tests/data/slapd-repl-master.conf
openldap/vendor/openldap-release/tests/data/slapd-repl-slave.conf
openldap/vendor/openldap-release/tests/scripts/test007-replication
Modified:
openldap/vendor/openldap-release/ANNOUNCEMENT
openldap/vendor/openldap-release/CHANGES
openldap/vendor/openldap-release/COPYRIGHT
openldap/vendor/openldap-release/Makefile.in
openldap/vendor/openldap-release/README
openldap/vendor/openldap-release/build/config.guess
openldap/vendor/openldap-release/build/config.sub
openldap/vendor/openldap-release/build/crupdate
openldap/vendor/openldap-release/build/dir.mk
openldap/vendor/openldap-release/build/info.mk
openldap/vendor/openldap-release/build/lib-shared.mk
openldap/vendor/openldap-release/build/lib-static.mk
openldap/vendor/openldap-release/build/lib.mk
openldap/vendor/openldap-release/build/ltmain.sh
openldap/vendor/openldap-release/build/man.mk
openldap/vendor/openldap-release/build/mkdep
openldap/vendor/openldap-release/build/mkrelease
openldap/vendor/openldap-release/build/mkvers.bat
openldap/vendor/openldap-release/build/mkversion
openldap/vendor/openldap-release/build/mod.mk
openldap/vendor/openldap-release/build/openldap.m4
openldap/vendor/openldap-release/build/rules.mk
openldap/vendor/openldap-release/build/srv.mk
openldap/vendor/openldap-release/build/top.mk
openldap/vendor/openldap-release/build/version.sh
openldap/vendor/openldap-release/build/version.var
openldap/vendor/openldap-release/clients/Makefile.in
openldap/vendor/openldap-release/clients/tools/Makefile.in
openldap/vendor/openldap-release/clients/tools/common.c
openldap/vendor/openldap-release/clients/tools/common.h
openldap/vendor/openldap-release/clients/tools/ldapcompare.c
openldap/vendor/openldap-release/clients/tools/ldapdelete.c
openldap/vendor/openldap-release/clients/tools/ldapmodify.c
openldap/vendor/openldap-release/clients/tools/ldapmodrdn.c
openldap/vendor/openldap-release/clients/tools/ldappasswd.c
openldap/vendor/openldap-release/clients/tools/ldapsearch.c
openldap/vendor/openldap-release/clients/tools/ldapwhoami.c
openldap/vendor/openldap-release/configure
openldap/vendor/openldap-release/configure.in
openldap/vendor/openldap-release/contrib/README
openldap/vendor/openldap-release/contrib/ldapc++/Makefile.in
openldap/vendor/openldap-release/contrib/ldapc++/aclocal.m4
openldap/vendor/openldap-release/contrib/ldapc++/configure
openldap/vendor/openldap-release/contrib/ldapc++/configure.in
openldap/vendor/openldap-release/contrib/ldapc++/depcomp
openldap/vendor/openldap-release/contrib/ldapc++/examples/Makefile.am
openldap/vendor/openldap-release/contrib/ldapc++/examples/Makefile.in
openldap/vendor/openldap-release/contrib/ldapc++/examples/main.cpp
openldap/vendor/openldap-release/contrib/ldapc++/examples/readSchema.cpp
openldap/vendor/openldap-release/contrib/ldapc++/install-sh
openldap/vendor/openldap-release/contrib/ldapc++/ltmain.sh
openldap/vendor/openldap-release/contrib/ldapc++/missing
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPAsynConnection.cpp
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPAsynConnection.h
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPAttrType.cpp
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPAttrType.h
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPEntry.cpp
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPEntry.h
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPException.cpp
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPException.h
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPMessageQueue.cpp
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPMessageQueue.h
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPUrl.cpp
openldap/vendor/openldap-release/contrib/ldapc++/src/LDAPUrl.h
openldap/vendor/openldap-release/contrib/ldapc++/src/Makefile.in
openldap/vendor/openldap-release/contrib/ldapc++/src/ac/time.h
openldap/vendor/openldap-release/contrib/ldapc++/src/config.h.in
openldap/vendor/openldap-release/contrib/slapd-modules/acl/posixgroup.c
openldap/vendor/openldap-release/contrib/slapd-modules/comp_match/Makefile
openldap/vendor/openldap-release/contrib/slapd-modules/dsaschema/dsaschema.c
openldap/vendor/openldap-release/contrib/slapd-modules/passwd/README
openldap/vendor/openldap-release/contrib/slapd-modules/passwd/kerberos.c
openldap/vendor/openldap-release/contrib/slapd-modules/passwd/netscape.c
openldap/vendor/openldap-release/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
openldap/vendor/openldap-release/doc/Makefile.in
openldap/vendor/openldap-release/doc/devel/args
openldap/vendor/openldap-release/doc/devel/todo
openldap/vendor/openldap-release/doc/devel/toolargs
openldap/vendor/openldap-release/doc/guide/COPYRIGHT
openldap/vendor/openldap-release/doc/guide/admin/Makefile
openldap/vendor/openldap-release/doc/guide/admin/abstract.sdf
openldap/vendor/openldap-release/doc/guide/admin/admin.sdf
openldap/vendor/openldap-release/doc/guide/admin/config.sdf
openldap/vendor/openldap-release/doc/guide/admin/dbtools.sdf
openldap/vendor/openldap-release/doc/guide/admin/guide.html
openldap/vendor/openldap-release/doc/guide/admin/guide.sdf
openldap/vendor/openldap-release/doc/guide/admin/index.sdf
openldap/vendor/openldap-release/doc/guide/admin/install.sdf
openldap/vendor/openldap-release/doc/guide/admin/intro.sdf
openldap/vendor/openldap-release/doc/guide/admin/master.sdf
openldap/vendor/openldap-release/doc/guide/admin/monitoringslapd.sdf
openldap/vendor/openldap-release/doc/guide/admin/preface.sdf
openldap/vendor/openldap-release/doc/guide/admin/quickstart.sdf
openldap/vendor/openldap-release/doc/guide/admin/referrals.sdf
openldap/vendor/openldap-release/doc/guide/admin/replication.sdf
openldap/vendor/openldap-release/doc/guide/admin/runningslapd.sdf
openldap/vendor/openldap-release/doc/guide/admin/sasl.sdf
openldap/vendor/openldap-release/doc/guide/admin/schema.sdf
openldap/vendor/openldap-release/doc/guide/admin/security.sdf
openldap/vendor/openldap-release/doc/guide/admin/slapdconf2.sdf
openldap/vendor/openldap-release/doc/guide/admin/slapdconfig.sdf
openldap/vendor/openldap-release/doc/guide/admin/title.sdf
openldap/vendor/openldap-release/doc/guide/admin/tls.sdf
openldap/vendor/openldap-release/doc/guide/admin/tuning.sdf
openldap/vendor/openldap-release/doc/guide/plain.sdf
openldap/vendor/openldap-release/doc/guide/preamble.sdf
openldap/vendor/openldap-release/doc/guide/release/copyright-plain.sdf
openldap/vendor/openldap-release/doc/guide/release/copyright.sdf
openldap/vendor/openldap-release/doc/guide/release/install.sdf
openldap/vendor/openldap-release/doc/guide/release/license-plain.sdf
openldap/vendor/openldap-release/doc/guide/release/license.sdf
openldap/vendor/openldap-release/doc/man/Makefile.in
openldap/vendor/openldap-release/doc/man/man1/Makefile.in
openldap/vendor/openldap-release/doc/man/man1/ldapcompare.1
openldap/vendor/openldap-release/doc/man/man1/ldapdelete.1
openldap/vendor/openldap-release/doc/man/man1/ldapmodify.1
openldap/vendor/openldap-release/doc/man/man1/ldapmodrdn.1
openldap/vendor/openldap-release/doc/man/man1/ldappasswd.1
openldap/vendor/openldap-release/doc/man/man1/ldapsearch.1
openldap/vendor/openldap-release/doc/man/man1/ldapwhoami.1
openldap/vendor/openldap-release/doc/man/man3/Makefile.in
openldap/vendor/openldap-release/doc/man/man3/lber-decode.3
openldap/vendor/openldap-release/doc/man/man3/lber-encode.3
openldap/vendor/openldap-release/doc/man/man3/lber-memory.3
openldap/vendor/openldap-release/doc/man/man3/lber-types.3
openldap/vendor/openldap-release/doc/man/man3/ldap.3
openldap/vendor/openldap-release/doc/man/man3/ldap_abandon.3
openldap/vendor/openldap-release/doc/man/man3/ldap_add.3
openldap/vendor/openldap-release/doc/man/man3/ldap_bind.3
openldap/vendor/openldap-release/doc/man/man3/ldap_bind.3.links
openldap/vendor/openldap-release/doc/man/man3/ldap_compare.3
openldap/vendor/openldap-release/doc/man/man3/ldap_delete.3
openldap/vendor/openldap-release/doc/man/man3/ldap_error.3
openldap/vendor/openldap-release/doc/man/man3/ldap_first_attribute.3
openldap/vendor/openldap-release/doc/man/man3/ldap_first_entry.3
openldap/vendor/openldap-release/doc/man/man3/ldap_first_message.3
openldap/vendor/openldap-release/doc/man/man3/ldap_first_reference.3
openldap/vendor/openldap-release/doc/man/man3/ldap_get_dn.3
openldap/vendor/openldap-release/doc/man/man3/ldap_get_values.3
openldap/vendor/openldap-release/doc/man/man3/ldap_modify.3
openldap/vendor/openldap-release/doc/man/man3/ldap_modrdn.3
openldap/vendor/openldap-release/doc/man/man3/ldap_open.3
openldap/vendor/openldap-release/doc/man/man3/ldap_open.3.links
openldap/vendor/openldap-release/doc/man/man3/ldap_parse_reference.3
openldap/vendor/openldap-release/doc/man/man3/ldap_parse_result.3
openldap/vendor/openldap-release/doc/man/man3/ldap_result.3
openldap/vendor/openldap-release/doc/man/man3/ldap_schema.3
openldap/vendor/openldap-release/doc/man/man3/ldap_search.3
openldap/vendor/openldap-release/doc/man/man3/ldap_sort.3
openldap/vendor/openldap-release/doc/man/man3/ldap_url.3
openldap/vendor/openldap-release/doc/man/man5/Makefile.in
openldap/vendor/openldap-release/doc/man/man5/ldap.conf.5
openldap/vendor/openldap-release/doc/man/man5/ldif.5
openldap/vendor/openldap-release/doc/man/man5/slapd-bdb.5
openldap/vendor/openldap-release/doc/man/man5/slapd-dnssrv.5
openldap/vendor/openldap-release/doc/man/man5/slapd-ldap.5
openldap/vendor/openldap-release/doc/man/man5/slapd-ldbm.5
openldap/vendor/openldap-release/doc/man/man5/slapd-ldif.5
openldap/vendor/openldap-release/doc/man/man5/slapd-meta.5
openldap/vendor/openldap-release/doc/man/man5/slapd-monitor.5
openldap/vendor/openldap-release/doc/man/man5/slapd-null.5
openldap/vendor/openldap-release/doc/man/man5/slapd-passwd.5
openldap/vendor/openldap-release/doc/man/man5/slapd-perl.5
openldap/vendor/openldap-release/doc/man/man5/slapd-relay.5
openldap/vendor/openldap-release/doc/man/man5/slapd-shell.5
openldap/vendor/openldap-release/doc/man/man5/slapd-sql.5
openldap/vendor/openldap-release/doc/man/man5/slapd.access.5
openldap/vendor/openldap-release/doc/man/man5/slapd.conf.5
openldap/vendor/openldap-release/doc/man/man5/slapd.plugin.5
openldap/vendor/openldap-release/doc/man/man5/slapo-accesslog.5
openldap/vendor/openldap-release/doc/man/man5/slapo-auditlog.5
openldap/vendor/openldap-release/doc/man/man5/slapo-chain.5
openldap/vendor/openldap-release/doc/man/man5/slapo-dynlist.5
openldap/vendor/openldap-release/doc/man/man5/slapo-pcache.5
openldap/vendor/openldap-release/doc/man/man5/slapo-ppolicy.5
openldap/vendor/openldap-release/doc/man/man5/slapo-refint.5
openldap/vendor/openldap-release/doc/man/man5/slapo-retcode.5
openldap/vendor/openldap-release/doc/man/man5/slapo-rwm.5
openldap/vendor/openldap-release/doc/man/man5/slapo-syncprov.5
openldap/vendor/openldap-release/doc/man/man5/slapo-translucent.5
openldap/vendor/openldap-release/doc/man/man5/slapo-unique.5
openldap/vendor/openldap-release/doc/man/man5/slapo-valsort.5
openldap/vendor/openldap-release/doc/man/man8/Makefile.in
openldap/vendor/openldap-release/doc/man/man8/slapacl.8
openldap/vendor/openldap-release/doc/man/man8/slapadd.8
openldap/vendor/openldap-release/doc/man/man8/slapauth.8
openldap/vendor/openldap-release/doc/man/man8/slapcat.8
openldap/vendor/openldap-release/doc/man/man8/slapd.8
openldap/vendor/openldap-release/doc/man/man8/slapdn.8
openldap/vendor/openldap-release/doc/man/man8/slapindex.8
openldap/vendor/openldap-release/doc/man/man8/slappasswd.8
openldap/vendor/openldap-release/doc/man/man8/slaptest.8
openldap/vendor/openldap-release/include/Makefile.in
openldap/vendor/openldap-release/include/ac/alloca.h
openldap/vendor/openldap-release/include/ac/assert.h
openldap/vendor/openldap-release/include/ac/bytes.h
openldap/vendor/openldap-release/include/ac/crypt.h
openldap/vendor/openldap-release/include/ac/ctype.h
openldap/vendor/openldap-release/include/ac/dirent.h
openldap/vendor/openldap-release/include/ac/errno.h
openldap/vendor/openldap-release/include/ac/fdset.h
openldap/vendor/openldap-release/include/ac/localize.h
openldap/vendor/openldap-release/include/ac/param.h
openldap/vendor/openldap-release/include/ac/regex.h
openldap/vendor/openldap-release/include/ac/setproctitle.h
openldap/vendor/openldap-release/include/ac/signal.h
openldap/vendor/openldap-release/include/ac/socket.h
openldap/vendor/openldap-release/include/ac/stdarg.h
openldap/vendor/openldap-release/include/ac/stdlib.h
openldap/vendor/openldap-release/include/ac/string.h
openldap/vendor/openldap-release/include/ac/sysexits.h
openldap/vendor/openldap-release/include/ac/syslog.h
openldap/vendor/openldap-release/include/ac/termios.h
openldap/vendor/openldap-release/include/ac/time.h
openldap/vendor/openldap-release/include/ac/unistd.h
openldap/vendor/openldap-release/include/ac/wait.h
openldap/vendor/openldap-release/include/avl.h
openldap/vendor/openldap-release/include/getopt-compat.h
openldap/vendor/openldap-release/include/lber.h
openldap/vendor/openldap-release/include/lber_pvt.h
openldap/vendor/openldap-release/include/lber_types.hin
openldap/vendor/openldap-release/include/ldap.h
openldap/vendor/openldap-release/include/ldap_cdefs.h
openldap/vendor/openldap-release/include/ldap_config.hin
openldap/vendor/openldap-release/include/ldap_defaults.h
openldap/vendor/openldap-release/include/ldap_features.hin
openldap/vendor/openldap-release/include/ldap_int_thread.h
openldap/vendor/openldap-release/include/ldap_log.h
openldap/vendor/openldap-release/include/ldap_pvt.h
openldap/vendor/openldap-release/include/ldap_pvt_thread.h
openldap/vendor/openldap-release/include/ldap_pvt_uc.h
openldap/vendor/openldap-release/include/ldap_queue.h
openldap/vendor/openldap-release/include/ldap_rq.h
openldap/vendor/openldap-release/include/ldap_schema.h
openldap/vendor/openldap-release/include/ldap_utf8.h
openldap/vendor/openldap-release/include/ldif.h
openldap/vendor/openldap-release/include/lutil.h
openldap/vendor/openldap-release/include/lutil_hash.h
openldap/vendor/openldap-release/include/lutil_ldap.h
openldap/vendor/openldap-release/include/lutil_lockf.h
openldap/vendor/openldap-release/include/lutil_md5.h
openldap/vendor/openldap-release/include/lutil_sha1.h
openldap/vendor/openldap-release/include/portable.hin
openldap/vendor/openldap-release/include/rewrite.h
openldap/vendor/openldap-release/include/slapi-plugin.h
openldap/vendor/openldap-release/include/sysexits-compat.h
openldap/vendor/openldap-release/libraries/Makefile.in
openldap/vendor/openldap-release/libraries/liblber/Makefile.in
openldap/vendor/openldap-release/libraries/liblber/assert.c
openldap/vendor/openldap-release/libraries/liblber/bprint.c
openldap/vendor/openldap-release/libraries/liblber/debug.c
openldap/vendor/openldap-release/libraries/liblber/decode.c
openldap/vendor/openldap-release/libraries/liblber/dtest.c
openldap/vendor/openldap-release/libraries/liblber/encode.c
openldap/vendor/openldap-release/libraries/liblber/etest.c
openldap/vendor/openldap-release/libraries/liblber/idtest.c
openldap/vendor/openldap-release/libraries/liblber/io.c
openldap/vendor/openldap-release/libraries/liblber/lber-int.h
openldap/vendor/openldap-release/libraries/liblber/memory.c
openldap/vendor/openldap-release/libraries/liblber/nt_err.c
openldap/vendor/openldap-release/libraries/liblber/options.c
openldap/vendor/openldap-release/libraries/liblber/sockbuf.c
openldap/vendor/openldap-release/libraries/liblber/stdio.c
openldap/vendor/openldap-release/libraries/libldap/Makefile.in
openldap/vendor/openldap-release/libraries/libldap/abandon.c
openldap/vendor/openldap-release/libraries/libldap/add.c
openldap/vendor/openldap-release/libraries/libldap/addentry.c
openldap/vendor/openldap-release/libraries/libldap/apitest.c
openldap/vendor/openldap-release/libraries/libldap/bind.c
openldap/vendor/openldap-release/libraries/libldap/cancel.c
openldap/vendor/openldap-release/libraries/libldap/charray.c
openldap/vendor/openldap-release/libraries/libldap/compare.c
openldap/vendor/openldap-release/libraries/libldap/controls.c
openldap/vendor/openldap-release/libraries/libldap/cyrus.c
openldap/vendor/openldap-release/libraries/libldap/delete.c
openldap/vendor/openldap-release/libraries/libldap/dnssrv.c
openldap/vendor/openldap-release/libraries/libldap/dntest.c
openldap/vendor/openldap-release/libraries/libldap/error.c
openldap/vendor/openldap-release/libraries/libldap/extended.c
openldap/vendor/openldap-release/libraries/libldap/filter.c
openldap/vendor/openldap-release/libraries/libldap/free.c
openldap/vendor/openldap-release/libraries/libldap/ftest.c
openldap/vendor/openldap-release/libraries/libldap/getattr.c
openldap/vendor/openldap-release/libraries/libldap/getdn.c
openldap/vendor/openldap-release/libraries/libldap/getentry.c
openldap/vendor/openldap-release/libraries/libldap/getvalues.c
openldap/vendor/openldap-release/libraries/libldap/init.c
openldap/vendor/openldap-release/libraries/libldap/ldap-int.h
openldap/vendor/openldap-release/libraries/libldap/ldap.conf
openldap/vendor/openldap-release/libraries/libldap/messages.c
openldap/vendor/openldap-release/libraries/libldap/modify.c
openldap/vendor/openldap-release/libraries/libldap/modrdn.c
openldap/vendor/openldap-release/libraries/libldap/open.c
openldap/vendor/openldap-release/libraries/libldap/options.c
openldap/vendor/openldap-release/libraries/libldap/os-ip.c
openldap/vendor/openldap-release/libraries/libldap/os-local.c
openldap/vendor/openldap-release/libraries/libldap/passwd.c
openldap/vendor/openldap-release/libraries/libldap/ppolicy.c
openldap/vendor/openldap-release/libraries/libldap/print.c
openldap/vendor/openldap-release/libraries/libldap/references.c
openldap/vendor/openldap-release/libraries/libldap/request.c
openldap/vendor/openldap-release/libraries/libldap/result.c
openldap/vendor/openldap-release/libraries/libldap/sasl.c
openldap/vendor/openldap-release/libraries/libldap/sbind.c
openldap/vendor/openldap-release/libraries/libldap/schema.c
openldap/vendor/openldap-release/libraries/libldap/search.c
openldap/vendor/openldap-release/libraries/libldap/sort.c
openldap/vendor/openldap-release/libraries/libldap/sortctrl.c
openldap/vendor/openldap-release/libraries/libldap/string.c
openldap/vendor/openldap-release/libraries/libldap/t61.c
openldap/vendor/openldap-release/libraries/libldap/test.c
openldap/vendor/openldap-release/libraries/libldap/tls.c
openldap/vendor/openldap-release/libraries/libldap/turn.c
openldap/vendor/openldap-release/libraries/libldap/txn.c
openldap/vendor/openldap-release/libraries/libldap/unbind.c
openldap/vendor/openldap-release/libraries/libldap/url.c
openldap/vendor/openldap-release/libraries/libldap/utf-8-conv.c
openldap/vendor/openldap-release/libraries/libldap/utf-8.c
openldap/vendor/openldap-release/libraries/libldap/util-int.c
openldap/vendor/openldap-release/libraries/libldap/vlvctrl.c
openldap/vendor/openldap-release/libraries/libldap/whoami.c
openldap/vendor/openldap-release/libraries/libldap_r/Makefile.in
openldap/vendor/openldap-release/libraries/libldap_r/ldap_thr_debug.h
openldap/vendor/openldap-release/libraries/libldap_r/rdwr.c
openldap/vendor/openldap-release/libraries/libldap_r/rq.c
openldap/vendor/openldap-release/libraries/libldap_r/thr_cthreads.c
openldap/vendor/openldap-release/libraries/libldap_r/thr_debug.c
openldap/vendor/openldap-release/libraries/libldap_r/thr_lwp.c
openldap/vendor/openldap-release/libraries/libldap_r/thr_nt.c
openldap/vendor/openldap-release/libraries/libldap_r/thr_posix.c
openldap/vendor/openldap-release/libraries/libldap_r/thr_pth.c
openldap/vendor/openldap-release/libraries/libldap_r/thr_stub.c
openldap/vendor/openldap-release/libraries/libldap_r/thr_thr.c
openldap/vendor/openldap-release/libraries/libldap_r/threads.c
openldap/vendor/openldap-release/libraries/libldap_r/tpool.c
openldap/vendor/openldap-release/libraries/liblunicode/Makefile.in
openldap/vendor/openldap-release/libraries/liblunicode/ucdata/ucdata.c
openldap/vendor/openldap-release/libraries/liblunicode/ucdata/ucdata.h
openldap/vendor/openldap-release/libraries/liblunicode/ucdata/ucgendat.c
openldap/vendor/openldap-release/libraries/liblunicode/ucdata/ucpgba.c
openldap/vendor/openldap-release/libraries/liblunicode/ucdata/ucpgba.h
openldap/vendor/openldap-release/libraries/liblunicode/ucstr.c
openldap/vendor/openldap-release/libraries/liblunicode/ure/ure.c
openldap/vendor/openldap-release/libraries/liblunicode/ure/ure.h
openldap/vendor/openldap-release/libraries/liblunicode/ure/urestubs.c
openldap/vendor/openldap-release/libraries/liblunicode/utbm/utbm.c
openldap/vendor/openldap-release/libraries/liblunicode/utbm/utbm.h
openldap/vendor/openldap-release/libraries/liblunicode/utbm/utbmstub.c
openldap/vendor/openldap-release/libraries/liblutil/Makefile.in
openldap/vendor/openldap-release/libraries/liblutil/avl.c
openldap/vendor/openldap-release/libraries/liblutil/base64.c
openldap/vendor/openldap-release/libraries/liblutil/csn.c
openldap/vendor/openldap-release/libraries/liblutil/detach.c
openldap/vendor/openldap-release/libraries/liblutil/entropy.c
openldap/vendor/openldap-release/libraries/liblutil/fetch.c
openldap/vendor/openldap-release/libraries/liblutil/getopt.c
openldap/vendor/openldap-release/libraries/liblutil/getpass.c
openldap/vendor/openldap-release/libraries/liblutil/getpeereid.c
openldap/vendor/openldap-release/libraries/liblutil/hash.c
openldap/vendor/openldap-release/libraries/liblutil/ldif.c
openldap/vendor/openldap-release/libraries/liblutil/lockf.c
openldap/vendor/openldap-release/libraries/liblutil/md5.c
openldap/vendor/openldap-release/libraries/liblutil/memcmp.c
openldap/vendor/openldap-release/libraries/liblutil/ntservice.c
openldap/vendor/openldap-release/libraries/liblutil/passfile.c
openldap/vendor/openldap-release/libraries/liblutil/passwd.c
openldap/vendor/openldap-release/libraries/liblutil/ptest.c
openldap/vendor/openldap-release/libraries/liblutil/sasl.c
openldap/vendor/openldap-release/libraries/liblutil/setproctitle.c
openldap/vendor/openldap-release/libraries/liblutil/sha1.c
openldap/vendor/openldap-release/libraries/liblutil/signal.c
openldap/vendor/openldap-release/libraries/liblutil/sockpair.c
openldap/vendor/openldap-release/libraries/liblutil/tavl.c
openldap/vendor/openldap-release/libraries/liblutil/testavl.c
openldap/vendor/openldap-release/libraries/liblutil/utils.c
openldap/vendor/openldap-release/libraries/liblutil/uuid.c
openldap/vendor/openldap-release/libraries/librewrite/Makefile.in
openldap/vendor/openldap-release/libraries/librewrite/config.c
openldap/vendor/openldap-release/libraries/librewrite/context.c
openldap/vendor/openldap-release/libraries/librewrite/info.c
openldap/vendor/openldap-release/libraries/librewrite/ldapmap.c
openldap/vendor/openldap-release/libraries/librewrite/map.c
openldap/vendor/openldap-release/libraries/librewrite/params.c
openldap/vendor/openldap-release/libraries/librewrite/parse.c
openldap/vendor/openldap-release/libraries/librewrite/rewrite-int.h
openldap/vendor/openldap-release/libraries/librewrite/rewrite-map.h
openldap/vendor/openldap-release/libraries/librewrite/rewrite.c
openldap/vendor/openldap-release/libraries/librewrite/rule.c
openldap/vendor/openldap-release/libraries/librewrite/session.c
openldap/vendor/openldap-release/libraries/librewrite/subst.c
openldap/vendor/openldap-release/libraries/librewrite/var.c
openldap/vendor/openldap-release/libraries/librewrite/xmap.c
openldap/vendor/openldap-release/servers/Makefile.in
openldap/vendor/openldap-release/servers/slapd/DB_CONFIG
openldap/vendor/openldap-release/servers/slapd/Makefile.in
openldap/vendor/openldap-release/servers/slapd/abandon.c
openldap/vendor/openldap-release/servers/slapd/aci.c
openldap/vendor/openldap-release/servers/slapd/acl.c
openldap/vendor/openldap-release/servers/slapd/aclparse.c
openldap/vendor/openldap-release/servers/slapd/ad.c
openldap/vendor/openldap-release/servers/slapd/add.c
openldap/vendor/openldap-release/servers/slapd/alock.c
openldap/vendor/openldap-release/servers/slapd/alock.h
openldap/vendor/openldap-release/servers/slapd/at.c
openldap/vendor/openldap-release/servers/slapd/attr.c
openldap/vendor/openldap-release/servers/slapd/ava.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-bdb/add.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/attr.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/back-bdb.h
openldap/vendor/openldap-release/servers/slapd/back-bdb/bind.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/cache.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/compare.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/config.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/dbcache.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/delete.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/dn2entry.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/dn2id.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/error.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/extended.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/filterindex.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/id2entry.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/idl.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/idl.h
openldap/vendor/openldap-release/servers/slapd/back-bdb/index.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/init.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/key.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/modify.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/modrdn.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/nextid.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/operational.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/proto-bdb.h
openldap/vendor/openldap-release/servers/slapd/back-bdb/referral.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/search.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/tools.c
openldap/vendor/openldap-release/servers/slapd/back-bdb/trans.c
openldap/vendor/openldap-release/servers/slapd/back-dnssrv/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-dnssrv/bind.c
openldap/vendor/openldap-release/servers/slapd/back-dnssrv/compare.c
openldap/vendor/openldap-release/servers/slapd/back-dnssrv/config.c
openldap/vendor/openldap-release/servers/slapd/back-dnssrv/init.c
openldap/vendor/openldap-release/servers/slapd/back-dnssrv/proto-dnssrv.h
openldap/vendor/openldap-release/servers/slapd/back-dnssrv/referral.c
openldap/vendor/openldap-release/servers/slapd/back-dnssrv/search.c
openldap/vendor/openldap-release/servers/slapd/back-hdb/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-hdb/back-bdb.h
openldap/vendor/openldap-release/servers/slapd/back-ldap/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-ldap/add.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/back-ldap.h
openldap/vendor/openldap-release/servers/slapd/back-ldap/bind.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/chain.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/compare.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/config.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/delete.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/extended.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/init.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/modify.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/modrdn.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/proto-ldap.h
openldap/vendor/openldap-release/servers/slapd/back-ldap/search.c
openldap/vendor/openldap-release/servers/slapd/back-ldap/unbind.c
openldap/vendor/openldap-release/servers/slapd/back-ldif/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-ldif/ldif.c
openldap/vendor/openldap-release/servers/slapd/back-meta/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-meta/add.c
openldap/vendor/openldap-release/servers/slapd/back-meta/back-meta.h
openldap/vendor/openldap-release/servers/slapd/back-meta/bind.c
openldap/vendor/openldap-release/servers/slapd/back-meta/candidates.c
openldap/vendor/openldap-release/servers/slapd/back-meta/compare.c
openldap/vendor/openldap-release/servers/slapd/back-meta/config.c
openldap/vendor/openldap-release/servers/slapd/back-meta/conn.c
openldap/vendor/openldap-release/servers/slapd/back-meta/delete.c
openldap/vendor/openldap-release/servers/slapd/back-meta/dncache.c
openldap/vendor/openldap-release/servers/slapd/back-meta/init.c
openldap/vendor/openldap-release/servers/slapd/back-meta/map.c
openldap/vendor/openldap-release/servers/slapd/back-meta/modify.c
openldap/vendor/openldap-release/servers/slapd/back-meta/modrdn.c
openldap/vendor/openldap-release/servers/slapd/back-meta/proto-meta.h
openldap/vendor/openldap-release/servers/slapd/back-meta/search.c
openldap/vendor/openldap-release/servers/slapd/back-meta/suffixmassage.c
openldap/vendor/openldap-release/servers/slapd/back-meta/unbind.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-monitor/back-monitor.h
openldap/vendor/openldap-release/servers/slapd/back-monitor/backend.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/bind.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/cache.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/compare.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/conn.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/database.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/entry.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/init.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/listener.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/log.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/modify.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/operation.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/operational.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/overlay.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/proto-back-monitor.h
openldap/vendor/openldap-release/servers/slapd/back-monitor/rww.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/search.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/sent.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/thread.c
openldap/vendor/openldap-release/servers/slapd/back-monitor/time.c
openldap/vendor/openldap-release/servers/slapd/back-null/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-null/null.c
openldap/vendor/openldap-release/servers/slapd/back-passwd/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-passwd/back-passwd.h
openldap/vendor/openldap-release/servers/slapd/back-passwd/config.c
openldap/vendor/openldap-release/servers/slapd/back-passwd/init.c
openldap/vendor/openldap-release/servers/slapd/back-passwd/proto-passwd.h
openldap/vendor/openldap-release/servers/slapd/back-passwd/search.c
openldap/vendor/openldap-release/servers/slapd/back-perl/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-perl/SampleLDAP.pm
openldap/vendor/openldap-release/servers/slapd/back-perl/add.c
openldap/vendor/openldap-release/servers/slapd/back-perl/asperl_undefs.h
openldap/vendor/openldap-release/servers/slapd/back-perl/bind.c
openldap/vendor/openldap-release/servers/slapd/back-perl/close.c
openldap/vendor/openldap-release/servers/slapd/back-perl/compare.c
openldap/vendor/openldap-release/servers/slapd/back-perl/config.c
openldap/vendor/openldap-release/servers/slapd/back-perl/delete.c
openldap/vendor/openldap-release/servers/slapd/back-perl/init.c
openldap/vendor/openldap-release/servers/slapd/back-perl/modify.c
openldap/vendor/openldap-release/servers/slapd/back-perl/modrdn.c
openldap/vendor/openldap-release/servers/slapd/back-perl/perl_back.h
openldap/vendor/openldap-release/servers/slapd/back-perl/proto-perl.h
openldap/vendor/openldap-release/servers/slapd/back-perl/search.c
openldap/vendor/openldap-release/servers/slapd/back-relay/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-relay/init.c
openldap/vendor/openldap-release/servers/slapd/back-relay/op.c
openldap/vendor/openldap-release/servers/slapd/back-relay/proto-back-relay.h
openldap/vendor/openldap-release/servers/slapd/back-shell/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-shell/add.c
openldap/vendor/openldap-release/servers/slapd/back-shell/bind.c
openldap/vendor/openldap-release/servers/slapd/back-shell/compare.c
openldap/vendor/openldap-release/servers/slapd/back-shell/config.c
openldap/vendor/openldap-release/servers/slapd/back-shell/delete.c
openldap/vendor/openldap-release/servers/slapd/back-shell/fork.c
openldap/vendor/openldap-release/servers/slapd/back-shell/init.c
openldap/vendor/openldap-release/servers/slapd/back-shell/modify.c
openldap/vendor/openldap-release/servers/slapd/back-shell/modrdn.c
openldap/vendor/openldap-release/servers/slapd/back-shell/proto-shell.h
openldap/vendor/openldap-release/servers/slapd/back-shell/result.c
openldap/vendor/openldap-release/servers/slapd/back-shell/search.c
openldap/vendor/openldap-release/servers/slapd/back-shell/searchexample.conf
openldap/vendor/openldap-release/servers/slapd/back-shell/searchexample.sh
openldap/vendor/openldap-release/servers/slapd/back-shell/shell.h
openldap/vendor/openldap-release/servers/slapd/back-shell/unbind.c
openldap/vendor/openldap-release/servers/slapd/back-sql/Makefile.in
openldap/vendor/openldap-release/servers/slapd/back-sql/add.c
openldap/vendor/openldap-release/servers/slapd/back-sql/back-sql.h
openldap/vendor/openldap-release/servers/slapd/back-sql/bind.c
openldap/vendor/openldap-release/servers/slapd/back-sql/compare.c
openldap/vendor/openldap-release/servers/slapd/back-sql/config.c
openldap/vendor/openldap-release/servers/slapd/back-sql/delete.c
openldap/vendor/openldap-release/servers/slapd/back-sql/entry-id.c
openldap/vendor/openldap-release/servers/slapd/back-sql/init.c
openldap/vendor/openldap-release/servers/slapd/back-sql/modify.c
openldap/vendor/openldap-release/servers/slapd/back-sql/modrdn.c
openldap/vendor/openldap-release/servers/slapd/back-sql/operational.c
openldap/vendor/openldap-release/servers/slapd/back-sql/proto-sql.h
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/ibmdb2/slapd.conf
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/mysql/slapd.conf
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/mysql/testdb_create.sql
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/oracle/slapd.conf
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/pgsql/slapd.conf
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_create.sql
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_data.sql
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql
openldap/vendor/openldap-release/servers/slapd/back-sql/rdbms_depend/timesten/slapd.conf
openldap/vendor/openldap-release/servers/slapd/back-sql/schema-map.c
openldap/vendor/openldap-release/servers/slapd/back-sql/search.c
openldap/vendor/openldap-release/servers/slapd/back-sql/sql-wrap.c
openldap/vendor/openldap-release/servers/slapd/back-sql/util.c
openldap/vendor/openldap-release/servers/slapd/backend.c
openldap/vendor/openldap-release/servers/slapd/backglue.c
openldap/vendor/openldap-release/servers/slapd/backover.c
openldap/vendor/openldap-release/servers/slapd/bconfig.c
openldap/vendor/openldap-release/servers/slapd/bind.c
openldap/vendor/openldap-release/servers/slapd/cancel.c
openldap/vendor/openldap-release/servers/slapd/ch_malloc.c
openldap/vendor/openldap-release/servers/slapd/compare.c
openldap/vendor/openldap-release/servers/slapd/component.c
openldap/vendor/openldap-release/servers/slapd/component.h
openldap/vendor/openldap-release/servers/slapd/config.c
openldap/vendor/openldap-release/servers/slapd/config.h
openldap/vendor/openldap-release/servers/slapd/connection.c
openldap/vendor/openldap-release/servers/slapd/controls.c
openldap/vendor/openldap-release/servers/slapd/cr.c
openldap/vendor/openldap-release/servers/slapd/ctxcsn.c
openldap/vendor/openldap-release/servers/slapd/daemon.c
openldap/vendor/openldap-release/servers/slapd/delete.c
openldap/vendor/openldap-release/servers/slapd/dn.c
openldap/vendor/openldap-release/servers/slapd/entry.c
openldap/vendor/openldap-release/servers/slapd/extended.c
openldap/vendor/openldap-release/servers/slapd/filter.c
openldap/vendor/openldap-release/servers/slapd/filterentry.c
openldap/vendor/openldap-release/servers/slapd/frontend.c
openldap/vendor/openldap-release/servers/slapd/globals.c
openldap/vendor/openldap-release/servers/slapd/index.c
openldap/vendor/openldap-release/servers/slapd/init.c
openldap/vendor/openldap-release/servers/slapd/ldapsync.c
openldap/vendor/openldap-release/servers/slapd/limits.c
openldap/vendor/openldap-release/servers/slapd/lock.c
openldap/vendor/openldap-release/servers/slapd/main.c
openldap/vendor/openldap-release/servers/slapd/matchedValues.c
openldap/vendor/openldap-release/servers/slapd/modify.c
openldap/vendor/openldap-release/servers/slapd/modrdn.c
openldap/vendor/openldap-release/servers/slapd/mods.c
openldap/vendor/openldap-release/servers/slapd/module.c
openldap/vendor/openldap-release/servers/slapd/mr.c
openldap/vendor/openldap-release/servers/slapd/mra.c
openldap/vendor/openldap-release/servers/slapd/nt_svc.c
openldap/vendor/openldap-release/servers/slapd/oc.c
openldap/vendor/openldap-release/servers/slapd/oidm.c
openldap/vendor/openldap-release/servers/slapd/operation.c
openldap/vendor/openldap-release/servers/slapd/operational.c
openldap/vendor/openldap-release/servers/slapd/overlays/Makefile.in
openldap/vendor/openldap-release/servers/slapd/overlays/accesslog.c
openldap/vendor/openldap-release/servers/slapd/overlays/auditlog.c
openldap/vendor/openldap-release/servers/slapd/overlays/collect.c
openldap/vendor/openldap-release/servers/slapd/overlays/dyngroup.c
openldap/vendor/openldap-release/servers/slapd/overlays/dynlist.c
openldap/vendor/openldap-release/servers/slapd/overlays/overlays.c
openldap/vendor/openldap-release/servers/slapd/overlays/pcache.c
openldap/vendor/openldap-release/servers/slapd/overlays/ppolicy.c
openldap/vendor/openldap-release/servers/slapd/overlays/refint.c
openldap/vendor/openldap-release/servers/slapd/overlays/retcode.c
openldap/vendor/openldap-release/servers/slapd/overlays/rwm.c
openldap/vendor/openldap-release/servers/slapd/overlays/rwm.h
openldap/vendor/openldap-release/servers/slapd/overlays/rwmconf.c
openldap/vendor/openldap-release/servers/slapd/overlays/rwmdn.c
openldap/vendor/openldap-release/servers/slapd/overlays/rwmmap.c
openldap/vendor/openldap-release/servers/slapd/overlays/seqmod.c
openldap/vendor/openldap-release/servers/slapd/overlays/syncprov.c
openldap/vendor/openldap-release/servers/slapd/overlays/translucent.c
openldap/vendor/openldap-release/servers/slapd/overlays/unique.c
openldap/vendor/openldap-release/servers/slapd/overlays/valsort.c
openldap/vendor/openldap-release/servers/slapd/passwd.c
openldap/vendor/openldap-release/servers/slapd/phonetic.c
openldap/vendor/openldap-release/servers/slapd/proto-slap.h
openldap/vendor/openldap-release/servers/slapd/referral.c
openldap/vendor/openldap-release/servers/slapd/result.c
openldap/vendor/openldap-release/servers/slapd/root_dse.c
openldap/vendor/openldap-release/servers/slapd/sasl.c
openldap/vendor/openldap-release/servers/slapd/saslauthz.c
openldap/vendor/openldap-release/servers/slapd/schema.c
openldap/vendor/openldap-release/servers/slapd/schema/README
openldap/vendor/openldap-release/servers/slapd/schema/dyngroup.schema
openldap/vendor/openldap-release/servers/slapd/schema/inetorgperson.schema
openldap/vendor/openldap-release/servers/slapd/schema/misc.schema
openldap/vendor/openldap-release/servers/slapd/schema/nis.schema
openldap/vendor/openldap-release/servers/slapd/schema/openldap.ldif
openldap/vendor/openldap-release/servers/slapd/schema/openldap.schema
openldap/vendor/openldap-release/servers/slapd/schema_check.c
openldap/vendor/openldap-release/servers/slapd/schema_init.c
openldap/vendor/openldap-release/servers/slapd/schema_prep.c
openldap/vendor/openldap-release/servers/slapd/schemaparse.c
openldap/vendor/openldap-release/servers/slapd/search.c
openldap/vendor/openldap-release/servers/slapd/sets.c
openldap/vendor/openldap-release/servers/slapd/sets.h
openldap/vendor/openldap-release/servers/slapd/shell-backends/Makefile.in
openldap/vendor/openldap-release/servers/slapd/shell-backends/passwd-shell.c
openldap/vendor/openldap-release/servers/slapd/shell-backends/shellutil.c
openldap/vendor/openldap-release/servers/slapd/shell-backends/shellutil.h
openldap/vendor/openldap-release/servers/slapd/sl_malloc.c
openldap/vendor/openldap-release/servers/slapd/slap.h
openldap/vendor/openldap-release/servers/slapd/slapacl.c
openldap/vendor/openldap-release/servers/slapd/slapadd.c
openldap/vendor/openldap-release/servers/slapd/slapauth.c
openldap/vendor/openldap-release/servers/slapd/slapcat.c
openldap/vendor/openldap-release/servers/slapd/slapcommon.c
openldap/vendor/openldap-release/servers/slapd/slapcommon.h
openldap/vendor/openldap-release/servers/slapd/slapd.conf
openldap/vendor/openldap-release/servers/slapd/slapdn.c
openldap/vendor/openldap-release/servers/slapd/slapi/Makefile.in
openldap/vendor/openldap-release/servers/slapd/slapi/TODO
openldap/vendor/openldap-release/servers/slapd/slapi/plugin.c
openldap/vendor/openldap-release/servers/slapd/slapi/printmsg.c
openldap/vendor/openldap-release/servers/slapd/slapi/proto-slapi.h
openldap/vendor/openldap-release/servers/slapd/slapi/slapi.h
openldap/vendor/openldap-release/servers/slapd/slapi/slapi_dn.c
openldap/vendor/openldap-release/servers/slapd/slapi/slapi_ext.c
openldap/vendor/openldap-release/servers/slapd/slapi/slapi_ops.c
openldap/vendor/openldap-release/servers/slapd/slapi/slapi_overlay.c
openldap/vendor/openldap-release/servers/slapd/slapi/slapi_pblock.c
openldap/vendor/openldap-release/servers/slapd/slapi/slapi_utils.c
openldap/vendor/openldap-release/servers/slapd/slapindex.c
openldap/vendor/openldap-release/servers/slapd/slappasswd.c
openldap/vendor/openldap-release/servers/slapd/slaptest.c
openldap/vendor/openldap-release/servers/slapd/starttls.c
openldap/vendor/openldap-release/servers/slapd/str2filter.c
openldap/vendor/openldap-release/servers/slapd/syncrepl.c
openldap/vendor/openldap-release/servers/slapd/syntax.c
openldap/vendor/openldap-release/servers/slapd/unbind.c
openldap/vendor/openldap-release/servers/slapd/user.c
openldap/vendor/openldap-release/servers/slapd/value.c
openldap/vendor/openldap-release/servers/slapd/zn_malloc.c
openldap/vendor/openldap-release/tests/Makefile.in
openldap/vendor/openldap-release/tests/README
openldap/vendor/openldap-release/tests/data/acl.out.master
openldap/vendor/openldap-release/tests/data/certificate.tls
openldap/vendor/openldap-release/tests/data/ditcontentrules.conf
openldap/vendor/openldap-release/tests/data/do_search.0
openldap/vendor/openldap-release/tests/data/dynlist.out
openldap/vendor/openldap-release/tests/data/meta.out
openldap/vendor/openldap-release/tests/data/proxycache.out
openldap/vendor/openldap-release/tests/data/slapd-aci.conf
openldap/vendor/openldap-release/tests/data/slapd-acl.conf
openldap/vendor/openldap-release/tests/data/slapd-cache-master.conf
openldap/vendor/openldap-release/tests/data/slapd-chain1.conf
openldap/vendor/openldap-release/tests/data/slapd-chain2.conf
openldap/vendor/openldap-release/tests/data/slapd-component.conf
openldap/vendor/openldap-release/tests/data/slapd-deltasync-master.conf
openldap/vendor/openldap-release/tests/data/slapd-deltasync-slave.conf
openldap/vendor/openldap-release/tests/data/slapd-dn.conf
openldap/vendor/openldap-release/tests/data/slapd-dynlist.conf
openldap/vendor/openldap-release/tests/data/slapd-emptydn.conf
openldap/vendor/openldap-release/tests/data/slapd-glue-ldap.conf
openldap/vendor/openldap-release/tests/data/slapd-glue-syncrepl1.conf
openldap/vendor/openldap-release/tests/data/slapd-glue-syncrepl2.conf
openldap/vendor/openldap-release/tests/data/slapd-glue.conf
openldap/vendor/openldap-release/tests/data/slapd-idassert.conf
openldap/vendor/openldap-release/tests/data/slapd-ldapglue.conf
openldap/vendor/openldap-release/tests/data/slapd-ldapgluegroups.conf
openldap/vendor/openldap-release/tests/data/slapd-ldapgluepeople.conf
openldap/vendor/openldap-release/tests/data/slapd-limits.conf
openldap/vendor/openldap-release/tests/data/slapd-master.conf
openldap/vendor/openldap-release/tests/data/slapd-meta.conf
openldap/vendor/openldap-release/tests/data/slapd-nis-master.conf
openldap/vendor/openldap-release/tests/data/slapd-ppolicy.conf
openldap/vendor/openldap-release/tests/data/slapd-proxycache.conf
openldap/vendor/openldap-release/tests/data/slapd-pw.conf
openldap/vendor/openldap-release/tests/data/slapd-ref-slave.conf
openldap/vendor/openldap-release/tests/data/slapd-referrals.conf
openldap/vendor/openldap-release/tests/data/slapd-refint.conf
openldap/vendor/openldap-release/tests/data/slapd-relay.conf
openldap/vendor/openldap-release/tests/data/slapd-retcode.conf
openldap/vendor/openldap-release/tests/data/slapd-schema.conf
openldap/vendor/openldap-release/tests/data/slapd-sql-syncrepl-master.conf
openldap/vendor/openldap-release/tests/data/slapd-sql.conf
openldap/vendor/openldap-release/tests/data/slapd-syncrepl-master.conf
openldap/vendor/openldap-release/tests/data/slapd-syncrepl-slave-persist1.conf
openldap/vendor/openldap-release/tests/data/slapd-syncrepl-slave-persist2.conf
openldap/vendor/openldap-release/tests/data/slapd-syncrepl-slave-persist3.conf
openldap/vendor/openldap-release/tests/data/slapd-syncrepl-slave-refresh1.conf
openldap/vendor/openldap-release/tests/data/slapd-syncrepl-slave-refresh2.conf
openldap/vendor/openldap-release/tests/data/slapd-translucent-local.conf
openldap/vendor/openldap-release/tests/data/slapd-translucent-remote.conf
openldap/vendor/openldap-release/tests/data/slapd-unique.conf
openldap/vendor/openldap-release/tests/data/slapd-valsort.conf
openldap/vendor/openldap-release/tests/data/slapd-whoami.conf
openldap/vendor/openldap-release/tests/data/slapd.conf
openldap/vendor/openldap-release/tests/data/slapd2.conf
openldap/vendor/openldap-release/tests/data/sql-read.out
openldap/vendor/openldap-release/tests/data/sql-write.out
openldap/vendor/openldap-release/tests/data/test.schema
openldap/vendor/openldap-release/tests/progs/Makefile.in
openldap/vendor/openldap-release/tests/progs/slapd-addel.c
openldap/vendor/openldap-release/tests/progs/slapd-bind.c
openldap/vendor/openldap-release/tests/progs/slapd-modify.c
openldap/vendor/openldap-release/tests/progs/slapd-modrdn.c
openldap/vendor/openldap-release/tests/progs/slapd-read.c
openldap/vendor/openldap-release/tests/progs/slapd-search.c
openldap/vendor/openldap-release/tests/progs/slapd-tester.c
openldap/vendor/openldap-release/tests/run.in
openldap/vendor/openldap-release/tests/scripts/acfilter.sh
openldap/vendor/openldap-release/tests/scripts/all
openldap/vendor/openldap-release/tests/scripts/conf.sh
openldap/vendor/openldap-release/tests/scripts/defines.sh
openldap/vendor/openldap-release/tests/scripts/passwd-search
openldap/vendor/openldap-release/tests/scripts/relay
openldap/vendor/openldap-release/tests/scripts/sql-all
openldap/vendor/openldap-release/tests/scripts/sql-test000-read
openldap/vendor/openldap-release/tests/scripts/sql-test001-concurrency
openldap/vendor/openldap-release/tests/scripts/sql-test900-write
openldap/vendor/openldap-release/tests/scripts/sql-test901-syncrepl
openldap/vendor/openldap-release/tests/scripts/start-server
openldap/vendor/openldap-release/tests/scripts/start-server-nolog
openldap/vendor/openldap-release/tests/scripts/start-server2
openldap/vendor/openldap-release/tests/scripts/start-server2-nolog
openldap/vendor/openldap-release/tests/scripts/startup_nis_ldap_server.sh
openldap/vendor/openldap-release/tests/scripts/test000-rootdse
openldap/vendor/openldap-release/tests/scripts/test001-slapadd
openldap/vendor/openldap-release/tests/scripts/test002-populate
openldap/vendor/openldap-release/tests/scripts/test003-search
openldap/vendor/openldap-release/tests/scripts/test004-modify
openldap/vendor/openldap-release/tests/scripts/test005-modrdn
openldap/vendor/openldap-release/tests/scripts/test006-acls
openldap/vendor/openldap-release/tests/scripts/test008-concurrency
openldap/vendor/openldap-release/tests/scripts/test009-referral
openldap/vendor/openldap-release/tests/scripts/test010-passwd
openldap/vendor/openldap-release/tests/scripts/test011-glue-slapadd
openldap/vendor/openldap-release/tests/scripts/test012-glue-populate
openldap/vendor/openldap-release/tests/scripts/test013-language
openldap/vendor/openldap-release/tests/scripts/test014-whoami
openldap/vendor/openldap-release/tests/scripts/test015-xsearch
openldap/vendor/openldap-release/tests/scripts/test016-subref
openldap/vendor/openldap-release/tests/scripts/test017-syncreplication-refresh
openldap/vendor/openldap-release/tests/scripts/test018-syncreplication-persist
openldap/vendor/openldap-release/tests/scripts/test019-syncreplication-cascade
openldap/vendor/openldap-release/tests/scripts/test020-proxycache
openldap/vendor/openldap-release/tests/scripts/test021-certificate
openldap/vendor/openldap-release/tests/scripts/test022-ppolicy
openldap/vendor/openldap-release/tests/scripts/test023-refint
openldap/vendor/openldap-release/tests/scripts/test024-unique
openldap/vendor/openldap-release/tests/scripts/test025-limits
openldap/vendor/openldap-release/tests/scripts/test026-dn
openldap/vendor/openldap-release/tests/scripts/test027-emptydn
openldap/vendor/openldap-release/tests/scripts/test028-idassert
openldap/vendor/openldap-release/tests/scripts/test029-ldapglue
openldap/vendor/openldap-release/tests/scripts/test030-relay
openldap/vendor/openldap-release/tests/scripts/test031-component-filter
openldap/vendor/openldap-release/tests/scripts/test032-chain
openldap/vendor/openldap-release/tests/scripts/test033-glue-syncrepl
openldap/vendor/openldap-release/tests/scripts/test034-translucent
openldap/vendor/openldap-release/tests/scripts/test035-meta
openldap/vendor/openldap-release/tests/scripts/test036-meta-concurrency
openldap/vendor/openldap-release/tests/scripts/test037-manage
openldap/vendor/openldap-release/tests/scripts/test038-retcode
openldap/vendor/openldap-release/tests/scripts/test039-glue-ldap-concurrency
openldap/vendor/openldap-release/tests/scripts/test040-subtree-rename
openldap/vendor/openldap-release/tests/scripts/test041-aci
openldap/vendor/openldap-release/tests/scripts/test042-valsort
openldap/vendor/openldap-release/tests/scripts/test043-delta-syncrepl
openldap/vendor/openldap-release/tests/scripts/test044-dynlist
Log:
Load openldap-2.4.6 into vendor/openldap-release.
Modified: openldap/vendor/openldap-release/ANNOUNCEMENT
===================================================================
--- openldap/vendor/openldap-release/ANNOUNCEMENT 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/ANNOUNCEMENT 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,35 +1,42 @@
-A N N O U N C E M E N T -- OpenLDAP 2.3
+A N N O U N C E M E N T -- OpenLDAP 2.4
The OpenLDAP Project is pleased to announce the availability
- of OpenLDAP Software 2.3, a suite of the Lightweight Directory
+ of OpenLDAP Software 2.4, a suite of the Lightweight Directory
Access Protocol (v3) servers, clients, utilities, and
development tools.
This release contains the following major enhancements:
* Slapd(8) enhancements
- - Updated slapd "overlay" interface, and several
- example (and mostly experimental) overlays.
- - Updated LDAP "sync" Engine with replication support,
- provider now an "overlay"
- - Numerous access control enhancements, including
- experimental "don't disclose on error" capability
- - Configuration backend
- * LDAPv3 extensions, including:
- - LDAP Password Policy
- - LDAP Component Matching (requires OpenLDAP snacc)
- - LDAP Modify Increment
+ - Syncrepl enhancements, including push-mode and
+ Multi-Master support
+ - Dynamic configuration enhancements, including
+ online schema editing and full access control
+ - Dynamic monitoring enhancements, including
+ cache usage information
+ * New overlays
+ - Attribute value constraints
+ - Dynamic Directory Services (RFC2589)
+ - Reverse Group Membership maintenance (memberof)
+ * Clients and tools
+ - Full support of request/response controls
+ - New ldapexop tool for arbitrary extend operations
+ - Support of DNS SRV records for default server
+ * Significant performance enhancements throughout
+ the client and server code base
+ * Multiple new features in libldap and liblber
+ * Expanded documentation
+ - Function-complete manual pages
+ - Numerous new examples in the Admin Guide
This release includes the following major components:
* slapd - a stand-alone LDAP directory server
- * slurpd - a stand-alone LDAP replication server
* -lldap - a LDAP client library
* -llber - a lightweight BER/DER encoding/decoding library
* LDIF tools - data conversion tools for use with slapd
* LDAP tools - A collection of command line LDAP utilities
* Admin Guide, Manual Pages - associated documentation
- * SNACC - ASN.1 development tools for OpenLDAP
In addition, there are some contributed components:
@@ -40,9 +47,9 @@
ACKNOWLEDGEMENTS
OpenLDAP Software is developed by the OpenLDAP Project. The
- Project consists of a team of volunteers whose use the
+ Project consists of a team of volunteers who use the
Internet to coordinate their activities. The Project is
- managed by the OpenLDAP Foundation.
+ an organized activity of the OpenLDAP Foundation.
OpenLDAP Software is derived from University of Michigan LDAP,
release 3.3.
@@ -51,7 +58,7 @@
AVAILABILITY
This software is available under the OpenLDAP Public License,
- an non-restrictive, "free", open-source license. For download
+ an non-restrictive, "free", open-source license. Download
information is available at:
http://www.OpenLDAP.org/software/download/
@@ -73,7 +80,7 @@
http://www.openldap.org/faq/
In addition, there are also a number of discussion lists
- related OpenLDAP Software. A list of mailing lists is
+ related to OpenLDAP Software. A list of mailing lists is
available at:
http://www.OpenLDAP.org/lists/
@@ -94,7 +101,7 @@
platforms including Darwin, FreeBSD, Linux, NetBSD, OpenBSD
and most commercial UNIX systems. The release has also been
ported (in part or in whole) to other platforms including
- Apple MacOS X, IBM zOS, and Microsoft Windows 2000.
+ Apple MacOS X, IBM zOS, and Microsoft Windows NT/2000/etc.
---
OpenLDAP is a registered trademark of the OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/CHANGES
===================================================================
--- openldap/vendor/openldap-release/CHANGES 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/CHANGES 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,869 +1,4 @@
-OpenLDAP 2.3 Change Log
+OpenLDAP 2.4 Change Log
-OpenLDAP 2.3.39 Release (2007/10/26)
- Fixed slapd database/overlay config conflict (ITS#4848)
- Fixed slapd password_hash config order (ITS#5082)
- Fixed slapd slap_mods_check bug (ITS#5119)
- Fixed slapd ACL sets memory handling (ITS#4860,ITS#4873)
- Fixed slapd ordered values add normalization issue (ITS#5136)
- Fixed slapd-bdb DB_CONFIG conversion bug (ITS#5118)
- Fixed slapd-ldap search control parsing (ITS#5138)
- Fixed slapd-ldap SASL idassert w/o authcId
- Fixed slapd-ldif directory separators in DN (ITS#5172)
- Fixed slapd-meta conn caching on bind failure (ITS#5154)
- Fixed slapd-meta bind timeout assertion (ITS#5185)
- Fixed slapd-sql concurrency issue (ITS#5095)
- Fixed slapo-chain double-free (ITS#5137)
- Fixed slapo-pcache and -rwm interaction fix (ITS#4991)
- Fixed slapo-pcache non-null terminated array crasher (ITS#5163)
- Fixed slapo-rwm modlist handling (ITS#5124)
- Fixed slapo-rwm UUID in filter (ITS#5168)
- Fixed sasl SASL_SSF_EXTERNAL type (ITS#3864)
- Fixed liblber Windows x64 portability (ITS#5105)
- Fixed libldap ppolicy control creation (ITS#5103)
- Build Environment
- Fixed termios macro check (ITS#4880)
- Updated Makefiles
- Documentation
- Fixed slapd-bdb(5) note about dbconfig directives (ITS#5134)
- Added slapd-sql(5) empty oc mapping workaround (ITS#4785)
- Added max-depth/return-error to slapo-chain(5)
- slapadd/slapindex note about file ownership (ITS#5166)
- slapcat note about using against running slapd (ITS#5028)
- Fixed Admin Guide URL in README (ITS#5107)
-
-OpenLDAP 2.3.38 Release (2007/08/20)
- Fixed slapadd check for ';binary' when required (ITS#5071)
- Fixed slapd select_backend/ManageDSAit (ITS#4986)
- Fixed slapd integer/pointer types and overflow (ITS#5035)
- Fixed slapd AVA_Sort on multivalued RDNs (ITS#5057)
- Fixed slapd LDIF parsing error handling (ITS#5090)
- Fixed slapd syncrepl searchbase scope (ITS#5073)
- Fixed slapd-bdb missing index warning (ITS#5037)
- Fixed slapd-bdb Quick index for ID 0 (ITS#5052)
- Fixed slapd-bdb spurious empty DN warnings during add (ITS#5079)
- Fixed slapd-hdb slapacl behavior (ITS#5087)
- Fixed slapd-relay configuration (ITS#4322,ITS#4340)
- Fixed slapd-sql structuralObjectClass issue (ITS#5088)
- Fixed slapo-ppolicy double-free on shutdown (ITS#5094)
- Fixed slapo-rwm/slapd-meta dup attrs after mapping (ITS#5091)
- Fixed slapo-syncprov uninit'd vars (ITS#5048,#5049)
- Fixed libldap ldap_add_result_entry (ITS#5056)
- Added client tools support for ppolicy response (ITS#5061)
- Removed lint
- Build Environment
- Fixed macro definition of open() in glibc 2.6 (ITS#5075)
- Documentation
- aspell --lang=en_US -c <manpage> (ITS#5076)
- Debug messages cleaned up (ITS#5085)
-
-OpenLDAP 2.3.37 Release (2007/07/20)
- Fixed slapd-glue/syncprov interaction (ITS#4623)
- Fixed slapd-ldap search reference crash (ITS#5025)
- Fixed slapd-ldbm crash on Compare op (ITS#5044)
- Fixed slapo-rwm searchFilter double free (ITS#5043)
- Clarified slapd-perl SampleLDAP.pm usage (ITS#4995)
- Documentation
- Fixed slapd.conf(5) for default loglevel (ITS#5027)
-
-OpenLDAP 2.3.36 Release (2007/06/17)
- Fixed slapd error code on Windows (ITS#4945, #4606)
- Fixed slapd mutex bug after failed startup (ITS#4957)
- Fixed slapd sasl failed Bind bug (ITS#4954)
- Fixed slapd sasl ssf logging (ITS#5001)
- Fixed slapd tool op init (ITS#4911)
- Fixed slapd-bdb no-op crasher (ITS#4925)
- Fixed slapd-config olcLogLevel (ITS#4949)
- Fixed slapd-config olcModuleLoad replace (ITS#4921,ITS#4923)
- Fixed slapd-relay crash when no database can be selected (ITS#4958)
- Fixed slapo-chain RFC3062 passwd exop handling (ITS#4964)
- Fixed slapo-dynlist multiple group/url[/member] config (ITS#4989)
- Fixed slapo-pcache handling of abandoned Operations (#5015)
- Fixed slapo-pcache and -rwm interaction (ITS#4991)
- Fixed slapo-ppolicy pwdReset/pwdMinAge (ITS#4970)
- Fixed slapo-ppolicy control cleanup from ITS#4665
- Fixed slapo-syncprov cookie parsing error (ITS#4977)
- Fixed slapo-valsort crash on delete op (ITS#4966)
- Fixed liblber compilation problem (ITS#5007)
- Fixed libldap referral chasing loop (ITS#4955)
- Fixed libldap response code handling on rebind (ITS#4924)
- Fixed libldap SASL_MAX_BUFF_SIZE (ITS#4935)
- Fixed libldap cldap assert (ITS#4992)
- Fixed libldap_r thread debug issues (ITS#4972)
- Fixed liblutil reading passwd from pipe (ITS#4875)
- Fixed ldap client usage typo (ITS#4939)
- Build Environment
- Fixed --disable-overlays Makefile problem (ITS#4988)
- Fixed HP-UX socklen_t problem (ITS#4629)
- Documentation
- Updated ldapsearch(1) with details on -C option (ITS#5009)
- Updated slapadd(8) with details on -s option
- Fixed slapd.conf(5) for correct loglevel packets (ITS#5011)
- Fixed slapo-ppolicy(5) permanent pwdAccountLockedTime (ITS#4978)
-
-OpenLDAP 2.3.35 Release (2007/04/09)
- Fixed ldapmodify to use correct memory free functions (ITS#4901)
- Fixed slapd acl set minor typo (ITS#4874)
- Fixed slapd entry consistency check in str2entry2 (ITS#4852)
- Fixed slapd ldapi:// credential issue (ITS#4893)
- Fixed slapd str2anlist handling of undefined attrs/OCs (ITS#4854)
- Fixed slapd syncrepl delta-sync modlist free (ITS#4904)
- Added slapd syncrepl retry logging (ITS#4915)
- Fixed slapd zero-length IA5string handling (ITS#4823)
- Fixed slapd-bdb/hdb startup with missing shm env (ITS#4851)
- Fixed slapd-ldap/meta consistency in referral proxying (ITS#4861)
- Fixed slapd-ldap bind cleanup in case of unauthorized idassert
- Fixed slapd-meta search cleanup
- Fixed slapd-meta/slapo-rwm filter mapping
- Fixed slapd-sql subtree shortcut (ITS#4856)
- Fixed slapo-dynlist crasher (ITS#4891)
- Fixed slapo-refint config message (ITS#4853)
- Fixed libldap time_t signedness (ITS#4872)
- Fixed libldap_r tpool reset (ITS#4855,#4899)
- Documentation
- Misc Doc fixes (ITS#4863, ITS#4877, ITS#4885, ITS#4897)
-
-OpenLDAP 2.3.34 Release (2007/02/16)
- Fixed libldap missing get_option(TLS CipherSuite) (ITS#4815)
- Fixed ldapmodify printing error from ldap_result() (ITS#4812)
- Fixed slapadd LDIF parsing (ITS#4817)
- Fixed slapd libltdl link ordering (ITS#4830)
- Fixed slapd syncrepl memory leaks (ITS#4805)
- Fixed slapd dynacl/ACI compatibility with 2.1
- Fixed slapd-bdb/hdb be_entry_get with aliases/referrals (ITS#4810)
- Fixed slapd-ldap more response handling bugs (ITS#4782)
- Fixed slapd-ldap C-API code tests (ITS#4808)
- Fixed slapd-monitor NULL printf (ITS#4811)
- Fixed slapo-chain spurious additional info in response (ITS#4828)
- Fixed slapo-syncprov presence list (ITS#4813)
- Fixed slapo-syncprov contextCSN checkpoint again (ITS#4720)
- Added slapo-ppolicy cn=config support (ITS#4836)
- Added slapo-auditlog cn=config support
- Fixed slapi late initialization (ITS#4468)
- Build environment
- Added Berkeley DB 4.5 detection
- Documentation
- Note slapo-dynlist interaction with manageDSAit (ITS#4831)
-
-OpenLDAP 2.3.33 Release (2007/01/17)
- Fixed slapd syncrepl error logging with delta-syncrepl
- Fixed slapd-ldap/meta privileged conn caching (ITS#4547)
- Fixed slapd-ldap chase-referrals switch (ITS#4557)
- Fixed slapd-ldap bind behavior when idassert is always used (ITS#4781)
- Fixed slapd-ldap response handling bugs (ITS#4782)
- Fixed slapd-ldap idassert mode=self anonymous ops (ITS#4798)
- Fixed slapd-ldap/meta privileged connections handling (ITS#4791)
- Fixed slapd-meta retrying (ITS#4594, 4762)
- Fixed slapo-chain referral DN use (ITS#4776)
- Fixed slapo-dynlist dangling pointer after entry free (ITS#4801)
- Fixed libldap ldap_pvt_put_filter syntax checks (ITS#4648)
- Documentation
- Fixed reference to deprecated stmt in slapacl(8) (ITS#4803)
-
-OpenLDAP 2.3.32 Release (2007/01/04)
- Fixed slapd add redundant duplicate value check (ITS#4600)
- Fixed slapd ACL set memleak (ITS#4780)
- Fixed slapd syncrepl shutdown hang (ITS#4790)
- Fixed slapd connection_get race condition on Windows (ITS#4793)
- Fixed slapd values return filter control leak (ITS#4794)
- Fixed slapd-sql Debug typo (ITS#4784)
- Fixed slapo-rwm parameter handling (ITS#3971, 4458, 4638, 4689)
- Documentation
- Fixed reference to deprecated option in admin guide (ITS#4795)
-
-OpenLDAP 2.3.31 Release (2006/12/17)
- Fixed libldap unchased referral leak (ITS#4545)
- Fixed libldap tls callback (ITS#4723)
- Fixed liblutil ldif file: URL parsing
- Fixed slapd syncrepl logging (ITS#4755)
- Fixed slapd group ACL caching when proxyAuthz'ing (ITS#4760)
- Fixed slapd "group" authz default member parsing (ITS#4761)
- Fixed slapd uninitialized sd_actives array (ITS#4765)
- Fixed slapd DN parsing in bindconf_parse (ITS#4766)
- Fixed slapd conditional in macro argument (ITS#4769)
- Fixed slapd send_search_reference should propagate errors
- Fixed slapd memleak on failed bind (ITS#4771)
- Fixed slapd schema preparation case to match RFCs (ITS#4764)
- Fixed slapd kbind buffer overflow condition (ITS#4775)
- Fixed slapd connections_shutdown assert
- Fixed slapd glue parent/sub db overlay nesting (ITS#4615)
- Fixed slapd-bdb/hdb/ldbm slap_add_opattrs error checking
- Fixed slapd-bdb/hdb setting up tool threads when no indices specified
- Fixed slapd-perl interpreter context (ITS#4751)
- Fixed slapo-syncprov to complain if defined outside of a database
- Fixed test021 modify ops to be syntactically correct
- Fixed contrib smbk5pwd, check kadm5 init result
- Documentation
- Fixed typo in slapo-retcode(5) man page (ITS#4753)
- Fixed syncrepl searchbase note (ITS#4540)
- Added syncrepl starttls in the admin guide (ITS#4510)
- Fixed reference to deprecated function in ldap_parse_result(3)
-
-OpenLDAP 2.3.30 Release (2006/11/14)
- Fixed slapd authzTo/authzFrom URL matching (ITS#4744)
- Fixed slapd syncrepl consumer memory leaks (ITS#4746)
- Fixed slapd-hdb livelock (ITS#4738)
- Fixed slapo-ppolicy external quality check (ITS#4741)
- Documentation
- Fixed ldapsearch(1) man page acknowledgement (ITS#4743)
-
-OpenLDAP 2.3.29 Release (2006/11/10)
- Fixed liblber/libldap error codes on Windows (ITS#4606)
- Fixed libldap string length assert (ITS#4740)
- Fixed liblunicode case mapping (ITS#4724)
- Fixed slapd ldapi:// socket permissions (ITS#4709)
- Fixed slapd c_writewaiters assert (ITS#4696,4736)
- Fixed slapo-accesslog purge contextCSN bug (ITS#4704)
- Fixed slapo-accesslog modify/replace bug (ITS#4728)
- Fixed slapo-dynlist leaks (ITS#4664)
- Fixed slapo-ppolicy leaks (ITS#4665)
- Fixed slapo-syncprov deadlock (ITS#4720)
- Build environment
- Added selection of ODBC (ITS#4735)
- Documentation
- Fixed slapd-ldap/meta(5) rebind-as-user usage (ITS#4715)
- Fixed slapd-ldap/meta(5) missing network-timeout (ITS#4718)
-
-OpenLDAP 2.3.28 Release (2006/10/21)
- Fixed libldap ldap.conf max line length (ITS#4669)
- Fixed libldap use keepalive for syncrepl (ITS#4708)
- Fixed liblutil LDIF CR/LF parsing bug (ITS#4635)
- Fixed librewrite LDAP map parsing bug
- Fixed librewrite map double free bug
- Added ldapsearch bad filter pattern check (ITS#4647)
- Fixed slapd global access controls initialization (ITS#4654)
- Fixed slapd setting c_sasl_bindop only on SASL binds
- Fixed slapd max line length issue (ITS#4651)
- Fixed slapd return code not being propagated (ITS#4565)
- Fixed slapd integerBitAndMatch (ITS#4672)
- Fixed slapd syncrepl modrdn new superior (ITS#4695)
- Fixed slapd-ldap retry with idassert (ITS#4686)
- Fixed slapd-meta DN massage error code handling (ITS#4711)
- Fixed slapd-monitor locking with scope "subordinate" (ITS#4668)
- Fixed slapd-perl deletes (ITS#2612)
- Fixed slapd-perl backend initialization (ITS#4358)
- Fixed slapd-perl finding interpreter inside a thread (ITS#4358)
- Fixed slapo-ppolicy pwdChangedTime behavior (ITS#4692)
- Fixed slapo-translucent ldapmodify crash (ITS#4673)
- Documentation
- Updated ldapsearch(1) options (ITS#4371,4526,4647)
- Fixed slapd.access(5) non-optional dn= error (ITS#4522)
-
-OpenLDAP 2.3.27 Release (2006/08/19)
- Fixed libldap dangling pointer issue (previous fix was broken) (ITS#4405)
- Fixed slapd-sql noop handling (ITS#4563)
-
-OpenLDAP 2.3.26 Release (2006/08/17)
- Fixed libldap dnssrv bug with "not present" positive statement (ITS#4610)
- Fixed libldap dangling pointer issue (ITS#4405)
- Fixed slapd incorrect rebuilding of replica URI (ITS#4633)
- Fixed slapd DN X.509 normalization crash (ITS#4644)
- Fixed slapd-monitor operations order via callbacks (ITS#4631)
- Fixed slapd-sql undefined filter handling (ITS#4604)
- Fixed slapo-accesslog purge task during shutdown
- Fixed slapo-ppolicy handling of default policy (ITS#4634)
- Fixed slapo-ppolicy logging verbosity when using default policy
- Fixed slapo-syncprov incomplete sync on restart issues (ITS#4622)
-
-OpenLDAP 2.3.25 Release (2006/08/01)
- Fixed liblber ber_bvreplace_x argument checks
- Add libldap_r TLS concurrency workaround (ITS#4583)
- Fixed liblutil password length bug
- Add slapd glue/subordinate conflict check (ITS#4614)
- Fixed slapd acl selfwrite bug (ITS#4587)
- Fixed slapd bconfig "require" and "none" handling (ITS#4574)
- Fixed slapd bconfig segfault when ldapadding new schema entries
- Fixed slapd syncrepl no rootdn bug (ITS#4582)
- Fixed slapd syncrepl contextCSN issue (ITS#4622)
- Fixed slapd-bdb/hdb lock bug with virtual root (ITS#4572)
- Fixed slapd-bdb/hdb modrdn new entry disappearing bug (ITS#4616)
- Fixed slapd-bdb/hdb cache job issue
- Fixed slapo-syncprov need new CSN with delete syncID sets (ITS#4534)
- Fixed slapo-syncprov startup when lastmod is off (ITS#4613)
- Fixed slapo-accesslog cn=config purge bug (ITS#4595)
- Fixed slapo-auditlog DB initialization
- Fixed slapo-ppolicy password hashing bug (ITS#4575)
- Fixed slapo-ppolicy password modify pwdMustChange reset bug (ITS#4576)
- Fixed slapo-ppolicy control can be critical (ITS#4596)
- Fixed slapo-retcode logical and bug
- Fixed slapo-syncprov DEL propagation bug (ITS#4589)
- Fixed slurpd ldaps:// default port bug (ITS#4580)
- Build environment
- Fix configure winsock.h detection for Cygwin (ITS#4621)
- Fix configure GMP detection (ITS#4608)
- Updated test006-acls to test selfwrite access (ITS#4587)
- Documentation
- Fixed ldapsearch(1) formatting (ITS#4619)
- Updated slapd.conf(5) RFC references
- Updated slapd.conf(5) lastmod discussion (ITS#4613)
- Updated slapd.conf(5) "require" and "none" handling (ITS#4574)
- Added slapd.conf(5) access control note to authz-regexp discussion
- Updated slapo-syncprov(5) to clarify SyncProv and syncrepl diffs
-
-OpenLDAP 2.3.24 Release (2006/05/30)
- Fixed slapd syncrepl timestamp bug (delta-sync/cascade) (ITS#4567)
- Fixed slapd-bdb/hdb non-root users adding suffix/root entries (ITS#4552)
- Re-fixed slapd-ldap improper free bug in exop (ITS#4550)
- Fixed slapd-ldif assert bug (ITS#4568)
- Fixed slapo-syncprov crash under glued database (ITS#4562)
-
-OpenLDAP 2.3.23 Release (2006/05/17)
- Fixed slapd-ldap improper free bug (ITS#4550)
-
-OpenLDAP 2.3.22 Release (2006/05/15)
- Fixed libldap referral input destroy issue (ITS#4533)
- Fixed libldap ldap_sort_entries tail bug (ITS#4536)
- Fixed libldap default connection concurrency issue (ITS#4541)
- Fixed libldap_r thread debug missing break
- Fixed libldap_r tpool cleanup
- Fixed liblutil strtoul(3) usage (ITS#4503)
- Fixed liblutil time resolution issue (ITS#4514)
- Updated ldapdelete(1) to stdout bug (ITS#4453)
- Updated ldapsearch(1) BASE output (ITS#4504)
- Fixed slapd backglue issue (ITS#4529)
- Fixed slapd cn=config (ITS#4512)
- Fixed slapd cn=config ACL application fix
- Fixed slapd cn=config olcLimits (ITS#4515)
- Fixed slapd dynacl tgrant/tdeny initialization
- Fixed slapd runqueue use of freed memory (ITS#4517)
- Fixed slapd slap_send_ldap_result bug (ITS#4499)
- Fixed slapd thread pool init issue (ITS#4513)
- Added slapd syncrepl mandatory searchbase check
- Fixed slapd-bdb/hdb pre/post-read freeing (ITS#4532)
- Fixed slapd-bdb/hdb pre/post-read unavailable issue (ITS#4538)
- Fixed slapd-bdb/hdb referral issue (ITS#4548)
- Fixed slapd-hdb IDL sort issue (ITS#4531)
- Fixed slapd-ldap proxyAuthz of bound identity/override (ITS#4497)
- Fixed slapd-ldap/meta protocol version propagation (ITS#4488)
- Fixed slapd-ldap fd cleanup (ITS#4474)
- Fixed slapd-ldif deadlock (ITS#4500)
- Fixed slapd-shell lutil_atoi issue (ITS#4495)
- Fixed slapadd cn=config issue (ITS#4194)
- Fixed slapo-accesslog log purging issue (ITS#4505)
- Added slapo-accesslog reqOld feature
- Fixed slapo-auditlog missing return codes
- Fixed slapo-ppolicy BER tags issue (ITS#4528)
- Fixed slapo-ppolicy rebind bug (ITS#4516)
- Fixed slapo-refint delete prohibit issue (ITS#4442)
- Fixed slapo-syncprov MODs cause DELs (ITS#4423)
- Fixed slapo-syncprov/syncrepl sessionlog issue (ITS#4534)
- Added slapo-syncprov extra logging
- Fixed slapo-translucent modifications (ITS#4527)
- Fixed slurpd potential overflow issue
- Build Environment
- Fixed OSF1 compilation problem (ITS#4537)
- Fixed test020-proxycache disabled debug issue (ITS#4491)
- Fixed test033-glue-syncrepl overlay detection (ITS#4544)
- Documentation
- Fixed slapd(8) logging header reference (ITS#4509)
- Clarified slapd.conf(5) "disable bind_anon" feature
-
-OpenLDAP 2.3.21 Release (2006/04/08)
- Fixed libldap referral chasing issue (ITS#4448)
- Fixed libldap invalid free bug (ITS#4436)
- Fixed libldap mutex leak (ITS#4441)
- Fixed libldap_r thr_yield(2) return handling (ITS#4469)
- Fixed slapd syncprov/glue interaction issue (ITS#4323, ITS#4417)
- Fixed slapd operational attrs in presence of global overlays (ITS#4431)
- Fixed slapd "threads" config value checking (ITS#4433)
- Fixed slapd connection index bound check (ITS#4449)
- Fixed slapd connection cleanup (ITS#4465)
- Fixed slapd slap_realloc misuse (ITS#4477)
- Fixed slapd size limit check when pagesize=1 (ITS#4479)
- Fixed slapd-bdb/hdb cache issue (ITS#4439)
- Fixed slapd-ldbm crash on modify bug (ITS#4464)
- Fixed slapd-ldap potential bind deadlock (ITS#4409)
- Fixed slapd-ldap/meta conn expiration concurrency (ITS#4429)
- Fixed slapd-ldap failed bind connection trashing (ITS#4428)
- Fixed slapd-ldap/meta chase-referrals disabling (ITS#4447)
- Fixed slapd-ldap controls forwarding (ITS#4457)
- Fixed slapd-ldap pretty DN in proxied requests (ITS#4456)
- Fixed slapd-ldbm crash on modify bug (ITS#4464)
- Fixed slapd-meta write error mapping (ITS#4419)
- Removed lint
- Build Environment
- Added slapo-auditlog build support (ITS#4372)
- Fixed multi-precision sizeof detection (ITS#4416)
- Fixed liblunicode build (ITS#4435)
- Updated libtool to version 1.5.22 (ITS#4471)
- Updated shtool to version 2.0.5
-
-OpenLDAP 2.3.20 Release (2006/02/18)
- Added libldap SASL workaround for broken LDAP servers (ITS#4391)
- Fixed libldap/slapd valuesReturnFilter OID (ITS#4404)
- Fixed slapd config_generic_wrapper missing parameter bug (ITS#4376)
- Fixed slapd extensible filter value normalization bug (ITS#4380)
- Fixed slapd context CSN not updating issue (ITS#4384)
- Fixed slapd non-read/write epoll event handling (ITS#4395)
- Fixed slapd syncrepl de-normalize UUID issue
- Fixed slapd syncrepl dynamic reconfig issue (ITS#4401)
- Added slapd syncrepl log messages (ITS#4369)
- Added slapd permissive modify/increment support
- Added slapd dynamically registered debug level support
- Fixed slapd connectionless LDAP support
- Fixed slapd cn=config error on create failure issue (ITS#4407)
- Fixed slapd-bdb/hdb wake listener on runqueue submit (ITS#4385)
- Fixed slapd-ldap/meta resources leaks on multiple binds (ITS#4387)
- Fixed slapd-ldap/meta assert on connection shutdown (ITS#4390)
- Added slapd-meta subtree-exclude feature
- Fixed slapo-syncprov update latency issue (ITS#4385)
- Fixed slapo-auditlog crash (ITS#4394)
- Fixed slapo-accesslog unbind crash (ITS#4386)
- Fixed slurpd reject error formating (ITS#4382)
- Fixed ldappasswd unbind issue (ITS#4403)
- Fixed slapo-pcache assert on attrsonly search (ITS#4406)
- Added slapo-pcache max_queries enhancement (ITS#4225)
- Added slapo-pcache negative caching enhancement
- Build Environment
- Fixed liblunicode cross compiling problem (ITS#4363)
- Updated <netinet/tcp.h> detection for AIX (ITS#4312)
- Updated multi-precision library detection
- Documentation
- Updated misc. manual pages
-
-OpenLDAP 2.3.19 Release (2006/01/25)
- Fixed libldap disable DH key exchange with DH params (ITS#4354)
- Fixed libldap_r thread pool destroy hang (ITS#4349,ITS#4368)
- Fixed slapd slap_daemon destroy issue (ITS#4370)
- Fixed slapd-hdb livelock issue (ITS#4360)
- Fixed slapd-bdb/hdb auto-recovery issue (ITS#4361,ITS#4373)
- Fixed slapd-bdb/hdb BDB 4.4 compatibility issues (ITS#4362)
- Fixed slapo-ppolicy modify issue (ITS#4355)
- Fixed slapo-syncprov/pcache filter dup issue (ITS#4364)
- Fixed slapo-syncprov playlog nentries reset issue (ITS#4365)
- Build environment
- Fixed slaptools when --disable-debug (ITS#4351)
- Fixed slapd(8) solaris select(2) issue (ITS#4357)
-
-OpenLDAP 2.3.18 Release (2006/01/17)
- Fixed slapd syncrepl variable used before set bug (ITS#4331)
- Updated slapd-meta retry capabilities (ITS#4328)
- Fixed slapd-bdb slapcat autorecover bug (ITS#4324)
- Fixed slapo-chain search limits (ITS#4336)
- Fixed slapo-pcache attrsets issues (ITS#4316)
- Fixed slapo-translucent connection destroy (ITS#4334)
- Fixed slapd-config handling of attribute options (ITS#4339)
- Fixed slapd-ldap idassert resource leak (ITS#4326)
- Fixed slapd-meta nretries issue (ITS#4059)
- Fixed slapd wake_listener loses wakes (ITS#4343)
- Fixed slapd connection manager issue (ITS#4338)
- Fixed slapd handling of old style configuration directives (ITS#4341)
- Removed slapd-bdb/hdb extraneous yields (ITS#3950)
- Build Environment
- Removed problematic Linux sched_yield(2) workarounds (ITS#3950)
- Documentation
- Updated release documents
- Updated misc. manual pages
-
-OpenLDAP 2.3.17 Release (2006/01/10)
- Fixed slapd anonymous proxy authorization issue (ITS#4320)
- Fixed slapd-ldap/meta session reuse issue (ITS#4315)
- Fixed slapd-ldap idassert anon-to-anon issue (ITS#4321)
- Fixed slapd-monitor thread issue (ITS#4318)
- Build environment
- Updated Linux sched_yield(2) workaround to use nanosleep(2) (ITS#3950)
- Fixed configure report-to URL
-
-OpenLDAP 2.3.16 Release (2006/01/08)
- Fixed slapd-bdb reindexing via cn=config not noticed issue (ITS#4260)
- Fixed slapd-monitor connection search crash (ITS#4300)
- Fixed slapd cn=config bad ACL syntax modify crash (ITS#4306)
- Fixed slapd ACL/suffix configuration issue (ITS#4307)
- Fixed slapd-bdb/hdb cache issue (ITS#4308)
- Fixed slapd-bdb/hdb/ldbm suffix add with default referral issue (ITS#4310)
- Fixed slapd-ldbm compare cache release issue (ITS#4313)
- Fixed slapd syncrepl time/size limit parsing
- Fixed slapi slapi_op_bind_callback fix (ITS#4311)
- Fixed slapi pluginlog fix (ITS#4291)
- Fixed ldapsearch response control handling issue
- Build environment
- Replace sched_yield(2) on Linux with select(2) (ITS#3950)
- Documentation
- Added slapd-bdb(5) cachefree description
- Updated misc. manual pages
-
-OpenLDAP 2.3.15 Release (2006/01/04)
- Fixed slapd strerror logging bug (ITS#4292)
- Fixed slapd ACL add/delete fraction issue (ITS#4295)
- Fixed slapd ACL users selfwrite issue (ITS#4299)
- Fixed slapd attrs/objectclass replog issues (ITS#4298)
- Fixed slapd-ldap password modify exop password return (ITS#4294)
- Build environment
- Disable test030-relay when threads are unavailable (ITS#4297)
-
-OpenLDAP 2.3.14 Release (2005/12/23)
- Fixed slapd assertion control restrictions
- Fixed slapd sc_prev update after free bug (ITS#4237)
- Fixed slapd pid file creation (ITS#4241,4251)
- Fixed slapd DEBUG dependency (ITS#4245)
- Added slapd warning for excessive threads number (ITS#4249)
- Fixed slapd passwd incomplete mod structure issue (ITS#4278)
- Fixed slapd ACL exact attrval clause normalization (ITS#4255)
- Fixed slapd modify/delete by ordered index issue
- Fixed slapd strerror NULL bug (ITS#4285)
- Fixed slapd-glue issues (ITS#4084,4133)
- Fixed slapd-hdb idl Delete bug (ITS#4250)
- Fixed slapd-hdb cache deadlock (ITS#4254)
- Fixed slapd-bdb/hdb alock_close bug (ITS#4259)
- Fixed slapd-bdb dn2id IDL cache bug (ITS#4263)
- Fixed slapd-bdb/hdb mode argument parsing (ITS#4257)
- Fixed slapd-bdb/hdb cn=config reindexing (ITS#4260)
- Fixed slapd-bdb/hdb cn=config olcDbIndex modify/replace (ITS#4262)
- Fixed slapd-bdb/hdb lockup issue (ITS#4184)
- Fixed slapd-ldap anonymous identity assertion (ITS#4272)
- Added slapd-ldap/meta idle-timeout support (ITS#4115)
- Fixed slapd-meta bind-timeout handling
- Fixed slapd-sql plug leak
- Fixed slapo-dynlist/dyngroup nonexistant object return code (ITS#4224)
- Updated slapo-dynlist (ITS#3756,3781)
- Fixed slapo-rwm static DN free bug (ITS#4248)
- Fixed slapo-syncprov unpublished control (ITS#4238)
- Fixed slapo-syncprov message id issue
- Fixed slapo-unique extraneous searches (ITS#4267)
- Build environment
- Fixed thread dependency of test028 (ITS#4141)
- Updated test026-dn
- Updated test033-glue-syncrepl (ITS#4264)
- Documentation
- Updated slapd.conf(5) and Admin Guide (ITS#4146,4266)
- Updated slapo-dynlist(5) (ITS#4197)
- Updated slapo-pcache(5) (ITS#4232)
- Updated slapindex(8) (ITS#4242)
-
-OpenLDAP 2.3.13 Release (2005/11/30)
- Fixed libldap/liblutil MSG_ACCRIGHTSLEN bug (ITS#4206)
- Fixed libldap ldap_bv2escaped_filter_value issue (ITS#4212)
- Fixed liblutil URL value-specs issue (ITS#4221)
- Fixed slapd sizelimit disclose issue (ITS#4213)
- Fixed slapd gentlehup write restrict issue (ITS#3717)
- Fixed slapd gentlehup abnormal issue (ITS#4217)
- Fixed slapd delta-sync subtree scope issue (ITS#4227)
- Fixed slapd cn=config OID/name pollution issue (ITS#4185)
- Fixed slapd cn=config rootdn issue (ITS#4192)
- Fixed slapd cn=config slaptest -F without -f issue (ITS#4194)
- Fixed slapd cn=config ACL issue (ITS#4218)
- Fixed slapd-bdb negative results IDL cache issue (ITS#4223)
- Fixed slapd-bdb cursor close issue (ITS#4226)
- Fixed slapd-hdb slapadd -q issue (ITS#4210)
- Fixed slapd-hdb missing results issue (ITS#4186)
- Fixed slapd-ldap potential double free issue (ITS#4189)
- Fixed slapd-meta matched DN issue (ITS#4195)
- Fixed slapd-meta DN cache issue (ITS#4196)
- Fixed slapd-monitor shadow issue (ITS#4214)
- Fixed slapo-accesslog delta-syncrepl issue (ITS#4198)
- Fixed slapo-accesslog cleanup issue (ITS#4209)
- Fixed slapo-chain resource leak issue (ITS#4140)
- Fixed slapo-chain identity assertion issue (ITS#4256)
- Fixed slapo-pcache attrset check issue (ITS#4199)
- Fixed slapd-bdb readonly dirty alock issue (ITS#4201)
- Fixed slapd-pcache non-requested attributes issues (ITS#4203,4204)
- Fixed slaptest -F -f success with unsupported issue (ITS#4220)
- Build environment
- Improved Berkeley DB detection (ITS#3809)
- Updated DB_CONFIG example (ITS#4229)
- Documentation
- Updated ldif(5) to include change record description
-
-OpenLDAP 2.3.12 Release (2005/11/17)
- Fixed libldap ldapi:// authdn construction
- Added libldap ldap_bv2escaped_filter_value (ITS#2535)
- Added libldap/slapd TLS DSA certificate support (ITS#4017)
- Fixed libldap SASL bind issue (ITS#4158)
- Fixed ldapmodrdn empty line handling (ITS#4101)
- Fixed client tools additional info printing (ITS#4147)
- Updated slapd ldaps:// not configured fix (ITS#4082,4083)
- Fixed slapd connection crashes (ITS#4108)
- Fixed slapd illegal S option bug (ITS#4119)
- Fixed slapd cn=monitor log level mod issue (ITS#4091)
- Fixed slapd cn=config bad access issue (ITS#4111)
- Fixed slapd cn=config access modify issue (ITS#4127)
- Fixed slapd cn=config init issue (ITS#4128)
- Fixed slapd non-reentrant libwrap issue (ITS#4099)
- Fixed slapd thread v. tools_threads settings
- Fixed slapd spurious defer message (ITS#3850)
- Fixed slapd attribute SYNTAX OIDM issue (ITS#4116)
- Fixed slapd modify empty sequence bug (ITS#4183)
- Fixed slapd-bdb uninitialized condition in tool mode (ITS#4143)
- Fixed slapd-bdb empty suffix and syncprov issue (ITS#4171)
- Fixed slapd-hdb syncrepl deadlock issue (ITS#4088)
- Added slapd-ldap write op timeout support (ITS#4157)
- Fixed slapd-ldap/slapo-chain matched dn handling (ITS#4176)
- Fixed slapd-meta invalid DN attrs normalize/pretty issue (ITS#4107)
- Fixed slapd-meta rootdn erroneous success issue (ITS#4122)
- Fixed slapd-meta proxying bind result issue (ITS#4129)
- Fixed slapd-meta/slapo-rwm rwm-mapping issue (ITS#4086)
- Fixed slapd-meta per-target retry (ITS#4150)
- Fixed slapd-meta size/time limit handling (ITS#4145)
- Fixed slapd-sql size limit count (ITS#4181)
- Fixed slapo-ppolicy pwdFailureTime after bind success issue (ITS#4134)
- Fixed slapo-ppolicy add passord_hash quality config dependency
- Fixed slapo-syncprov LDAP response types (ITS#4183)
- Added slapd delta syncrepl support
- Added slapadd thread support
- Updated slapcat subordinate database handling (ITS#4089)
- Added slapd/slaptest pid/arg file consistency check (ITS#4074)
- Updated slaptools default debug level to "none" (ITS#4044)
- Fixed slurpd backwards compat issue (ITS#4151)
- Added slurpd pid/arg file consistency check (ITS#4152)
- Updated contrib smbk5pwd module
- Removed lint
- Build environment
- Fixed libldap HSTRERROR issue (ITS#4124)
- Fixed slapd AIX IFMT issue (ITS#4123)
- Added slapd-bind test program
- Added inet_ntoa_b support for VxWorks (ITS#3440)
- Updated test036 (ITS#4095)
- Fixed test036 cmp issue (ITS#4142)
- Dropped SSLeay support
- Documentation
- slapd.conf(5) defaultSearchBase issue (ITS#4162)
- slap tool man pages wll typo (ITS#4169)
-
-OpenLDAP 2.3.11 Release (2005/10/12)
- Fixed libldap reentrancy issue (ITS#3988)
- Fixed libldap ndelay without timeout
- Fixed slapd ldaps:// not configured issue (ITS#4082,4083)
- Fixed slapd-bdb/hdb mode argument parsing (ITS#4077)
- Fixed slapd WIN32 writefds init issue
- Fixed slapadd buffer alignment issue (ITS#4078)
- Updated slapd syncrepl to use ldap_unbind_ext
- Removed lint
-
-OpenLDAP 2.3.10 Release (2005/10/10)
- Fixed libldap chasing of chased referrals (ITS#2942)
- Added libldap LDAP_NOT_SUPPORTED for TLS (ITS#4072)
- Added libldap LDAP_MSG_RECEIVED support
- Dropped libldap LDAP_MORE_RESULTS_TO_RETURN use
- Fixed slapd cn=config updated rootdn issue (ITS#4035)
- Fixed slapd-meta bus error (ITS#4073)
- Fixed slapd-meta/ldap/rwm empty naming context issue (ITS#4071)
-
-OpenLDAP 2.3.9 Release (2005/10/07)
- Fixed slapd req_pwdexop bug
- Fixed slapo-syncprov queued UUIDs bug (ITS#4068)
- Fixed slapo-syncprov memory leak
- Fixed slapd anlist leak
- Removed lint
- Build Environment
- Updated testsuite to test only primary backends by default
- Disable test041-aci
-
-OpenLDAP 2.3.8 Release (2005/10/05)
- Fixed slapd undef HAVE_EPOLL issue
- Fixed slapd connection-get wake bug (ITS#3999)
- Fixed slapd uninitialized var bug (ITS#3854)
- Fixed slapd add entry without parent bug (ITS#2757)
- Fixed slapd cn=config value escaping bug (ITS#3807)
- Fixed slapd cn=config missing host/uri bug (ITS#4009)
- Fixed slapd alock symbol bug (ITS#3978)
- Fixed slapd replogfile assert (ITS#4003)
- Fixed slapd rewrite session var set bug (ITS#4023)
- Fixed slapd syncrepl empty uniqueMember bug (ITS#4040)
- Fixed slapd alias resolution bug (ITS#4030)
- Fixed slapd password-hash cleartext bug (ITS#4021)
- Fixed slapd realloc zero bug (ITS#3981)
- Fixed slapd nested overlay configuration bug (ITS#4047)
- Fixed slapd password modify oldPassword ignore bug (ITS#4049)
- Added slapd password oldPassword verify (ITS#4051)
- Fixed slapd select_backend manageDSAit with glue issue (ITS#4027)
- Updated slapd authz backend detection (ITS#4018)
- Fixed slapd-bdb/hdb pointer/integer size mismatch (ITS#4015)
- Updated slapd-hdb index management
- Fixed slapd-glue mixtures bug (ITS#3979)
- Fixed slapd-ldap unlock issue (ITS#4001)
- Fixed slapd-ldap manageDIT check bug (ITS#4005)
- Fixed slapd-ldap resource release issue (ITS#4016)
- Fixed slapd-meta rootdn lookup bug (ITS#4004)
- Fixed slapd-meta null value assert issue (ITS#4028)
- Added slapd-meta pooled connections (ITS#4056)
- Added slapd-meta target DSA bind defer when auth'd as rootdn (ITS#4057)
- Fixed slapd-meta pseudorootdn issue
- Fixed slapd-monitor unavailable issue (ITS#4013)
- Fixed slapd-perl init/destroy bug (ITS#3923)
- Fixed slapd-sql missing space issue (ITS#4061)
- Fixed slapo-accesslog timestamp normalization issue
- Fixed slapo-accesslog normalizer issue
- Fixed slapo-ppolicy replication issues (ITS#3980)
- Added slapo-ppolicy pwdattribute descriptor support (ITS#4025)
- Fixed slapo-syncprov/unique interact issues (ITS#3989)
- Fixed slapo-syncprov/subordinate interact issues (ITS#3996)
- Fixed slapo-syncprov schema check assert (ITS#4031)
- Fixed slapo-syncprov psearch flush in qtask
- Fixed slapo-syncprov abandon checks
- Fixed slapo-unique ignore writes not under unique_base (ITS#4066)
- Fixed slapo-valsort unknown valsort-attr bug (ITS#4047)
- Fixed slapcat out-of-memory problem (ITS#4010)
- Fixed slurpd unrecognized slave names bug (ITS#4012)
- Fixed liblber dgram len bug (ITS#4046)
- Fixed libldap SASL and TLS potential ld_error leaks (ITS#4064)
- Fixed liblutil/csn time counter issue
- Updated contrib/ldapc++ to avoid deprecated functions
- Documentation
- Added slapo-valsort(5) man page (ITS#3994)
- Added slap tool -F option documentation (ITS#4026)
- Build Environment
- Fixed misc POSIX conformance issues (ITS#2667)
- Fixed --without-threads build issue (ITS#4006)
- Fixed test script exit checks (ITS#4045)
- Added test suite parameterized directory support
- Fixed test suite tool error handling
- Updated contrib/ldapc++ build environment
-
-OpenLDAP 2.3.7 Release (2005/08/31)
- Updated slapd ManageDIT support
- Updated slapd ACI syntax checking (ITS#3877)
- Fixed slapd STATS2 referral logging
- Refixed slapd cn=config default search base bug (ITS#3900)
- Fixed slapd cn=config TLSVerifyClient bug (ITS#3962)
- Fixed slapd winsock assert (ITS#3983)
- Fixed slapd-bdb/hdb paged results deadlock (ITS#3940)
- Fixed slapd-bdb/hdb/ldbm searchBase disclose (ITS#3964)
- Fixed slapd-bdb/hdb bi_dbenv check (ITS#3992)
- Fixed slapd-meta generic attribute normalize/pretty (ITS#3956)
- Fixed slapd-ldap/meta 'undefined' attribute mutex protection (ITS#3958)
- Added slapd-ldap/meta 'proxied' attribute support (ITS#3959)
- Fixed slapd-meta no candidate target selected bug (ITS#3990)
- Fixed slapd-meta matchedDN handling (ITS#3944)
- Fixed slapd-monitor hiding issue (ITS#3986)
- Fixed slapo-ppolicy lockout status at Bind (ITS#3946)
- Moved slapo-glue into slapd core
- Fixed slaptest cn=config segfault (ITS#3961)
- Fixed slaptools logging issue (ITS#3937)
- Fixed slaptools fails after db clean (ITS#3970)
- Fixed slaptools reject unsupported -w (ITS#3939)
- Fixed libldap global_opt failure
- Fixed libldap schema handling
- Fixed libldap secprops parsing (ITS#3955)
- Fixed libldap_r tpool (ITS#3925)
- Updated liblutil password scheme check
- Updated libldap schema to allow OID macros in syntaxes
- Removed lint
- Documentation
- Updated misc. man pages
- Build Environment
- Updated build tools (ITS#3928)
- Fixed tests diff -u usage (ITS#3969)
- Fixed slapo-rwm dependency checking (ITS#3965)
- Fixed tests --disable-monitor support
- Fixed tests veryclean-local testdata cleanup
- Add subtree rename test (hdb only)
-
-OpenLDAP 2.3.6 Release (2005/08/19)
- Fixed slapd dnRelativeMatch return (ITS#3931)
- Fixed slapd send_search_entry issue (ITS#3951)
- Fixed slapd-bdb/hdb release entry in paged response
- Fixed slapd-meta resources release issue (ITS#3943)
- Fixed slapd-ldap/meta matched return (ITS#3942,ITS#3944)
- Fixed slapo-ppolicy reset lockouts issue (ITS#3946)
- Fixed nis.schema posixGroup object class kind (ITS#3941)
- Revert librewrite regex mutex change (ITS#3932)
- Updated slapd manage capability
- Updated slapo-syncprov CSN filter checks
- Updated libldap url list parsing
- Added slapd SASL rootpw support (ITS#3845)
- Added slapd Stats logging for additional cases
- Added slapd ACI syntax validater (ITS#3877)
- Added slapd posixgroup ACL module to contrib
- Added slapi SLAPI_X_ADD_STRUCTURAL_CLASS extension
- Added slapd-ldap subtree renaming proxing
- Added slapd-meta overlapping targets enhancement (ITS#3711)
- Removed lint
- Documentation
- Added slapcat(8) -a usage example (ITS#3930)
- Updated slapo-unique(5) for clarity (ITS#3936)
- Updated slapo-syncprov(5) sessionlog description (ITS#3935)
- Updated doc/drafts
- Build Environment
- Updated test prog bind retry code
- Fixed test015-xsearch regression (ITS#3506)
- Added test040-subtree-rename
-
-OpenLDAP 2.3.5 Release (2005/08/14)
- Fixed slapd integerBitOr/AndMatch logic (ITS#3782)
- Fixed slapd substrings filter length checks (ITS#3790)
- Fixed slapd thread pool initialization (ITS#3793)
- Fixed slapd cancel exop (ITS#3549)
- Fixed slapd syncrepl cookie problem (ITS#3917)
- Fixed slapd inequality filter index bug (ITS#3920)
- Fixed slapd syncrepl ctxcsn leak (ITS#3922)
- Fixed slapd syncrepl scope issue (ITS#3831)
- Fixed slapd syncrepl missing array subscript (ITS#3834)
- Fixed slapd slapd_remove null deref (ITS#3842)
- Fixed slapd ldapi credential normalization bug (ITS#3876)
- Fixed slapd userPassword cleartext bug (ITS#3846)
- Fixed slapd cn=config default search base bug (ITS#3900)
- Fixed slapd cn=config olcDbConfig bug (ITS#3815)
- Fixed slapd cn=config olcReadOnly bug (ITS#3820)
- Fixed slapd cn=config hdb+bdb bug (ITS#3821)
- Fixed slapd ACL attrs/val EQUALITY issue (ITS#3830)
- Fixed slapd authx-regexp diagnostics (ITS#3819)
- Fixed slapd index_substr_any_step keyword (ITS#3818)
- Fixed slapd -f directory issue (ITS#3865)
- Fixed slapd attributeOptions config parsing (ITS#3829)
- Fixed slapd whitespace config parsing bug (ITS#3901)
- Fixed slapd rootdn space issue (ITS#3806)
- Fixed slapd passwd change w/ {CRYPT} bug (ITS#3805)
- Fixed slapd backend_init_controls assert (ITS#3853)
- Fixed slapd loglevel -1 bug (ITS#3858)
- Fixed slapi bind bound DN issue (ITS#2971)
- Fixed slapi issues (ITS#3884,3885,3886)
- Fixed slapi authorization name issue (ITS#3892)
- Fixed slapi slapi_int_connection_init operation problem (ITS#3868)
- Fixed slapi slapi_entry_has_children bug (ITS#3879)
- Fixed slapd-bdb manual recovery startup (ITS#3607,3824)
- Fixed slapd-bdb manual recovery startup (ITS#3833)
- Fixed slapd-bdb/hdb checkpoint before suffix bug (ITS#3784)
- Fixed slapd-hdb modrdn base bug (ITS#3857)
- Fixed slapd-ldap access to freed connection (ITS#3913)
- Fixed slapd-ldap/meta filter bug (ITS#3785)
- Fixed slapd-ldap/meta connection pooling (ITS#3813)
- Fixed slapd-ldap/meta memory leak (ITS#3862)
- Added slapd-sql enhancements (ITS#3432)
- Fixed slapd-sql attribute with no values issue (ITS#3861)
- Fixed slapd-sql truncating keyval column problem (ITS#3888)
- Fixed slapd-sql return code ignored problem (ITS#3891)
- Fixed slapo-glue alock bug (ITS#3817,3841)
- Fixed slapo-dyngroup hidden subschemaSubentry bug (ITS#3844)
- Fixed slapo-ppolicy hashed length problem (ITS#3783)
- Fixed slapo-ppolicy quality check (ITS#3777)
- Fixed slapo-ppolicy lockout duration (ITS#3779)
- Fixed slapo-rwm leak (ITS#3914)
- Fixed slapo-glue/rwm conflict (ITS#3788)
- Fixed slapadd segfault (ITS#3926)
- Fixed slapcat cn=config segfault (ITS#3796)
- Fixed slaptest -F crash (ITS#3912)
- Fixed slapd authzTo/From syntax issue (ITS#3921)
- Fixed libldap abandon concurrency issue (ITS#3800)
- Fixed libldap start_tls referral chasing (ITS#3791)
- Fixed libldap referral chasing issues (ITS#2894,3578)
- Fixed librewrite concurrency issue (ITS#3932)
- Use IANA-assigned OIDs for recently approved IETF LDAP extensions
- Removed lint (ITS#3857)
- Build Environment
- Upgraded shtool (ITS#3752)
- Upgraded config.guess/config.sub
- Fixed FreeBSD thread stacksize problem (ITS#3456)
- Fixed cygwin shared libraries build problem (ITS#3712)
- Fixed acl_get/acl_mask v AIX symbol clash (ITS#3787)
- Fixed test020 logging problem (ITS#3811)
- Fixed duplicate symbol problem (ITS#3843)
- Fixed liblunicode 64bit builds (ITS#3869)
- Fixed passwd/kerberos module builds (ITS#3896)
- Fixed test037 manageDIT discovery issue (ITS#3898)
- Fixed installed man page symlinks (ITS#3904)
- Fixed <sasl.h> inclusion (ITS#3905)
- Fixed smbk5pwd Heimdal compat issue (ITS#3910)
- Fixed slapd make install issue (ITS#3929)
- Fixed DESTDIR reporting (ITS#3916)
- Documentation
- Fixed Admin Guide authz v. saslauthz problem (ITS#3875)
- Fixed Admin Guide --disable-bdb issue (ITS#3837)
- Fixed slapd-meta(5) lastmod issue (ITS#3789)
- Updated slapd.conf(5) (ITS#3866)
- Updated slapd(8) OPTIONS section (ITS#3816)
- Updated slapd-monitor(5) (ITS#3822,3836)
- Updated slapd-bdb(5) (ITS#3823)
-
-OpenLDAP 2.3.4 Release (2005/06/10)
+OpenLDAP 2.4.6 Release (10/31)
Initial release for "general use".
-
Modified: openldap/vendor/openldap-release/COPYRIGHT
===================================================================
--- openldap/vendor/openldap-release/COPYRIGHT 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/COPYRIGHT 2007-12-15 09:23:29 UTC (rev 881)
@@ -36,9 +36,11 @@
---
-Portions Copyright 1999-2005 Howard Y.H. Chu.
-Portions Copyright 1999-2005 Symas Corporation.
+Portions Copyright 1999-2007 Howard Y.H. Chu.
+Portions Copyright 1999-2007 Symas Corporation.
Portions Copyright 1998-2003 Hallvard B. Furuseth.
+Portions Copyright 2007 Gavin Henry
+Portions Copyright 2007 Suretec Systems
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: openldap/vendor/openldap-release/Makefile.in
===================================================================
--- openldap/vendor/openldap-release/Makefile.in 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/Makefile.in 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
# Master Makefile for OpenLDAP
-# $OpenLDAP: pkg/ldap/Makefile.in,v 1.27.2.4 2007/01/02 21:43:21 kurt Exp $
+# $OpenLDAP: pkg/ldap/Makefile.in,v 1.30.2.2 2007/08/31 23:13:44 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/README
===================================================================
--- openldap/vendor/openldap-release/README 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/README 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,10 +1,10 @@
-OpenLDAP 2.3 README
+OpenLDAP 2.4 README
For a description of what this distribution contains, see the
ANNOUNCEMENT file in this directory. For a description of
changes from previous releases, see the CHANGES file in this
directory.
- This is 2.3 release, it includes significant changes from prior
+ This is 2.4 release, it includes significant changes from prior
releases.
REQUIRED SOFTWARE
@@ -14,19 +14,15 @@
Base system (libraries and tools):
Standard C compiler (required)
- Cyrus SASL 2.1.18+ (recommended)
+ Cyrus SASL 2.1.21+ (recommended)
OpenSSL 0.9.7+ (recommended)
POSIX REGEX software (required)
SLAPD:
BDB and HDB backends require Oracle Berkeley DB 4.2, 4.4,
- or 4.5. It is highly recommended to apply the patches
+ 4.5, or 4.6. It is highly recommended to apply the patches
from Oracle for a given release.
- SLURPD:
- LTHREAD compatible thread package
- [POSIX threads, Mach Cthreads, select others]
-
CLIENTS/CONTRIB ware:
Depends on package. See per package README.
@@ -78,7 +74,7 @@
<http://www.openldap.org/its/> to be considered.
---
-$OpenLDAP: pkg/ldap/README,v 1.38.2.9 2007/10/11 18:52:18 quanah Exp $
+$OpenLDAP: pkg/ldap/README,v 1.40.2.6 2007/10/11 18:55:56 quanah Exp $
This work is part of OpenLDAP Software <http://www.openldap.org/>.
Modified: openldap/vendor/openldap-release/build/config.guess
===================================================================
--- openldap/vendor/openldap-release/build/config.guess 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/config.guess 2007-12-15 09:23:29 UTC (rev 881)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2003-07-02-OpenLDAP'
-# $OpenLDAP: pkg/ldap/build/config.guess,v 1.14.2.4 2007/01/02 21:43:40 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/config.guess,v 1.19.2.2 2007/08/31 23:13:50 quanah Exp $
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
# configuration script generated by Autoconf, and is distributable
# under the same distributions terms as OpenLDAP itself.
-## Copyright 1998-2007 The OpenLDAP Foundation.
+## Portions Copyright 1998-2007 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
Modified: openldap/vendor/openldap-release/build/config.sub
===================================================================
--- openldap/vendor/openldap-release/build/config.sub 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/config.sub 2007-12-15 09:23:29 UTC (rev 881)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
timestamp='2003-07-04-OpenLDAP'
-# $OpenLDAP: pkg/ldap/build/config.sub,v 1.14.2.4 2007/01/02 21:43:40 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/config.sub,v 1.19.2.2 2007/08/31 23:13:50 quanah Exp $
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -34,7 +34,7 @@
# configuration script generated by Autoconf, and is distributable
# under the same distributions terms as OpenLDAP itself.
-## Copyright 1998-2007 The OpenLDAP Foundation.
+## Portions Copyright 1998-2007 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
Modified: openldap/vendor/openldap-release/build/crupdate
===================================================================
--- openldap/vendor/openldap-release/build/crupdate 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/crupdate 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $OpenLDAP: pkg/ldap/build/crupdate,v 1.5.2.3 2007/01/02 21:43:40 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/crupdate,v 1.7.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Added: openldap/vendor/openldap-release/build/db.4.2.52.patch
===================================================================
--- openldap/vendor/openldap-release/build/db.4.2.52.patch (rev 0)
+++ openldap/vendor/openldap-release/build/db.4.2.52.patch 2007-12-15 09:23:29 UTC (rev 881)
@@ -0,0 +1,55 @@
+As posted to http://www.openldap.org/lists/openldap-devel/200610/msg00027.html
+
+This is Sleepycat bug #14908. The provided patch is for 4.2.52. The
+same bug is present in all versions up to 4.5.20 where it is fixed.
+
+-------- Original Message --------
+Subject: region size bug Re: [BDB-Alpha] Berkeley DB 4.5.8 ALPHA
+Date: Mon, 10 Jul 2006 13:37:33 -0700
+From: Howard Chu <hyc at symas.com>
+To: support at sleepycat.com
+CC: support at symas.com
+References: <45A742B5-7DD5-4512-A204-A10FE8FC5DFC at oracle.com>
+
+
+I just ran into this in 4.2.52 but the same calculation occurs in 4.4
+and 4.5.8 alpha:
+
+This computation gives the wrong results when the number of cache
+regions is greater than the number of gigabytes (which we encounter on
+Linux using shared memory regions, which are constrained to much smaller
+than a gigabyte each).
+
+
+in mp/mp_region.c:
+
+
+ roff_t reg_size;
+
+
+ /* Figure out how big each cache region is. */
+ reg_size = (roff_t)(dbenv->mp_gbytes / dbenv->mp_ncache) * GIGABYTE;
+ reg_size += ((roff_t)(dbenv->mp_gbytes %
+ dbenv->mp_ncache) * GIGABYTE) / dbenv->mp_ncache;
+ reg_size += dbenv->mp_bytes / dbenv->mp_ncache;
+ *reg_sizep = reg_size;
+
+
+The first reg_size calculation always goes to zero when mp_ncache >
+mp_gbytes.
+This should have been, instead:
+ reg_size = GIGABYTE / dbenv->mp_ncache * dbenv->mp_gbytes;
+
+--- mp/mp_region.c.O 2003-06-30 10:20:19.000000000 -0700
++++ mp/mp_region.c 2006-10-27 23:25:05.000000000 -0700
+@@ -43,9 +43,7 @@
+ int htab_buckets, ret;
+
+ /* Figure out how big each cache region is. */
+- reg_size = (dbenv->mp_gbytes / dbenv->mp_ncache) * GIGABYTE;
+- reg_size += ((dbenv->mp_gbytes %
+- dbenv->mp_ncache) * GIGABYTE) / dbenv->mp_ncache;
++ reg_size = GIGABYTE / dbenv->mp_ncache * dbenv->mp_gbytes;
+ reg_size += dbenv->mp_bytes / dbenv->mp_ncache;
+
+ /*
Modified: openldap/vendor/openldap-release/build/dir.mk
===================================================================
--- openldap/vendor/openldap-release/build/dir.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/dir.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/dir.mk,v 1.14.2.4 2007/01/02 21:43:40 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/dir.mk,v 1.17.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/info.mk
===================================================================
--- openldap/vendor/openldap-release/build/info.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/info.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/info.mk,v 1.9.2.4 2007/01/02 21:43:40 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/info.mk,v 1.12.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/lib-shared.mk
===================================================================
--- openldap/vendor/openldap-release/build/lib-shared.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/lib-shared.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/lib-shared.mk,v 1.19.2.4 2007/01/02 21:43:40 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/lib-shared.mk,v 1.22.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/lib-static.mk
===================================================================
--- openldap/vendor/openldap-release/build/lib-static.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/lib-static.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/lib-static.mk,v 1.10.2.4 2007/01/02 21:43:40 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/lib-static.mk,v 1.13.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/lib.mk
===================================================================
--- openldap/vendor/openldap-release/build/lib.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/lib.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/lib.mk,v 1.20.2.4 2007/01/02 21:43:40 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/lib.mk,v 1.23.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/ltmain.sh
===================================================================
--- openldap/vendor/openldap-release/build/ltmain.sh 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/ltmain.sh 2007-12-15 09:23:29 UTC (rev 881)
@@ -26,9 +26,9 @@
# This file is distributed with OpenLDAP Software, which contains a
# configuration script generated by Autoconf, and is distributable
-# under the same distributions terms as OpenLDAP inself.
+# under the same distributions terms as OpenLDAP itself.
-## Copyright 1998-2007 The OpenLDAP Foundation.
+## Portions Copyright 1998-2007 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
Modified: openldap/vendor/openldap-release/build/man.mk
===================================================================
--- openldap/vendor/openldap-release/build/man.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/man.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/man.mk,v 1.27.2.8 2007/01/02 23:42:47 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/man.mk,v 1.32.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
@@ -32,7 +32,8 @@
-e 's%LIBDIR%$(libdir)%' \
-e 's%LIBEXECDIR%$(libexecdir)%' \
-e 's%RELEASEDATE%$(RELEASEDATE)%' \
- $(srcdir)/$$page > $$page.$(TMP_SUFFIX); \
+ $(srcdir)/$$page \
+ | (cd $(srcdir); $(SOELIM) -) > $$page.$(TMP_SUFFIX); \
done
install-common:
Modified: openldap/vendor/openldap-release/build/mkdep
===================================================================
--- openldap/vendor/openldap-release/build/mkdep 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/mkdep 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
#! /bin/sh -
-# $OpenLDAP: pkg/ldap/build/mkdep,v 1.29.2.4 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/mkdep,v 1.32.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/mkrelease
===================================================================
--- openldap/vendor/openldap-release/build/mkrelease 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/mkrelease 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $OpenLDAP: pkg/ldap/build/mkrelease,v 1.18.2.5 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/mkrelease,v 1.23.2.3 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
@@ -58,6 +58,11 @@
echo "No guide"
fi
+if test -e $RELNAME/libraries/liblunicode/ucdata/uctable.h ; then
+ echo "touching uctable.h..."
+ touch $RELNAME/libraries/liblunicode/ucdata/uctable.h
+fi
+
if test ! -e $RELNAME/build/version.sh ; then
echo "No build version"
OL_STRING="something"
Modified: openldap/vendor/openldap-release/build/mkvers.bat
===================================================================
--- openldap/vendor/openldap-release/build/mkvers.bat 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/mkvers.bat 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-:: $OpenLDAP: pkg/ldap/build/mkvers.bat,v 1.5.2.3 2007/01/02 21:43:41 kurt Exp $
+:: $OpenLDAP: pkg/ldap/build/mkvers.bat,v 1.7.2.2 2007/08/31 23:13:50 quanah Exp $
:: This work is part of OpenLDAP Software <http://www.openldap.org/>.
::
:: Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/mkversion
===================================================================
--- openldap/vendor/openldap-release/build/mkversion 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/mkversion 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,6 +1,6 @@
#! /bin/sh
# Create a version.c file
-# $OpenLDAP: pkg/ldap/build/mkversion,v 1.12.2.3 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/mkversion,v 1.14.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/mod.mk
===================================================================
--- openldap/vendor/openldap-release/build/mod.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/mod.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/mod.mk,v 1.22.2.4 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/mod.mk,v 1.25.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/openldap.m4
===================================================================
--- openldap/vendor/openldap-release/build/openldap.m4 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/openldap.m4 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
dnl OpenLDAP Autoconf Macros
-dnl $OpenLDAP: pkg/ldap/build/openldap.m4,v 1.140.2.14 2007/10/05 15:33:02 hyc Exp $
+dnl $OpenLDAP: pkg/ldap/build/openldap.m4,v 1.157.2.4 2007/09/01 00:38:35 hyc Exp $
dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
dnl
dnl Copyright 1998-2007 The OpenLDAP Foundation.
@@ -91,6 +91,7 @@
done
rm -f conftest*
])
+ test "$ol_cv_mkdep" = no && OL_MKDEP=":"
else
cc_cv_mkdep=yes
OL_MKDEP_FLAGS="${MKDEP_FLAGS}"
@@ -486,31 +487,31 @@
])
if test $ol_cv_bdb_major = 4 ; then
- if test $ol_cv_bdb_minor = 5 ; then
+ if test $ol_cv_bdb_minor = 6 ; then
+ OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_6,[-ldb-4.6])
+ OL_BERKELEY_DB_TRY(ol_cv_db_db46,[-ldb46])
+ OL_BERKELEY_DB_TRY(ol_cv_db_db_46,[-ldb-46])
+ OL_BERKELEY_DB_TRY(ol_cv_db_db_4_6,[-ldb-4-6])
+ elif test $ol_cv_bdb_minor = 5 ; then
+ OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_5,[-ldb-4.5])
OL_BERKELEY_DB_TRY(ol_cv_db_db45,[-ldb45])
OL_BERKELEY_DB_TRY(ol_cv_db_db_45,[-ldb-45])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_5,[-ldb-4.5])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_5,[-ldb-4-5])
elif test $ol_cv_bdb_minor = 4 ; then
+ OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_4,[-ldb-4.4])
OL_BERKELEY_DB_TRY(ol_cv_db_db44,[-ldb44])
OL_BERKELEY_DB_TRY(ol_cv_db_db_44,[-ldb-44])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_4,[-ldb-4.4])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_4,[-ldb-4-4])
elif test $ol_cv_bdb_minor = 3 ; then
+ OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_3,[-ldb-4.3])
OL_BERKELEY_DB_TRY(ol_cv_db_db43,[-ldb43])
OL_BERKELEY_DB_TRY(ol_cv_db_db_43,[-ldb-43])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_3,[-ldb-4.3])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_3,[-ldb-4-3])
elif test $ol_cv_bdb_minor = 2 ; then
+ OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_2,[-ldb-4.2])
OL_BERKELEY_DB_TRY(ol_cv_db_db42,[-ldb42])
OL_BERKELEY_DB_TRY(ol_cv_db_db_42,[-ldb-42])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_2,[-ldb-4.2])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_2,[-ldb-4-2])
- elif test $ol_cv_bdb_minor = 1 ; then
- OL_BERKELEY_DB_TRY(ol_cv_db_db41,[-ldb41])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_41,[-ldb-41])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_1,[-ldb-4.1])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_1,[-ldb-4-1])
fi
OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4])
OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
@@ -696,8 +697,8 @@
# define DB_VERSION_MINOR 0
#endif
-/* require 4.2-4.5 */
-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR < 6)
+/* require 4.2 or later, but exclude 4.3 */
+#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR !=3)
__db_version_compat
#endif
], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
@@ -736,152 +737,6 @@
])
dnl
dnl ====================================================================
-dnl Check if GDBM library exists
-dnl Check for gdbm_open in standard libraries or -lgdbm
-dnl
-dnl defines ol_cv_lib_gdbm to 'yes' or '-lgdbm' or 'no'
-dnl 'yes' implies gdbm_open is in $LIBS
-dnl
-dnl uses:
-dnl AC_CHECK_FUNC(gdbm_open)
-dnl AC_CHECK_LIB(gdbm,gdbm_open)
-dnl
-AC_DEFUN([OL_LIB_GDBM],
-[AC_CACHE_CHECK(for GDBM library, [ol_cv_lib_gdbm],
-[ ol_LIBS="$LIBS"
- AC_CHECK_FUNC(gdbm_open,[ol_cv_lib_gdbm=yes], [
- AC_CHECK_LIB(gdbm,gdbm_open,[ol_cv_lib_gdbm=-lgdbm],[ol_cv_lib_gdbm=no])
- ])
- LIBS="$ol_LIBS"
-])
-])dnl
-dnl
-dnl --------------------------------------------------------------------
-dnl Check if GDBM exists
-dnl
-dnl defines ol_cv_gdbm to 'yes' or 'no'
-dnl
-dnl uses:
-dnl OL_LIB_GDBM
-dnl AC_CHECK_HEADERS(gdbm.h)
-dnl
-AC_DEFUN([OL_GDBM],
-[AC_REQUIRE([OL_LIB_GDBM])
- AC_CHECK_HEADERS(gdbm.h)
- AC_CACHE_CHECK(for db, [ol_cv_gdbm], [
- if test $ol_cv_lib_gdbm = no || test $ac_cv_header_gdbm_h = no ; then
- ol_cv_gdbm=no
- else
- ol_cv_gdbm=yes
- fi
-])
- if test $ol_cv_gdbm = yes ; then
- AC_DEFINE(HAVE_GDBM,1, [define if GNU DBM is available])
- fi
-])dnl
-dnl
-dnl ====================================================================
-dnl Check if MDBM library exists
-dnl Check for mdbm_open in standard libraries or -lmdbm
-dnl
-dnl defines ol_cv_lib_mdbm to 'yes' or '-lmdbm' or 'no'
-dnl 'yes' implies mdbm_open is in $LIBS
-dnl
-dnl uses:
-dnl AC_CHECK_FUNC(mdbm_set_chain)
-dnl AC_CHECK_LIB(mdbm,mdbm_set_chain)
-dnl
-AC_DEFUN([OL_LIB_MDBM],
-[AC_CACHE_CHECK(for MDBM library, [ol_cv_lib_mdbm],
-[ ol_LIBS="$LIBS"
- AC_CHECK_FUNC(mdbm_set_chain,[ol_cv_lib_mdbm=yes], [
- AC_CHECK_LIB(mdbm,mdbm_set_chain,[ol_cv_lib_mdbm=-lmdbm],[ol_cv_lib_mdbm=no])
- ])
- LIBS="$ol_LIBS"
-])
-])dnl
-dnl
-dnl --------------------------------------------------------------------
-dnl Check if MDBM exists
-dnl
-dnl defines ol_cv_mdbm to 'yes' or 'no'
-dnl
-dnl uses:
-dnl OL_LIB_MDBM
-dnl AC_CHECK_HEADERS(mdbm.h)
-dnl
-AC_DEFUN([OL_MDBM],
-[AC_REQUIRE([OL_LIB_MDBM])
- AC_CHECK_HEADERS(mdbm.h)
- AC_CACHE_CHECK(for db, [ol_cv_mdbm], [
- if test $ol_cv_lib_mdbm = no || test $ac_cv_header_mdbm_h = no ; then
- ol_cv_mdbm=no
- else
- ol_cv_mdbm=yes
- fi
-])
- if test $ol_cv_mdbm = yes ; then
- AC_DEFINE(HAVE_MDBM,1, [define if MDBM is available])
- fi
-])dnl
-dnl
-dnl ====================================================================
-dnl Check if NDBM library exists
-dnl Check for dbm_open in standard libraries or -lndbm or -ldbm
-dnl
-dnl defines ol_cv_lib_ndbm to 'yes' or '-lndbm' or -ldbm or 'no'
-dnl 'yes' implies ndbm_open is in $LIBS
-dnl
-dnl uses:
-dnl AC_CHECK_FUNC(dbm_open)
-dnl AC_CHECK_LIB(ndbm,dbm_open)
-dnl AC_CHECK_LIB(dbm,dbm_open)
-dnl
-dnl restrictions:
-dnl should also check SVR4 case: dbm_open() in -lucb but that
-dnl would requiring dealing with -L/usr/ucblib
-dnl
-AC_DEFUN([OL_LIB_NDBM],
-[AC_CACHE_CHECK(for NDBM library, [ol_cv_lib_ndbm],
-[ ol_LIBS="$LIBS"
- AC_CHECK_FUNC(dbm_open,[ol_cv_lib_ndbm=yes], [
- AC_CHECK_LIB(ndbm,dbm_open,[ol_cv_lib_ndbm=-lndbm], [
- AC_CHECK_LIB(dbm,dbm_open,[ol_cv_lib_ndbm=-ldbm],
- [ol_cv_lib_ndbm=no])dnl
- ])
- ])
- LIBS="$ol_LIBS"
-])
-])dnl
-dnl
-dnl --------------------------------------------------------------------
-dnl Check if NDBM exists
-dnl
-dnl defines ol_cv_ndbm to 'yes' or 'no'
-dnl
-dnl uses:
-dnl OL_LIB_NDBM
-dnl AC_CHECK_HEADERS(ndbm.h)
-dnl
-dnl restrictions:
-dnl Doesn't handle SVR4 case (see above)
-dnl
-AC_DEFUN([OL_NDBM],
-[AC_REQUIRE([OL_LIB_NDBM])
- AC_CHECK_HEADERS(ndbm.h)
- AC_CACHE_CHECK(for db, [ol_cv_ndbm], [
- if test $ol_cv_lib_ndbm = no || test $ac_cv_header_ndbm_h = no ; then
- ol_cv_ndbm=no
- else
- ol_cv_ndbm=yes
- fi
-])
- if test $ol_cv_ndbm = yes ; then
- AC_DEFINE(HAVE_NDBM,1, [define if NDBM is available])
- fi
-])dnl
-dnl
-dnl ====================================================================
dnl Check POSIX Thread version
dnl
dnl defines ol_cv_pthread_version to 4, 5, 6, 7, 8, 10, depending on the
@@ -1172,7 +1027,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <errno.h>
-#ifdef WINNT
+#ifdef _WIN32
#include <stdlib.h>
#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes
ol_cv_have_sys_errlist=yes],[ol_cv_dcl_sys_errlist=no])])
@@ -1444,17 +1299,16 @@
dnl ====================================================================
dnl check for SSL compatibility
AC_DEFUN([OL_SSL_COMPAT],
-[AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)], [ol_cv_ssl_crl_compat],[
- AC_EGREP_CPP(__ssl_compat,[
+[AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)],
+ [ol_cv_ssl_crl_compat],[
+ AC_EGREP_CPP(__ssl_compat,[
#ifdef HAVE_OPENSSL_SSL_H
#include <openssl/ssl.h>
-#else
-#include <ssl.h>
#endif
/* Require 0.9.7d+ */
#if OPENSSL_VERSION_NUMBER >= 0x0090704fL
char *__ssl_compat = "0.9.7d";
#endif
- ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
+ ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
])
Modified: openldap/vendor/openldap-release/build/rules.mk
===================================================================
--- openldap/vendor/openldap-release/build/rules.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/rules.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/rules.mk,v 1.12.2.4 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/rules.mk,v 1.15.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/srv.mk
===================================================================
--- openldap/vendor/openldap-release/build/srv.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/srv.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/srv.mk,v 1.15.2.4 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/srv.mk,v 1.18.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/top.mk
===================================================================
--- openldap/vendor/openldap-release/build/top.mk 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/top.mk 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,4 +1,4 @@
-# $OpenLDAP: pkg/ldap/build/top.mk,v 1.93.2.11 2007/01/02 23:42:47 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/top.mk,v 1.103.2.4 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
@@ -149,14 +149,17 @@
MANCOMPRESS=$(CAT)
MANCOMPRESSSUFFIX=
+SOELIM=soelim
+
INCLUDEDIR= $(top_srcdir)/include
LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
LDAP_LIBDIR= $(top_builddir)/libraries
LUTIL_LIBS = @LUTIL_LIBS@
-LDBM_LIBS = @LDBM_LIBS@
LTHREAD_LIBS = @LTHREAD_LIBS@
+BDB_LIBS = @BDB_LIBS@
+
LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
LDAP_LIBLDAP_LA = $(LDAP_LIBDIR)/libldap/libldap.la
LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la
@@ -167,10 +170,8 @@
LDAP_L = $(LDAP_LIBLUTIL_A) \
$(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
-SLURPD_L = $(LDAP_LIBLUTIL_A) \
- $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
- $(SLURPD_L)
+ $(LDAP_LIBLUTIL_A) $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
WRAP_LIBS = @WRAP_LIBS@
# AutoConfig generated
@@ -187,6 +188,7 @@
TLS_LIBS = @TLS_LIBS@
AUTH_LIBS = @AUTH_LIBS@
SECURITY_LIBS = $(SASL_LIBS) $(KRB_LIBS) $(TLS_LIBS) $(AUTH_LIBS)
+ICU_LIBS = @ICU_LIBS@
MODULES_CPPFLAGS = @SLAPD_MODULES_CPPFLAGS@
MODULES_LDFLAGS = @SLAPD_MODULES_LDFLAGS@
@@ -197,8 +199,7 @@
SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
-SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
-SLURPD_LIBS = @SLURPD_LIBS@
+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
# Our Defaults
CC = $(AC_CC)
Modified: openldap/vendor/openldap-release/build/version.sh
===================================================================
--- openldap/vendor/openldap-release/build/version.sh 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/version.sh 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $OpenLDAP: pkg/ldap/build/version.sh,v 1.14.2.3 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/version.sh,v 1.16.2.2 2007/08/31 23:13:50 quanah Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
Modified: openldap/vendor/openldap-release/build/version.var
===================================================================
--- openldap/vendor/openldap-release/build/version.var 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/build/version.var 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $OpenLDAP: pkg/ldap/build/version.var,v 1.7.2.94 2007/08/20 17:43:48 kurt Exp $
+# $OpenLDAP: pkg/ldap/build/version.var,v 1.9.2.16 2007/10/31 14:03:16 kurt Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2007 The OpenLDAP Foundation.
@@ -14,10 +14,10 @@
## <http://www.OpenLDAP.org/license.html>.
ol_package=OpenLDAP
ol_major=2
-ol_minor=3
-ol_patch=38
-ol_api_inc=20338
+ol_minor=4
+ol_patch=6
+ol_api_inc=20406
ol_api_current=2
-ol_api_revision=26
-ol_api_age=2
-ol_release_date="2007/08/20"
+ol_api_revision=2
+ol_api_age=0
+ol_release_date="2007/10/31"
Modified: openldap/vendor/openldap-release/clients/Makefile.in
===================================================================
--- openldap/vendor/openldap-release/clients/Makefile.in 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/Makefile.in 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,7 @@
# Clients Makefile.in for OpenLDAP
-# $OpenLDAP: pkg/ldap/clients/Makefile.in,v 1.14.2.4 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/clients/Makefile.in,v 1.17.2.2 2007/08/31 23:13:50 quanah Exp $
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
## Copyright 1998-2007 The OpenLDAP Foundation.
## All rights reserved.
##
Modified: openldap/vendor/openldap-release/clients/tools/Makefile.in
===================================================================
--- openldap/vendor/openldap-release/clients/tools/Makefile.in 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/Makefile.in 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,7 @@
# Makefile for LDAP tools
-# $OpenLDAP: pkg/ldap/clients/tools/Makefile.in,v 1.39.2.5 2007/01/02 21:43:41 kurt Exp $
+# $OpenLDAP: pkg/ldap/clients/tools/Makefile.in,v 1.45.2.2 2007/08/31 23:13:50 quanah Exp $
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
## Copyright 1998-2007 The OpenLDAP Foundation.
## All rights reserved.
##
@@ -12,9 +14,11 @@
## <http://www.OpenLDAP.org/license.html>.
SRCS = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
- ldappasswd.c ldapwhoami.c ldapcompare.c common.c
+ ldappasswd.c ldapwhoami.c ldapcompare.c \
+ ldapexop.c common.c
OBJS = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o \
- ldappasswd.o ldapwhoami.o ldapcompare.o common.o
+ ldappasswd.o ldapwhoami.o ldapcompare.o \
+ ldapexop.o common.o
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
@@ -25,10 +29,10 @@
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
XSRCS = ldsversion.c ldmversion.c lddversion.c ldrversion.c \
- ldpversion.c ldwversion.c ldcversion.c
+ ldpversion.c ldwversion.c ldcversion.c ldeversion.c
PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn \
- ldappasswd ldapwhoami ldapcompare
+ ldappasswd ldapwhoami ldapcompare ldapexop
ldapsearch: ldsversion.o
@@ -52,6 +56,9 @@
ldapcompare: ldcversion.o
$(LTLINK) -o $@ ldapcompare.o common.o ldcversion.o $(LIBS)
+ldapexop: ldeversion.o
+ $(LTLINK) -o $@ ldapexop.o common.o ldeversion.o $(LIBS)
+
ldsversion.c: Makefile
@-$(RM) $@
$(MKVERSION) $(MKVOPTS) ldapsearch > $@
@@ -94,6 +101,12 @@
ldcversion.o: ldapcompare.o common.o $(XLIBS)
+ldeversion.c: Makefile
+ @-$(RM) $@
+ $(MKVERSION) $(MKVOPTS) ldapexop > $@
+
+ldeversion.o: ldapexop.o common.o $(XLIBS)
+
install-local: FORCE
-$(MKDIR) $(DESTDIR)$(bindir)
@( \
Modified: openldap/vendor/openldap-release/clients/tools/common.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/common.c 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/common.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
/* common.c - common routines for the ldap client tools */
-/* $OpenLDAP: pkg/ldap/clients/tools/common.c,v 1.39.2.13 2007/08/13 20:03:51 ando Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/common.c,v 1.78.2.4 2007/08/31 23:13:50 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
@@ -29,8 +29,11 @@
#include <ac/stdlib.h>
#include <ac/signal.h>
#include <ac/string.h>
+#include <ac/ctype.h>
#include <ac/unistd.h>
#include <ac/errno.h>
+#include <ac/time.h>
+#include <ac/socket.h>
#ifdef HAVE_CYRUS_SASL
#ifdef HAVE_SASL_SASL_H
@@ -42,77 +45,170 @@
#include <ldap.h>
+#include "ldif.h"
+#include "lutil.h"
#include "lutil_ldap.h"
#include "ldap_defaults.h"
#include "ldap_pvt.h"
#include "lber_pvt.h"
-#include "lutil.h"
-#include "ldif.h"
#include "common.h"
+/* input-related vars */
-int authmethod = -1;
-char *binddn = NULL;
-int contoper = 0;
-int debug = 0;
-char *infile = NULL;
-char *ldapuri = NULL;
-char *ldaphost = NULL;
-int ldapport = 0;
+/* misc. parameters */
+tool_type_t tool_type;
+int contoper = 0;
+int debug = 0;
+char *infile = NULL;
+int dont = 0;
+int referrals = 0;
+int verbose = 0;
+int ldif = 0;
+char *prog = NULL;
+
+/* connection */
+char *ldapuri = NULL;
+char *ldaphost = NULL;
+int ldapport = 0;
+int use_tls = 0;
+int protocol = -1;
+int version = 0;
+
+/* authc/authz */
+int authmethod = -1;
+char *binddn = NULL;
+int want_bindpw = 0;
+struct berval passwd = { 0, NULL };
+char *pw_file = NULL;
#ifdef HAVE_CYRUS_SASL
-unsigned sasl_flags = LDAP_SASL_AUTOMATIC;
-char *sasl_realm = NULL;
-char *sasl_authc_id = NULL;
-char *sasl_authz_id = NULL;
-char *sasl_mech = NULL;
-char *sasl_secprops = NULL;
+unsigned sasl_flags = LDAP_SASL_AUTOMATIC;
+char *sasl_realm = NULL;
+char *sasl_authc_id = NULL;
+char *sasl_authz_id = NULL;
+char *sasl_mech = NULL;
+char *sasl_secprops = NULL;
#endif
-int use_tls = 0;
-int assertctl;
-char *assertion = NULL;
-char *authzid = NULL;
-int manageDIT = 0;
-int manageDSAit = 0;
-int noop = 0;
-int ppolicy = 0;
-int preread = 0;
-char *preread_attrs = NULL;
-int postread = 0;
-char *postread_attrs = NULL;
-
-int not = 0;
-int want_bindpw = 0;
-struct berval passwd = { 0, NULL };
-char *pw_file = NULL;
-int referrals = 0;
-int protocol = -1;
-int verbose = 0;
-int ldif = 0;
-int version = 0;
-
+/* controls */
+int assertctl;
+char *assertion = NULL;
+char *authzid = NULL;
+/* support deprecated early version of proxyAuthz */
+#define LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ "2.16.840.1.113730.3.4.12"
+#ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
+char *proxydn = NULL;
+#endif /* LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ */
+int manageDIT = 0;
+int manageDSAit = 0;
+int noop = 0;
+int ppolicy = 0;
+int preread = 0;
+static char *preread_attrs = NULL;
+int postread = 0;
+static char *postread_attrs = NULL;
+ber_int_t pr_morePagedResults = 1;
+struct berval pr_cookie = { 0, NULL };
#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
-int chaining = 0;
-static int chainingResolve = -1;
-static int chainingContinuation = -1;
+int chaining = 0;
+static int chainingResolve = -1;
+static int chainingContinuation = -1;
#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+static int sessionTracking = 0;
+struct berval stValue;
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
-static int gotintr;
-static int abcan;
+LDAPControl *unknown_ctrls = NULL;
+int unknown_ctrls_num = 0;
+/* options */
+struct timeval nettimeout = { -1 , 0 };
+
+typedef int (*print_ctrl_fn)( LDAP *ld, LDAPControl *ctrl );
+
+static int print_preread( LDAP *ld, LDAPControl *ctrl );
+static int print_postread( LDAP *ld, LDAPControl *ctrl );
+static int print_paged_results( LDAP *ld, LDAPControl *ctrl );
+#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
+static int print_ppolicy( LDAP *ld, LDAPControl *ctrl );
+#endif
+
+static struct tool_ctrls_t {
+ const char *oid;
+ unsigned mask;
+ print_ctrl_fn func;
+} tool_ctrl_response[] = {
+ { LDAP_CONTROL_PRE_READ, TOOL_ALL, print_preread },
+ { LDAP_CONTROL_POST_READ, TOOL_ALL, print_postread },
+ { LDAP_CONTROL_PAGEDRESULTS, TOOL_SEARCH, print_paged_results },
+#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
+ { LDAP_CONTROL_PASSWORDPOLICYRESPONSE, TOOL_ALL, print_ppolicy },
+#endif
+ { NULL, 0, NULL }
+};
+
+/* "features" */
+static int gotintr;
+static int abcan;
+
+
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+static int
+st_value( LDAP *ld, struct berval *value )
+{
+ char *ip = NULL, *name = NULL;
+ struct berval id = { 0 };
+ char namebuf[ MAXHOSTNAMELEN ];
+
+ if ( gethostname( namebuf, sizeof( namebuf ) ) == 0 ) {
+ struct hostent *h;
+ struct in_addr addr;
+
+ name = namebuf;
+
+ h = gethostbyname( name );
+ if ( h != NULL ) {
+ AC_MEMCPY( &addr, h->h_addr, sizeof( addr ) );
+ ip = inet_ntoa( addr );
+ }
+ }
+
+#ifdef HAVE_CYRUS_SASL
+ if ( sasl_authz_id != NULL ) {
+ ber_str2bv( sasl_authz_id, 0, 0, &id );
+
+ } else if ( sasl_authc_id != NULL ) {
+ ber_str2bv( sasl_authc_id, 0, 0, &id );
+
+ } else
+#endif /* HAVE_CYRUS_SASL */
+ if ( binddn != NULL ) {
+ ber_str2bv( binddn, 0, 0, &id );
+ }
+
+ if ( ldap_create_session_tracking_value( ld,
+ ip, name, LDAP_CONTROL_X_SESSION_TRACKING_USERNAME,
+ &id, &stValue ) )
+ {
+ fprintf( stderr, _("Session tracking control encoding error!\n") );
+ return -1;
+ }
+
+ return 0;
+}
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+
RETSIGTYPE
do_sig( int sig )
{
gotintr = abcan;
}
-/* Set in main() */
-char *prog = NULL;
-
void
-tool_init( void )
+tool_init( tool_type_t type )
{
+ tool_type = type;
ldap_pvt_setlocale(LC_MESSAGES, "");
ldap_pvt_bindtextdomain(OPENLDAP_PACKAGE, LDAP_LOCALEDIR);
ldap_pvt_textdomain(OPENLDAP_PACKAGE);
@@ -134,37 +230,45 @@
{
static const char *const descriptions[] = {
N_(" -c continuous operation mode (do not stop on errors)\n"),
-N_(" -C chase referrals (anonymously)\n"),
N_(" -d level set LDAP debugging level to `level'\n"),
N_(" -D binddn bind DN\n"),
N_(" -e [!]<ext>[=<extparam>] general extensions (! indicates criticality)\n")
-N_(" [!]assert=<filter> (an RFC 2254 Filter)\n")
+N_(" [!]assert=<filter> (a RFC 4515 Filter string)\n")
N_(" [!]authzid=<authzid> (\"dn:<dn>\" or \"u:<user>\")\n")
+#ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
+#if 0
+ /* non-advertized support for proxyDN */
+N_(" [!]proxydn=<dn> (a RFC 4514 DN string)\n")
+#endif
+#endif
#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
N_(" [!]chaining[=<resolveBehavior>[/<continuationBehavior>]]\n")
N_(" one of \"chainingPreferred\", \"chainingRequired\",\n")
N_(" \"referralsPreferred\", \"referralsRequired\"\n")
#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
-#ifdef LDAP_DEVEL
-N_(" [!]manageDIT\n")
-#endif
N_(" [!]manageDSAit\n")
N_(" [!]noop\n")
#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
N_(" ppolicy\n")
#endif
N_(" [!]postread[=<attrs>] (a comma-separated attribute list)\n")
-N_(" [!]preread[=<attrs>] (a comma-separated attribute list)\n"),
-N_(" abandon, cancel (SIGINT sends abandon/cancel; not really controls)\n")
+N_(" [!]preread[=<attrs>] (a comma-separated attribute list)\n")
+N_(" [!]relax\n")
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+N_(" [!]sessiontracking\n")
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+N_(" abandon, cancel, ignore (SIGINT sends abandon/cancel,\n"
+ " or ignores response; if critical, doesn't wait for SIGINT.\n"
+ " not really controls)\n")
N_(" -f file read operations from `file'\n"),
N_(" -h host LDAP server\n"),
N_(" -H URI LDAP Uniform Resource Identifier(s)\n"),
N_(" -I use SASL Interactive mode\n"),
-N_(" -k use Kerberos authentication\n"),
-N_(" -K like -k, but do only step 1 of the Kerberos bind\n"),
N_(" -M enable Manage DSA IT control (-MM to make critical)\n"),
N_(" -n show what would be done but don't actually do it\n"),
N_(" -O props SASL security properties\n"),
+N_(" -o <opt>[=<optparam] general options\n"),
+N_(" nettimeout=<timeout> (in seconds, or \"none\" or \"max\")\n"),
N_(" -p port port on LDAP server\n"),
N_(" -P version protocol version (default: 3)\n"),
N_(" -Q use SASL Quiet mode\n"),
@@ -192,11 +296,11 @@
}
void tool_perror(
- char *func,
+ const char *func,
int err,
- char *extra,
- char *matched,
- char *info,
+ const char *extra,
+ const char *matched,
+ const char *info,
char **refs )
{
fprintf( stderr, "%s: %s (%d)%s\n",
@@ -250,7 +354,7 @@
}
binddn = ber_strdup( optarg );
break;
- case 'e': /* general extensions (controls and such) */
+ case 'e': /* general extensions (controls and such) */
/* should be extended to support comma separated list of
* [!]key[=value] parameters, e.g. -e !foo,bar=567
*/
@@ -287,6 +391,12 @@
fprintf( stderr, "authzid control previously specified\n");
exit( EXIT_FAILURE );
}
+#ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
+ if( proxydn != NULL ) {
+ fprintf( stderr, "authzid control incompatible with proxydn\n");
+ exit( EXIT_FAILURE );
+ }
+#endif /* LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ */
if( cvalue == NULL ) {
fprintf( stderr, "authzid: control value expected\n" );
usage();
@@ -299,15 +409,40 @@
assert( authzid == NULL );
authzid = cvalue;
- } else if ( strcasecmp( control, "manageDIT" ) == 0 ) {
+#ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
+ } else if ( strcasecmp( control, "proxydn" ) == 0 ) {
+ if( proxydn != NULL ) {
+ fprintf( stderr, "proxydn control previously specified\n");
+ exit( EXIT_FAILURE );
+ }
+ if( authzid != NULL ) {
+ fprintf( stderr, "proxydn control incompatible with authzid\n");
+ exit( EXIT_FAILURE );
+ }
+ if( cvalue == NULL ) {
+ fprintf( stderr, "proxydn: control value expected\n" );
+ usage();
+ }
+ if( !crit ) {
+ fprintf( stderr, "proxydn: must be marked critical\n" );
+ usage();
+ }
+
+ assert( proxydn == NULL );
+ proxydn = cvalue;
+#endif /* LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ */
+
+ } else if ( ( strcasecmp( control, "relax" ) == 0 ) ||
+ ( strcasecmp( control, "manageDIT" ) == 0 ) )
+ {
if( manageDIT ) {
fprintf( stderr,
- "manageDIT control previously specified\n");
+ "relax control previously specified\n");
exit( EXIT_FAILURE );
}
if( cvalue != NULL ) {
fprintf( stderr,
- "manageDIT: no control value expected\n" );
+ "relax: no control value expected\n" );
usage();
}
@@ -424,10 +559,71 @@
/* this shouldn't go here, really; but it's a feature... */
} else if ( strcasecmp( control, "abandon" ) == 0 ) {
abcan = LDAP_REQ_ABANDON;
+ if ( crit ) {
+ gotintr = abcan;
+ }
} else if ( strcasecmp( control, "cancel" ) == 0 ) {
abcan = LDAP_REQ_EXTENDED;
+ if ( crit ) {
+ gotintr = abcan;
+ }
+ } else if ( strcasecmp( control, "ignore" ) == 0 ) {
+ abcan = -1;
+ if ( crit ) {
+ gotintr = abcan;
+ }
+
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+ } else if ( strcasecmp( control, "sessiontracking" ) == 0 ) {
+ if ( sessionTracking ) {
+ fprintf( stderr, "%s: session tracking can be only specified once\n", prog );
+ exit( EXIT_FAILURE );
+ }
+ sessionTracking = 1;
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+
+ } else if ( tool_is_oid( control ) ) {
+ LDAPControl *tmpctrls, ctrl;
+
+ tmpctrls = (LDAPControl *)realloc( unknown_ctrls,
+ (unknown_ctrls_num + 1)*sizeof( LDAPControl ) );
+ if ( tmpctrls == NULL ) {
+ fprintf( stderr, "%s: no memory?\n", prog );
+ exit( EXIT_FAILURE );
+ }
+ unknown_ctrls = tmpctrls;
+ ctrl.ldctl_oid = control;
+ ctrl.ldctl_value.bv_val = NULL;
+ ctrl.ldctl_value.bv_len = 0;
+ ctrl.ldctl_iscritical = crit;
+
+ if ( cvalue != NULL ) {
+ struct berval bv;
+ size_t len = strlen( cvalue );
+ int retcode;
+
+ bv.bv_len = LUTIL_BASE64_DECODE_LEN( len );
+ bv.bv_val = ber_memalloc( bv.bv_len + 1 );
+
+ retcode = lutil_b64_pton( cvalue,
+ (unsigned char *)bv.bv_val,
+ bv.bv_len );
+
+ if ( retcode == -1 || retcode > bv.bv_len ) {
+ fprintf( stderr, "Unable to parse value of general control %s\n",
+ control );
+ usage();
+ }
+
+ bv.bv_len = retcode;
+ ctrl.ldctl_value = bv;
+ }
+
+ unknown_ctrls[ unknown_ctrls_num ] = ctrl;
+ unknown_ctrls_num++;
+
} else {
fprintf( stderr, "Invalid general control name: %s\n",
control );
@@ -471,39 +667,52 @@
prog );
exit( EXIT_FAILURE );
#endif
- case 'k': /* kerberos bind */
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
- if( authmethod != -1 ) {
- fprintf( stderr, "%s: -k incompatible with previous "
- "authentication choice\n", prog );
- exit( EXIT_FAILURE );
- }
- authmethod = LDAP_AUTH_KRBV4;
-#else
- fprintf( stderr, "%s: not compiled with Kerberos support\n", prog );
- exit( EXIT_FAILURE );
-#endif
- break;
- case 'K': /* kerberos bind, part one only */
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
- if( authmethod != -1 ) {
- fprintf( stderr, "%s: incompatible with previous "
- "authentication choice\n", prog );
- exit( EXIT_FAILURE );
- }
- authmethod = LDAP_AUTH_KRBV41;
-#else
- fprintf( stderr, "%s: not compiled with Kerberos support\n", prog );
- exit( EXIT_FAILURE );
-#endif
- break;
case 'M':
/* enable Manage DSA IT */
manageDSAit++;
break;
case 'n': /* print operations, don't actually do them */
- not++;
+ dont++;
break;
+ case 'o':
+ control = ber_strdup( optarg );
+ if ( (cvalue = strchr( control, '=' )) != NULL ) {
+ *cvalue++ = '\0';
+ }
+
+ if ( strcasecmp( control, "nettimeout" ) == 0 ) {
+ if( nettimeout.tv_sec != -1 ) {
+ fprintf( stderr, "nettimeout option previously specified\n");
+ exit( EXIT_FAILURE );
+ }
+ if( cvalue == NULL || cvalue[0] == '\0' ) {
+ fprintf( stderr, "nettimeout: option value expected\n" );
+ usage();
+ }
+ if ( strcasecmp( cvalue, "none" ) == 0 ) {
+ nettimeout.tv_sec = 0;
+ } else if ( strcasecmp( cvalue, "max" ) == 0 ) {
+ nettimeout.tv_sec = LDAP_MAXINT;
+ } else {
+ ival = strtol( cvalue, &next, 10 );
+ if ( next == NULL || next[0] != '\0' ) {
+ fprintf( stderr,
+ _("Unable to parse network timeout \"%s\"\n"), cvalue );
+ exit( EXIT_FAILURE );
+ }
+ nettimeout.tv_sec = ival;
+ }
+ if( nettimeout.tv_sec < 0 || nettimeout.tv_sec > LDAP_MAXINT ) {
+ fprintf( stderr, _("%s: invalid network timeout (%ld) specified\n"),
+ prog, (long)nettimeout.tv_sec );
+ exit( EXIT_FAILURE );
+ }
+ } else {
+ fprintf( stderr, "Invalid general option name: %s\n",
+ control );
+ usage();
+ }
+ break;
case 'O':
#ifdef HAVE_CYRUS_SASL
if( sasl_secprops != NULL ) {
@@ -779,11 +988,18 @@
exit( EXIT_FAILURE );
}
}
+
if( protocol == LDAP_VERSION2 ) {
if( assertctl || authzid || manageDIT || manageDSAit ||
+#ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
+ proxydn ||
+#endif /* LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ */
#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
chaining ||
#endif
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+ sessionTracking ||
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
noop || ppolicy || preread || postread )
{
fprintf( stderr, "%s: -e/-M incompatible with LDAPv2\n", prog );
@@ -802,20 +1018,12 @@
exit( EXIT_FAILURE );
}
#endif
- } else {
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
- if ( authmethod == LDAP_AUTH_KRBV4 || authmethod == LDAP_AUTH_KRBV41 ) {
- fprintf( stderr, "%s: -k/-K incompatible with LDAPv%d\n",
- prog, protocol );
- exit( EXIT_FAILURE );
- }
-#endif
}
}
LDAP *
-tool_conn_setup( int not, void (*private_setup)( LDAP * ) )
+tool_conn_setup( int dont, void (*private_setup)( LDAP * ) )
{
LDAP *ld = NULL;
@@ -842,7 +1050,7 @@
SIGNAL( SIGINT, do_sig );
}
- if ( !not ) {
+ if ( !dont ) {
int rc;
if( ( ldaphost != NULL || ldapport ) && ( ldapuri == NULL ) ) {
@@ -856,6 +1064,137 @@
url.lud_scope = LDAP_SCOPE_DEFAULT;
ldapuri = ldap_url_desc2str( &url );
+
+ } else if ( ldapuri != NULL ) {
+ LDAPURLDesc *ludlist, **ludp;
+ char **urls = NULL;
+ int nurls = 0;
+
+ rc = ldap_url_parselist( &ludlist, ldapuri );
+ if ( rc != LDAP_URL_SUCCESS ) {
+ fprintf( stderr,
+ "Could not parse LDAP URI(s)=%s (%d)\n",
+ ldapuri, rc );
+ exit( EXIT_FAILURE );
+ }
+
+ for ( ludp = &ludlist; *ludp != NULL; ) {
+ LDAPURLDesc *lud = *ludp;
+ char **tmp;
+
+ if ( lud->lud_dn != NULL && lud->lud_dn[ 0 ] != '\0' &&
+ ( lud->lud_host == NULL || lud->lud_host[0] == '\0' ) )
+ {
+ /* if no host but a DN is provided,
+ * use DNS SRV to gather the host list
+ * and turn it into a list of URIs
+ * using the scheme provided */
+ char *domain = NULL,
+ *hostlist = NULL,
+ **hosts = NULL;
+ int i,
+ len_proto = strlen( lud->lud_scheme );
+
+ if ( ldap_dn2domain( lud->lud_dn, &domain )
+ || domain == NULL )
+ {
+ fprintf( stderr,
+ "DNS SRV: Could not turn "
+ "DN=\"%s\" into a domain\n",
+ lud->lud_dn );
+ goto dnssrv_free;
+ }
+
+ rc = ldap_domain2hostlist( domain, &hostlist );
+ if ( rc ) {
+ fprintf( stderr,
+ "DNS SRV: Could not turn "
+ "domain=%s into a hostlist\n",
+ domain );
+ goto dnssrv_free;
+ }
+
+ hosts = ldap_str2charray( hostlist, " " );
+ if ( hosts == NULL ) {
+ fprintf( stderr,
+ "DNS SRV: Could not parse "
+ "hostlist=\"%s\"\n",
+ hostlist );
+ goto dnssrv_free;
+ }
+
+ for ( i = 0; hosts[ i ] != NULL; i++ )
+ /* count'em */ ;
+
+ tmp = (char **)realloc( urls, sizeof( char * ) * ( nurls + i + 1 ) );
+ if ( tmp == NULL ) {
+ fprintf( stderr,
+ "DNS SRV: out of memory?\n" );
+ goto dnssrv_free;
+ }
+ urls = tmp;
+ urls[ nurls ] = NULL;
+
+ for ( i = 0; hosts[ i ] != NULL; i++ ) {
+ size_t len = len_proto
+ + STRLENOF( "://" )
+ + strlen( hosts[ i ] )
+ + 1;
+
+ urls[ nurls + i + 1 ] = NULL;
+ urls[ nurls + i ] = (char *)malloc( sizeof( char ) * len );
+ if ( urls[ nurls + i ] == NULL ) {
+ fprintf( stderr,
+ "DNS SRV: out of memory?\n" );
+ goto dnssrv_free;
+ }
+
+ snprintf( urls[ nurls + i ], len, "%s://%s",
+ lud->lud_scheme, hosts[ i ] );
+ }
+ nurls += i;
+
+dnssrv_free:;
+ ber_memvfree( (void **)hosts );
+ ber_memfree( hostlist );
+ ber_memfree( domain );
+
+ } else {
+ tmp = (char **)realloc( urls, sizeof( char * ) * ( nurls + 2 ) );
+ if ( tmp == NULL ) {
+ fprintf( stderr,
+ "DNS SRV: out of memory?\n" );
+ break;
+ }
+ urls = tmp;
+ urls[ nurls + 1 ] = NULL;
+
+ urls[ nurls ] = ldap_url_desc2str( lud );
+ if ( urls[ nurls ] == NULL ) {
+ fprintf( stderr,
+ "DNS SRV: out of memory?\n" );
+ break;
+ }
+ nurls++;
+ }
+
+ *ludp = lud->lud_next;
+
+ lud->lud_next = NULL;
+ ldap_free_urldesc( lud );
+ }
+
+ if ( ludlist != NULL ) {
+ ldap_free_urllist( ludlist );
+ exit( EXIT_FAILURE );
+
+ } else if ( urls == NULL ) {
+ exit( EXIT_FAILURE );
+ }
+
+ ldap_memfree( ldapuri );
+ ldapuri = ldap_charray2str( urls, " " );
+ ber_memvfree( (void **)urls );
}
if ( verbose ) {
@@ -889,14 +1228,25 @@
exit( EXIT_FAILURE );
}
- if ( use_tls &&
- ( ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ))
- {
- ldap_perror( ld, "ldap_start_tls" );
- if ( use_tls > 1 ) {
- exit( EXIT_FAILURE );
+ if ( use_tls ) {
+ rc = ldap_start_tls_s( ld, NULL, NULL );
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_start_tls", rc, NULL, NULL, NULL, NULL );
+ if ( use_tls > 1 ) {
+ exit( EXIT_FAILURE );
+ }
}
}
+
+ if ( nettimeout.tv_sec > 0 ) {
+ if ( ldap_set_option( ld, LDAP_OPT_NETWORK_TIMEOUT, (void *) &nettimeout )
+ != LDAP_OPT_SUCCESS )
+ {
+ fprintf( stderr, "Could not set LDAP_OPT_NETWORK_TIMEOUT %ld\n",
+ (long)nettimeout.tv_sec );
+ exit( EXIT_FAILURE );
+ }
+ }
}
return ld;
@@ -906,19 +1256,48 @@
void
tool_bind( LDAP *ld )
{
+ LDAPControl **sctrlsp = NULL;
+ LDAPControl *sctrls[3];
+ LDAPControl sctrl[3];
+ int nsctrls = 0;
+
#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
if ( ppolicy ) {
- LDAPControl *ctrls[2], c;
+ LDAPControl c;
c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST;
c.ldctl_value.bv_val = NULL;
c.ldctl_value.bv_len = 0;
c.ldctl_iscritical = 0;
- ctrls[0] = &c;
- ctrls[1] = NULL;
- ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
+ sctrl[nsctrls] = c;
+ sctrls[nsctrls] = &sctrl[nsctrls];
+ sctrls[++nsctrls] = NULL;
}
#endif
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+ if ( sessionTracking ) {
+ LDAPControl c;
+
+ if (stValue.bv_val == NULL && st_value( ld, &stValue ) ) {
+ exit( EXIT_FAILURE );
+ }
+
+ c.ldctl_oid = LDAP_CONTROL_X_SESSION_TRACKING;
+ c.ldctl_iscritical = 0;
+ ber_dupbv( &c.ldctl_value, &stValue );
+
+ sctrl[nsctrls] = c;
+ sctrls[nsctrls] = &sctrl[nsctrls];
+ sctrls[++nsctrls] = NULL;
+ }
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+
+ if ( nsctrls ) {
+ sctrlsp = sctrls;
+ }
+
+ assert( nsctrls < sizeof(sctrls)/sizeof(sctrls[0]) );
+
if ( authmethod == LDAP_AUTH_SASL ) {
#ifdef HAVE_CYRUS_SASL
void *defaults;
@@ -932,7 +1311,7 @@
fprintf( stderr,
"Could not set LDAP_OPT_X_SASL_SECPROPS: %s\n",
sasl_secprops );
- exit( EXIT_FAILURE );
+ exit( LDAP_LOCAL_ERROR );
}
}
@@ -943,22 +1322,22 @@
passwd.bv_val,
sasl_authz_id );
- rc = ldap_sasl_interactive_bind_s( ld, binddn,
- sasl_mech, NULL, NULL,
- sasl_flags, lutil_sasl_interact, defaults );
+ rc = ldap_sasl_interactive_bind_s( ld, binddn, sasl_mech,
+ sctrlsp,
+ NULL, sasl_flags, lutil_sasl_interact, defaults );
lutil_sasl_freedefs( defaults );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_sasl_interactive_bind_s" );
- exit( EXIT_FAILURE );
+ tool_perror( "ldap_sasl_interactive_bind_s",
+ rc, NULL, NULL, NULL, NULL );
+ exit( rc );
}
#else
- fprintf( stderr, "%s: not compiled with SASL support\n",
- prog );
- exit( EXIT_FAILURE );
+ fprintf( stderr, "%s: not compiled with SASL support\n", prog );
+ exit( LDAP_NOT_SUPPORTED );
#endif
} else {
- int msgid, err;
+ int msgid, err, rc;
LDAPMessage *result;
LDAPControl **ctrls;
char msgbuf[256];
@@ -968,22 +1347,27 @@
msgbuf[0] = 0;
- msgid = ldap_bind( ld, binddn, passwd.bv_val, authmethod );
- if ( msgid == -1 ) {
- ldap_perror( ld, "ldap_bind" );
- exit( EXIT_FAILURE );
+ {
+ /* simple bind */
+ rc = ldap_sasl_bind( ld, binddn, LDAP_SASL_SIMPLE, &passwd,
+ sctrlsp, NULL, &msgid );
+ if ( msgid == -1 ) {
+ tool_perror( "ldap_sasl_bind(SIMPLE)", rc,
+ NULL, NULL, NULL, NULL );
+ exit( rc );
+ }
}
- if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) {
- ldap_perror( ld, "ldap_result" );
- exit( EXIT_FAILURE );
+ if ( ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result ) == -1 ) {
+ tool_perror( "ldap_result", -1, NULL, NULL, NULL, NULL );
+ exit( LDAP_LOCAL_ERROR );
}
- if ( ldap_parse_result( ld, result, &err, &matched, &info, &refs,
- &ctrls, 1 ) != LDAP_SUCCESS )
- {
- ldap_perror( ld, "ldap_bind parse result" );
- exit( EXIT_FAILURE );
+ rc = ldap_parse_result( ld, result, &err, &matched, &info, &refs,
+ &ctrls, 1 );
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_bind parse result", rc, NULL, matched, info, refs );
+ exit( LDAP_LOCAL_ERROR );
}
#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
@@ -992,8 +1376,8 @@
int expire, grace, len = 0;
LDAPPasswordPolicyError pErr = -1;
- ctrl = ldap_find_control( LDAP_CONTROL_PASSWORDPOLICYRESPONSE,
- ctrls );
+ ctrl = ldap_control_find( LDAP_CONTROL_PASSWORDPOLICYRESPONSE,
+ ctrls, NULL );
if ( ctrl && ldap_parse_passwordpolicy_control( ld, ctrl,
&expire, &grace, &pErr ) == LDAP_SUCCESS )
@@ -1033,7 +1417,7 @@
if( info ) ber_memfree( info );
if( refs ) ber_memvfree( (void **)refs );
- if ( err != LDAP_SUCCESS ) exit( EXIT_FAILURE );
+ if ( err != LDAP_SUCCESS ) exit( err );
}
}
}
@@ -1056,9 +1440,34 @@
tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
{
int i = 0, j, crit = 0, err;
- LDAPControl c[10], **ctrls;
+ LDAPControl c[16], **ctrls;
- ctrls = (LDAPControl**) malloc(sizeof(c) + (count+1)*sizeof(LDAPControl*));
+ if ( ! ( assertctl
+ || authzid
+#ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
+ || proxydn
+#endif /* LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ */
+ || manageDIT
+ || manageDSAit
+ || noop
+#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
+ || ppolicy
+#endif
+ || preread
+ || postread
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+ || chaining
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+ || sessionTracking
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+ || count
+ || unknown_ctrls_num ) )
+ {
+ return;
+ }
+
+ ctrls = (LDAPControl**) malloc(sizeof(c) + (count + unknown_ctrls_num + 1)*sizeof(LDAPControl*));
if ( ctrls == NULL ) {
fprintf( stderr, "No memory\n" );
exit( EXIT_FAILURE );
@@ -1094,14 +1503,38 @@
}
if ( authzid ) {
- c[i].ldctl_oid = LDAP_CONTROL_PROXY_AUTHZ;
c[i].ldctl_value.bv_val = authzid;
c[i].ldctl_value.bv_len = strlen( authzid );
+ c[i].ldctl_oid = LDAP_CONTROL_PROXY_AUTHZ;
c[i].ldctl_iscritical = 1;
ctrls[i] = &c[i];
i++;
}
+#ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
+ /* NOTE: doesn't need an extra count because it's incompatible
+ * with authzid */
+ if ( proxydn ) {
+ BerElementBuffer berbuf;
+ BerElement *ber = (BerElement *)&berbuf;
+
+ ber_init2( ber, NULL, LBER_USE_DER );
+
+ if ( ber_printf( ber, "s", proxydn ) == LBER_ERROR ) {
+ exit( EXIT_FAILURE );
+ }
+
+ if ( ber_flatten2( ber, &c[i].ldctl_value, 0 ) == -1 ) {
+ exit( EXIT_FAILURE );
+ }
+
+ c[i].ldctl_oid = LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ;
+ c[i].ldctl_iscritical = 1;
+ ctrls[i] = &c[i];
+ i++;
+ }
+#endif /* LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ */
+
if ( manageDIT ) {
c[i].ldctl_oid = LDAP_CONTROL_MANAGEDIT;
BER_BVZERO( &c[i].ldctl_value );
@@ -1126,6 +1559,16 @@
i++;
}
+#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
+ if ( ppolicy ) {
+ c[i].ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST;
+ BER_BVZERO( &c[i].ldctl_value );
+ c[i].ldctl_iscritical = 0;
+ ctrls[i] = &c[i];
+ i++;
+ }
+#endif
+
if ( preread ) {
char berbuf[LBER_ELEMENT_SIZEOF];
BerElement *ber = (BerElement *)berbuf;
@@ -1232,9 +1675,27 @@
}
#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+ if ( sessionTracking ) {
+ if ( stValue.bv_val == NULL && st_value( ld, &stValue ) ) {
+ exit( EXIT_FAILURE );
+ }
+
+ c[i].ldctl_oid = LDAP_CONTROL_X_SESSION_TRACKING;
+ c[i].ldctl_iscritical = 0;
+ ber_dupbv( &c[i].ldctl_value, &stValue );
+
+ ctrls[i] = &c[i];
+ i++;
+ }
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
+
while ( count-- ) {
ctrls[i++] = extra_c++;
}
+ for ( count = 0; count < unknown_ctrls_num; count++ ) {
+ ctrls[i++] = &unknown_ctrls[count];
+ }
ctrls[i] = NULL;
err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
@@ -1266,15 +1727,142 @@
return -1;
case LDAP_REQ_ABANDON:
- rc = ldap_abandon( ld, msgid );
+ rc = ldap_abandon_ext( ld, msgid, NULL, NULL );
fprintf( stderr, "got interrupt, abandon got %d: %s\n",
rc, ldap_err2string( rc ) );
return -1;
+
+ case -1:
+ /* just unbind, ignoring the request */
+ return -1;
}
return 0;
}
+static int
+print_prepostread( LDAP *ld, LDAPControl *ctrl, struct berval *what)
+{
+ BerElement *ber;
+ struct berval bv;
+
+ tool_write_ldif( LDIF_PUT_COMMENT, "==> ",
+ what->bv_val, what->bv_len );
+ ber = ber_init( &ctrl->ldctl_value );
+ if ( ber == NULL ) {
+ /* error? */
+ return 1;
+
+ } else if ( ber_scanf( ber, "{m{" /*}}*/, &bv ) == LBER_ERROR ) {
+ /* error? */
+ return 1;
+
+ } else {
+ tool_write_ldif( LDIF_PUT_VALUE, "dn", bv.bv_val, bv.bv_len );
+
+ while ( ber_scanf( ber, "{m" /*}*/, &bv ) != LBER_ERROR ) {
+ int i;
+ BerVarray vals = NULL;
+
+ if ( ber_scanf( ber, "[W]", &vals ) == LBER_ERROR ||
+ vals == NULL )
+ {
+ /* error? */
+ return 1;
+ }
+
+ for ( i = 0; vals[ i ].bv_val != NULL; i++ ) {
+ tool_write_ldif(
+ ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
+ bv.bv_val, vals[ i ].bv_val, vals[ i ].bv_len );
+ }
+
+ ber_bvarray_free( vals );
+ }
+ }
+
+ if ( ber != NULL ) {
+ ber_free( ber, 1 );
+ }
+
+ tool_write_ldif( LDIF_PUT_COMMENT, "<== ",
+ what->bv_val, what->bv_len );
+
+ return 0;
+}
+
+static int
+print_preread( LDAP *ld, LDAPControl *ctrl )
+{
+ static struct berval what = BER_BVC( "preread" );
+
+ return print_prepostread( ld, ctrl, &what );
+}
+
+static int
+print_postread( LDAP *ld, LDAPControl *ctrl )
+{
+ static struct berval what = BER_BVC( "postread" );
+
+ return print_prepostread( ld, ctrl, &what );
+}
+
+static int
+print_paged_results( LDAP *ld, LDAPControl *ctrl )
+{
+ ber_int_t estimate;
+
+ /* note: pr_cookie is being malloced; it's freed
+ * the next time the control is sent, but the last
+ * time it's not; we don't care too much, because
+ * the last time an empty value is returned... */
+ if ( ldap_parse_pageresponse_control( ld, ctrl, &estimate, &pr_cookie )
+ != LDAP_SUCCESS )
+ {
+ /* error? */
+ return 1;
+
+ } else {
+ /* FIXME: check buffer overflow */
+ char buf[ BUFSIZ ], *ptr = buf;
+
+ if ( estimate > 0 ) {
+ ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
+ "estimate=%d", estimate );
+ }
+
+ if ( pr_cookie.bv_len > 0 ) {
+ struct berval bv;
+
+ bv.bv_len = LUTIL_BASE64_ENCODE_LEN(
+ pr_cookie.bv_len ) + 1;
+ bv.bv_val = ber_memalloc( bv.bv_len + 1 );
+
+ bv.bv_len = lutil_b64_ntop(
+ (unsigned char *) pr_cookie.bv_val,
+ pr_cookie.bv_len,
+ bv.bv_val, bv.bv_len );
+
+ ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
+ "%scookie=%s", ptr == buf ? "" : " ",
+ bv.bv_val );
+
+ ber_memfree( bv.bv_val );
+
+ pr_morePagedResults = 1;
+
+ } else {
+ ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
+ "%scookie=", ptr == buf ? "" : " " );
+ }
+
+ tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
+ "pagedresults", buf, ptr - buf );
+ }
+
+ return 0;
+}
+
#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
static int
print_ppolicy( LDAP *ld, LDAPControl *ctrl )
@@ -1326,6 +1914,13 @@
char *str;
int j;
+ /* FIXME: there might be cases where a control has NULL OID;
+ * this makes little sense, especially when returned by the
+ * server, but libldap happily allows it */
+ if ( ctrls[i]->ldctl_oid == NULL ) {
+ continue;
+ }
+
len = ldif ? 2 : 0;
len += strlen( ctrls[i]->ldctl_oid );
@@ -1334,7 +1929,7 @@
? sizeof("true") : sizeof("false");
/* convert to base64 */
- if ( ctrls[i]->ldctl_value.bv_len ) {
+ if ( !BER_BVISNULL( &ctrls[i]->ldctl_value ) ) {
b64.bv_len = LUTIL_BASE64_ENCODE_LEN(
ctrls[i]->ldctl_value.bv_len ) + 1;
b64.bv_val = ber_memalloc( b64.bv_len + 1 );
@@ -1373,13 +1968,19 @@
}
/* known controls */
- if ( 0 ) {
- /* dummy */ ;
-#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
- } else if ( strcmp( LDAP_CONTROL_PASSWORDPOLICYRESPONSE, ctrls[i]->ldctl_oid ) == 0 ) {
- (void)print_ppolicy( ld, ctrls[i] );
-#endif
+ for ( j = 0; tool_ctrl_response[j].oid != NULL; j++ ) {
+ if ( strcmp( tool_ctrl_response[j].oid, ctrls[i]->ldctl_oid ) == 0 ) {
+ if ( !tool_ctrl_response[j].mask & tool_type ) {
+ /* this control should not appear
+ * with this tool; warning? */
+ }
+ break;
+ }
}
+
+ if ( tool_ctrl_response[j].oid != NULL && tool_ctrl_response[j].func ) {
+ (void)tool_ctrl_response[j].func( ld, ctrls[i] );
+ }
}
}
@@ -1398,3 +1999,34 @@
return( 0 );
}
+int
+tool_is_oid( const char *s )
+{
+ int first = 1;
+
+ if ( !isdigit( (unsigned char) s[ 0 ] ) ) {
+ return 0;
+ }
+
+ for ( ; s[ 0 ]; s++ ) {
+ if ( s[ 0 ] == '.' ) {
+ if ( s[ 1 ] == '\0' ) {
+ return 0;
+ }
+ first = 1;
+ continue;
+ }
+
+ if ( !isdigit( (unsigned char) s[ 0 ] ) ) {
+ return 0;
+ }
+
+ if ( first == 1 && s[ 0 ] == '0' && s[ 1 ] != '.' ) {
+ return 0;
+ }
+ first = 0;
+ }
+
+ return 1;
+}
+
Modified: openldap/vendor/openldap-release/clients/tools/common.h
===================================================================
--- openldap/vendor/openldap-release/clients/tools/common.h 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/common.h 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
/* common.h - common definitions for the ldap client tools */
-/* $OpenLDAP: pkg/ldap/clients/tools/common.h,v 1.11.2.8 2007/08/13 20:03:51 ando Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/common.h,v 1.24.2.2 2007/08/31 23:13:50 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
@@ -24,57 +24,90 @@
LDAP_BEGIN_DECL
-/* Defined and set in common.c */
-extern int authmethod;
-extern char *binddn;
-extern int contoper;
-extern int debug;
-extern char *infile;
-extern char *ldapuri;
-extern char *ldaphost;
-extern int ldapport;
+typedef enum tool_type_t {
+ TOOL_SEARCH = 0x01U,
+ TOOL_COMPARE = 0x02U,
+ TOOL_ADD = 0x04U,
+ TOOL_DELETE = 0x08U,
+ TOOL_MODIFY = 0x10U,
+ TOOL_MODRDN = 0x20U,
+
+ TOOL_EXOP = 0x40U,
+
+ TOOL_WHOAMI = TOOL_EXOP | 0x100U,
+ TOOL_PASSWD = TOOL_EXOP | 0x200U,
+
+ TOOL_WRITE = (TOOL_ADD|TOOL_DELETE|TOOL_MODIFY|TOOL_MODRDN),
+ TOOL_READ = (TOOL_SEARCH|TOOL_COMPARE),
+
+ TOOL_ALL = 0xFFU
+} tool_type_t;
+
+
+/* input-related vars */
+
+/* misc. parameters */
+extern tool_type_t tool_type;
+extern int contoper;
+extern int debug;
+extern char *infile;
+extern int dont;
+extern int referrals;
+extern int verbose;
+extern int ldif;
+extern char *prog;
+
+/* connection */
+extern char *ldapuri;
+extern char *ldaphost;
+extern int ldapport;
+extern int use_tls;
+extern int protocol;
+extern int version;
+
+/* authc/authz */
+extern int authmethod;
+extern char *binddn;
+extern int want_bindpw;
+extern struct berval passwd;
+extern char *pw_file;
#ifdef HAVE_CYRUS_SASL
-extern unsigned sasl_flags;
-extern char *sasl_realm;
-extern char *sasl_authc_id;
-extern char *sasl_authz_id;
-extern char *sasl_mech;
-extern char *sasl_secprops;
+extern unsigned sasl_flags;
+extern char *sasl_realm;
+extern char *sasl_authc_id;
+extern char *sasl_authz_id;
+extern char *sasl_mech;
+extern char *sasl_secprops;
#endif
-extern int use_tls;
-extern char *assertion;
-extern char *authzid;
-extern int manageDIT;
-extern int manageDSAit;
-extern int noop;
-extern int ppolicy;
-extern int preread, postread;
+/* controls */
+extern char *assertion;
+extern char *authzid;
+extern int manageDIT;
+extern int manageDSAit;
+extern int noop;
+extern int ppolicy;
+extern int preread, postread;
+extern ber_int_t pr_morePagedResults;
+extern struct berval pr_cookie;
#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
-extern int chaining;
+extern int chaining;
#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
-extern int not;
-extern int want_bindpw;
-extern struct berval passwd;
-extern char *pw_file;
-extern int referrals;
-extern int protocol;
-extern int verbose;
-extern int ldif;
-extern int version;
+/* options */
+extern struct timeval nettimeout;
/* Defined in common.c, set in main() */
-extern char *prog;
-extern const char __Version[];
+extern const char __Version[];
/* Defined in main program */
-extern const char options[];
+extern const char options[];
+
void usage LDAP_P(( void )) LDAP_GCCATTR((noreturn));
int handle_private_option LDAP_P(( int i ));
/* Defined in common.c */
-void tool_init LDAP_P(( void ));
+void tool_init LDAP_P(( tool_type_t type ));
void tool_common_usage LDAP_P(( void ));
void tool_args LDAP_P(( int, char ** ));
LDAP *tool_conn_setup LDAP_P(( int dont, void (*private_setup)( LDAP * ) ));
@@ -84,15 +117,17 @@
void tool_server_controls LDAP_P(( LDAP *, LDAPControl *, int ));
int tool_check_abandon LDAP_P(( LDAP *ld, int msgid ));
void tool_perror LDAP_P((
- char *func,
+ const char *func,
int err,
- char *extra,
- char *matched,
- char *info,
+ const char *extra,
+ const char *matched,
+ const char *info,
char **refs ));
void tool_print_ctrls LDAP_P(( LDAP *ld, LDAPControl **ctrls ));
int tool_write_ldif LDAP_P(( int type, char *name, char *value, ber_len_t vallen ));
+int tool_is_oid LDAP_P(( const char *s ));
+
LDAP_END_DECL
#endif /* _CLIENT_TOOLS_COMMON_H_ */
Modified: openldap/vendor/openldap-release/clients/tools/ldapcompare.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/ldapcompare.c 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/ldapcompare.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
/* ldapcompare.c -- LDAP compare tool */
-/* $OpenLDAP: pkg/ldap/clients/tools/ldapcompare.c,v 1.34.2.6 2007/08/13 18:04:39 quanah Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/ldapcompare.c,v 1.43.2.3 2007/08/31 23:13:50 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
@@ -46,6 +46,7 @@
#include <ac/string.h>
#include <ac/unistd.h>
#include <ac/errno.h>
+#include <ac/socket.h>
#include <ac/time.h>
#include <sys/stat.h>
@@ -82,6 +83,8 @@
fprintf( stderr, _(" b64value\tbase64 encoding of assertion value\n"));
fprintf( stderr, _("Compare options:\n"));
+ fprintf( stderr, _(" -E [!]<ext>[=<extparam>] compare extensions (! indicates criticality)\n"));
+ fprintf( stderr, _(" !dontUseCopy (Don't Use Copy)\n"));
fprintf( stderr, _(" -z Quiet mode,"
" don't print anything, use return values\n"));
tool_common_usage();
@@ -99,15 +102,19 @@
const char options[] = "z"
- "Cd:D:e:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
+ "Cd:D:e:h:H:IMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+#ifdef LDAP_CONTROL_DONTUSECOPY
+int dontUseCopy = 0;
+#endif
+
int
handle_private_option( int i )
{
+ char *control, *cvalue;
+ int crit;
+
switch ( i ) {
-#if 0
- char *control, *cvalue;
- int crit;
case 'E': /* compare extensions */
if( protocol == LDAP_VERSION2 ) {
fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
@@ -126,13 +133,38 @@
optarg++;
}
- control = strdup( optarg );
+ control = ber_strdup( optarg );
if ( (cvalue = strchr( control, '=' )) != NULL ) {
*cvalue++ = '\0';
}
- fprintf( stderr, _("Invalid compare extension name: %s\n"), control );
- usage();
+
+#ifdef LDAP_CONTROL_DONTUSECOPY
+ if ( strcasecmp( control, "dontUseCopy" ) == 0 ) {
+ if( dontUseCopy ) {
+ fprintf( stderr,
+ _("dontUseCopy control previously specified\n"));
+ exit( EXIT_FAILURE );
+ }
+ if( cvalue != NULL ) {
+ fprintf( stderr,
+ _("dontUseCopy: no control value expected\n") );
+ usage();
+ }
+ if( !crit ) {
+ fprintf( stderr,
+ _("dontUseCopy: critical flag required\n") );
+ usage();
+ }
+
+ dontUseCopy = 1 + crit;
+ } else
#endif
+ {
+ fprintf( stderr,
+ _("Invalid compare extension name: %s\n"), control );
+ usage();
+ }
+ break;
case 'z':
quiet = 1;
@@ -148,13 +180,16 @@
int
main( int argc, char **argv )
{
- char *compdn = NULL, *attrs = NULL;
- char *sep;
+ char *compdn = NULL, *attrs = NULL;
+ char *sep;
int rc;
- LDAP *ld = NULL;
- struct berval bvalue = { 0, NULL };
+ LDAP *ld = NULL;
+ struct berval bvalue = { 0, NULL };
+ int i = 0;
+ LDAPControl c[1];
- tool_init();
+
+ tool_init( TOOL_COMPARE );
prog = lutil_progname( "ldapcompare", argc, argv );
tool_args( argc, argv );
@@ -205,10 +240,25 @@
tool_bind( ld );
- if ( assertion || authzid || manageDSAit || noop ) {
- tool_server_controls( ld, NULL, 0 );
+ if ( 0
+#ifdef LDAP_CONTROL_DONTUSECOPY
+ || dontUseCopy
+#endif
+ )
+ {
+#ifdef LDAP_CONTROL_DONTUSECOPY
+ if ( dontUseCopy ) {
+ c[i].ldctl_oid = LDAP_CONTROL_DONTUSECOPY;
+ c[i].ldctl_value.bv_val = NULL;
+ c[i].ldctl_value.bv_len = 0;
+ c[i].ldctl_iscritical = dontUseCopy > 1;
+ i++;
+ }
+#endif
}
+ tool_server_controls( ld, c, i );
+
if ( verbose ) {
fprintf( stderr, _("DN:%s, attr:%s, value:%s\n"),
compdn, attrs, sep );
@@ -240,7 +290,7 @@
char **refs;
LDAPControl **ctrls = NULL;
- if ( not ) {
+ if ( dont ) {
return LDAP_SUCCESS;
}
@@ -262,7 +312,7 @@
rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
if ( rc < 0 ) {
- ldap_perror( ld, "ldapcompare: ldap_result" );
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
return rc;
}
Modified: openldap/vendor/openldap-release/clients/tools/ldapdelete.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/ldapdelete.c 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/ldapdelete.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
/* ldapdelete.c - simple program to delete an entry using LDAP */
-/* $OpenLDAP: pkg/ldap/clients/tools/ldapdelete.c,v 1.109.2.7 2007/08/13 18:04:39 quanah Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/ldapdelete.c,v 1.118.2.4 2007/08/31 23:13:50 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
@@ -39,6 +39,7 @@
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/unistd.h>
+#include <ac/socket.h>
#include <ac/time.h>
#include <ldap.h>
@@ -75,7 +76,7 @@
const char options[] = "r"
- "cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
+ "cd:D:e:f:h:H:IMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
@@ -140,7 +141,7 @@
fp = NULL;
- tool_init();
+ tool_init( TOOL_DELETE );
prog = lutil_progname( "ldapdelete", argc, argv );
tool_args( argc, argv );
@@ -170,13 +171,11 @@
tool_bind( ld );
- if ( assertion || authzid || manageDIT || manageDSAit || noop ) {
- tool_server_controls( ld, NULL, 0 );
- }
+ tool_server_controls( ld, NULL, 0 );
retval = rc = 0;
- if ( fp == NULL ) {
+ if ( fp == NULL ) {
for ( ; optind < argc; ++optind ) {
rc = dodelete( ld, argv[ optind ] );
@@ -216,10 +215,10 @@
if ( verbose ) {
printf( _("%sdeleting entry \"%s\"\n"),
- (not ? "!" : ""), dn );
+ (dont ? "!" : ""), dn );
}
- if ( not ) {
+ if ( dont ) {
return LDAP_SUCCESS;
}
@@ -247,7 +246,7 @@
rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
if ( rc < 0 ) {
- ldap_perror( ld, "ldapdelete: ldap_result" );
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
return rc;
}
@@ -324,7 +323,7 @@
rc = ldap_search_ext_s( ld, dn, LDAP_SCOPE_ONELEVEL, NULL, attrs, 1,
NULL, NULL, NULL, -1, &res );
if ( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_search" );
+ tool_perror( "ldap_search", rc, NULL, NULL, NULL, NULL );
return( rc );
}
@@ -339,15 +338,15 @@
char *dn = ldap_get_dn( ld, e );
if( dn == NULL ) {
- ldap_perror( ld, "ldap_prune" );
- ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
+ ldap_get_option( ld, LDAP_OPT_RESULT_CODE, &rc );
+ tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
ber_memfree( dn );
return rc;
}
rc = deletechildren( ld, dn );
if ( rc == -1 ) {
- ldap_perror( ld, "ldap_prune" );
+ tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
ber_memfree( dn );
return rc;
}
@@ -356,9 +355,9 @@
printf( _("\tremoving %s\n"), dn );
}
- rc = ldap_delete_s( ld, dn );
+ rc = ldap_delete_ext_s( ld, dn, NULL, NULL );
if ( rc == -1 ) {
- ldap_perror( ld, "ldap_delete" );
+ tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
ber_memfree( dn );
return rc;
@@ -398,7 +397,7 @@
rc = ldap_search_ext_s( ld, dn, LDAP_SCOPE_ONELEVEL, NULL, attrs, 1,
ctrls, NULL, NULL, -1, &res_se );
if ( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_search" );
+ tool_perror( "ldap_search", rc, NULL, NULL, NULL, NULL );
return( rc );
}
ber_free( ber, 1 );
@@ -414,8 +413,8 @@
char *dn = ldap_get_dn( ld, e );
if( dn == NULL ) {
- ldap_perror( ld, "ldap_prune" );
- ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
+ ldap_get_option( ld, LDAP_OPT_RESULT_CODE, &rc );
+ tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
ber_memfree( dn );
return rc;
}
@@ -424,9 +423,9 @@
printf( _("\tremoving %s\n"), dn );
}
- rc = ldap_delete_s( ld, dn );
+ rc = ldap_delete_ext_s( ld, dn, NULL, NULL );
if ( rc == -1 ) {
- ldap_perror( ld, "ldap_delete" );
+ tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
ber_memfree( dn );
return rc;
Added: openldap/vendor/openldap-release/clients/tools/ldapexop.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/ldapexop.c (rev 0)
+++ openldap/vendor/openldap-release/clients/tools/ldapexop.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -0,0 +1,364 @@
+/* ldapexop.c -- a tool for performing well-known extended operations */
+/* $OpenLDAP: pkg/ldap/clients/tools/ldapexop.c,v 1.9.2.2 2007/08/31 23:13:50 quanah Exp $ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2005-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by Pierangelo Masarati for inclusion
+ * in OpenLDAP Software based, in part, on other client tools.
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/stdlib.h>
+
+#include <ac/ctype.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
+
+#include <ldap.h>
+#include "ldif.h"
+#include "lutil.h"
+#include "lutil_ldap.h"
+#include "ldap_defaults.h"
+
+#include "common.h"
+
+void
+usage( void )
+{
+ fprintf( stderr, _("Issue LDAP extended operations\n\n"));
+ fprintf( stderr, _("usage: %s [options] <oid|oid:data|oid::b64data>\n"), prog);
+ tool_common_usage();
+ exit( EXIT_FAILURE );
+}
+
+
+const char options[] = ""
+ "d:D:e:h:H:InO:o:p:QR:U:vVw:WxX:y:Y:Z";
+
+int
+handle_private_option( int i )
+{
+ switch ( i ) {
+ default:
+ return 0;
+ }
+ return 1;
+}
+
+
+int
+main( int argc, char *argv[] )
+{
+ int rc;
+
+ LDAP *ld = NULL;
+
+ char *matcheddn = NULL, *text = NULL, **refs = NULL;
+ LDAPControl **ctrls = NULL;
+ int id, code;
+ LDAPMessage *res;
+
+ tool_init( TOOL_EXOP );
+ prog = lutil_progname( "ldapexop", argc, argv );
+
+ /* LDAPv3 only */
+ protocol = LDAP_VERSION3;
+
+ tool_args( argc, argv );
+
+ if ( argc - optind < 1 ) {
+ usage();
+ }
+
+ if ( pw_file || want_bindpw ) {
+ if ( pw_file ) {
+ rc = lutil_get_filed_password( pw_file, &passwd );
+ if( rc ) return EXIT_FAILURE;
+ } else {
+ passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
+ passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
+ }
+ }
+
+ ld = tool_conn_setup( 0, 0 );
+
+ tool_bind( ld );
+
+ argv += optind;
+ argc -= optind;
+
+ if ( strcasecmp( argv[ 0 ], "whoami" ) == 0 ) {
+ tool_server_controls( ld, NULL, 0 );
+
+ rc = ldap_whoami( ld, NULL, NULL, &id );
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ } else if ( strcasecmp( argv[ 0 ], "cancel" ) == 0 ) {
+ int cancelid;
+
+ switch ( argc ) {
+ case 2:
+ if ( lutil_atoi( &cancelid, argv[ 1 ] ) != 0 || cancelid < 0 ) {
+ fprintf( stderr, "invalid cancelid=%s\n\n", argv[ 1 ] );
+ usage();
+ }
+ break;
+
+ default:
+ fprintf( stderr, "need cancelid\n\n" );
+ usage();
+ }
+
+ rc = ldap_cancel( ld, cancelid, NULL, NULL, &id );
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_cancel", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ } else if ( strcasecmp( argv[ 0 ], "passwd" ) == 0 ) {
+ fprintf( stderr, "use ldappasswd(1) instead.\n\n", argv[ 0 ] );
+ usage();
+ /* TODO? */
+
+ } else if ( strcasecmp( argv[ 0 ], "refresh" ) == 0 ) {
+ int ttl = 3600;
+ struct berval dn;
+
+ switch ( argc ) {
+ case 3:
+ ttl = atoi( argv[ 2 ] );
+
+ case 2:
+ dn.bv_val = argv[ 1 ];
+ dn.bv_len = strlen( dn.bv_val );
+
+ case 1:
+ break;
+
+ default:
+ fprintf( stderr, _("need DN [ttl]\n\n") );
+ usage();
+ }
+
+ tool_server_controls( ld, NULL, 0 );
+
+ rc = ldap_refresh( ld, &dn, ttl, NULL, NULL, &id );
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ } else {
+ char *p;
+
+ if ( argc != 1 ) {
+ usage();
+ }
+
+ p = strchr( argv[ 0 ], ':' );
+ if ( p == argv[ 0 ] ) {
+ usage();
+ }
+
+ if ( p != NULL )
+ *p++ = '\0';
+
+ if ( tool_is_oid( argv[ 0 ] ) ) {
+ struct berval reqdata;
+ struct berval type;
+ struct berval value;
+ int freeval;
+
+ if ( p != NULL ) {
+ p[ -1 ] = ':';
+ ldif_parse_line2( argv[ 0 ], &type, &value, &freeval );
+ p[ -1 ] = '\0';
+
+ if ( freeval ) {
+ reqdata = value;
+ } else {
+ ber_dupbv( &reqdata, &value );
+ }
+ }
+
+
+ tool_server_controls( ld, NULL, 0 );
+
+ rc = ldap_extended_operation( ld, argv[ 0 ], p ? &reqdata : NULL, NULL, NULL, &id );
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+ } else {
+ fprintf( stderr, "unknown exop \"%s\"\n\n", argv[ 0 ] );
+ usage();
+ }
+ }
+
+ for ( ; ; ) {
+ struct timeval tv;
+
+ if ( tool_check_abandon( ld, id ) ) {
+ return LDAP_CANCELLED;
+ }
+
+ tv.tv_sec = 0;
+ tv.tv_usec = 100000;
+
+ rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
+ if ( rc < 0 ) {
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ if ( rc != 0 ) {
+ break;
+ }
+ }
+
+ rc = ldap_parse_result( ld, res,
+ &code, &matcheddn, &text, &refs, &ctrls, 0 );
+ if ( rc == LDAP_SUCCESS ) {
+ rc = code;
+ }
+
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_result", rc, NULL, matcheddn, text, refs );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ if ( strcasecmp( argv[ 0 ], "whoami" ) == 0 ) {
+ char *retoid = NULL;
+ struct berval *retdata = NULL;
+
+ rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ if ( retdata != NULL ) {
+ if ( retdata->bv_len == 0 ) {
+ printf(_("anonymous\n") );
+ } else {
+ printf("%s\n", retdata->bv_val );
+ }
+ }
+
+ ber_memfree( retoid );
+ ber_bvfree( retdata );
+
+ } else if ( strcasecmp( argv[ 0 ], "cancel" ) == 0 ) {
+ /* no extended response; returns specific errors */
+ assert( 0 );
+
+ } else if ( strcasecmp( argv[ 0 ], "passwd" ) == 0 ) {
+ /* TODO */
+
+ } else if ( strcasecmp( argv[ 0 ], "refresh" ) == 0 ) {
+ int newttl;
+
+ rc = ldap_parse_refresh( ld, res, &newttl );
+
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_refresh", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ printf( "newttl=%d\n", newttl );
+
+ } else if ( tool_is_oid( argv[ 0 ] ) ) {
+ char *retoid = NULL;
+ struct berval *retdata = NULL;
+
+ if( ldif < 2 ) {
+ printf(_("# extended operation response\n"));
+ }
+
+ rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ if ( ldif < 2 && retoid != NULL ) {
+ tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
+ "oid", retoid, strlen(retoid) );
+ }
+
+ ber_memfree( retoid );
+
+ if( retdata != NULL ) {
+ if ( ldif < 2 ) {
+ tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_BINARY,
+ "data", retdata->bv_val, retdata->bv_len );
+ }
+
+ ber_bvfree( retdata );
+ }
+ }
+
+ if( verbose || ( code != LDAP_SUCCESS ) || matcheddn || text || refs ) {
+ printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );
+
+ if( text && *text ) {
+ printf( _("Additional info: %s\n"), text );
+ }
+
+ if( matcheddn && *matcheddn ) {
+ printf( _("Matched DN: %s\n"), matcheddn );
+ }
+
+ if( refs ) {
+ int i;
+ for( i=0; refs[i]; i++ ) {
+ printf(_("Referral: %s\n"), refs[i] );
+ }
+ }
+ }
+
+ if (ctrls) {
+ tool_print_ctrls( ld, ctrls );
+ ldap_controls_free( ctrls );
+ }
+
+ ber_memfree( text );
+ ber_memfree( matcheddn );
+ ber_memvfree( (void **) refs );
+
+skip:
+ /* disconnect from server */
+ tool_unbind( ld );
+ tool_destroy();
+
+ return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+}
Modified: openldap/vendor/openldap-release/clients/tools/ldapmodify.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/ldapmodify.c 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/ldapmodify.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,8 +1,9 @@
/* ldapmodify.c - generic program to modify or add entries using LDAP */
-/* $OpenLDAP: pkg/ldap/clients/tools/ldapmodify.c,v 1.158.2.13 2007/08/13 20:03:51 ando Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/ldapmodify.c,v 1.186.2.3 2007/08/31 23:13:50 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
+ * Portions Copyright 2006 Howard Chu.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 1998-2001 Net Boolean Incorporated.
* Portions Copyright 2001-2003 IBM Corporation.
@@ -32,6 +33,7 @@
* include:
* Kurt D. Zeilenga
* Norbert Klasen
+ * Howard Chu
*/
#include "portable.h"
@@ -42,6 +44,7 @@
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/unistd.h>
+#include <ac/socket.h>
#include <ac/time.h>
#ifdef HAVE_SYS_STAT_H
@@ -63,44 +66,41 @@
#include "ldap_defaults.h"
#include "ldap_log.h"
#include "ldap_pvt.h"
+#include "lber_pvt.h"
#include "common.h"
-
static int ldapadd, force = 0;
static char *rejfile = NULL;
static LDAP *ld = NULL;
-#define LDAPMOD_MAXLINE 4096
+#define M_SEP 0x7f
/* strings found in replog/LDIF entries (mostly lifted from slurpd/slurp.h) */
-#define T_VERSION_STR "version"
-#define T_REPLICA_STR "replica"
-#define T_DN_STR "dn"
-#define T_CONTROL_STR "control"
-#define T_CHANGETYPESTR "changetype"
-#define T_ADDCTSTR "add"
-#define T_MODIFYCTSTR "modify"
-#define T_DELETECTSTR "delete"
-#define T_MODRDNCTSTR "modrdn"
-#define T_MODDNCTSTR "moddn"
-#define T_RENAMECTSTR "rename"
-#define T_MODOPADDSTR "add"
-#define T_MODOPREPLACESTR "replace"
-#define T_MODOPDELETESTR "delete"
-#define T_MODOPINCREMENTSTR "increment"
-#define T_MODSEPSTR "-"
-#define T_NEWRDNSTR "newrdn"
-#define T_DELETEOLDRDNSTR "deleteoldrdn"
-#define T_NEWSUPSTR "newsuperior"
+static struct berval BV_VERSION = BER_BVC("version");
+static struct berval BV_REPLICA = BER_BVC("replica");
+static struct berval BV_DN = BER_BVC("dn");
+static struct berval BV_CONTROL = BER_BVC("control");
+static struct berval BV_CHANGETYPE = BER_BVC("changetype");
+static struct berval BV_ADDCT = BER_BVC("add");
+static struct berval BV_MODIFYCT = BER_BVC("modify");
+static struct berval BV_DELETECT = BER_BVC("delete");
+static struct berval BV_MODRDNCT = BER_BVC("modrdn");
+static struct berval BV_MODDNCT = BER_BVC("moddn");
+static struct berval BV_RENAMECT = BER_BVC("rename");
+static struct berval BV_MODOPADD = BER_BVC("add");
+static struct berval BV_MODOPREPLACE = BER_BVC("replace");
+static struct berval BV_MODOPDELETE = BER_BVC("delete");
+static struct berval BV_MODOPINCREMENT = BER_BVC("increment");
+static struct berval BV_NEWRDN = BER_BVC("newrdn");
+static struct berval BV_DELETEOLDRDN = BER_BVC("deleteoldrdn");
+static struct berval BV_NEWSUP = BER_BVC("newsuperior");
+#define BVICMP(a,b) ((a)->bv_len != (b)->bv_len ? \
+ (a)->bv_len - (b)->bv_len : strcasecmp((a)->bv_val, (b)->bv_val))
-static int process_ldif_rec LDAP_P(( char *rbuf, int count ));
-static int parse_ldif_control LDAP_P(( char *line, LDAPControl ***pctrls ));
-static void addmodifyop LDAP_P((
- LDAPMod ***pmodsp, int modop,
- const char *attr,
- struct berval *value ));
+static int process_ldif_rec LDAP_P(( char *rbuf, int lineno ));
+static int parse_ldif_control LDAP_P(( struct berval *val, LDAPControl ***pctrls ));
static int domodify LDAP_P((
const char *dn,
LDAPMod **pmods,
@@ -118,13 +118,13 @@
static int process_response(
LDAP *ld,
int msgid,
- const char *opstr,
+ int res,
const char *dn );
-static char *read_one_record LDAP_P(( FILE *fp ));
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
static int txn = 0;
static int txnabort = 0;
+struct berval *txn_id = NULL;
#endif
void
@@ -140,9 +140,9 @@
(ldapadd ? _("default") : _("default is to replace")));
fprintf( stderr, _(" -E [!]ext=extparam modify extensions"
" (! indicate s criticality)\n"));
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
fprintf( stderr,
- _(" [!]txn (transaction)\n"));
+ _(" [!]txn=<commit|abort> (transaction)\n"));
#endif
fprintf( stderr, _(" -F force all changes records to be used\n"));
fprintf( stderr, _(" -S file write skipped modifications to `file'\n"));
@@ -153,7 +153,7 @@
const char options[] = "aE:FrS:"
- "cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
+ "cd:D:e:f:h:H:IMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
@@ -185,7 +185,7 @@
*cvalue++ = '\0';
}
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
if( strcasecmp( control, "txn" ) == 0 ) {
/* Transaction */
if( txn ) {
@@ -211,6 +211,7 @@
control );
usage();
}
+ break;
case 'a': /* add */
ldapadd = 1;
@@ -241,22 +242,23 @@
int
main( int argc, char **argv )
{
-#ifdef LDAP_GROUP_TRANSACTION
- BerElement *txnber;
- struct berval txnCookie = { 0, NULL };
-#endif
- char *rbuf, *start, *rejbuf = NULL;
- FILE *fp, *rejfp;
+ char *rbuf = NULL, *rejbuf = NULL;
+ FILE *rejfp;
+ struct LDIFFP *ldiffp, ldifdummy = {0};
char *matched_msg, *error_msg;
int rc, retval;
- int count, len;
+ int len;
+ int i = 0;
+ int lineno, nextline = 0, lmax = 0;
+ LDAPControl c[1];
- tool_init();
prog = lutil_progname( "ldapmodify", argc, argv );
/* strncmp instead of strcmp since NT binaries carry .exe extension */
ldapadd = ( strncasecmp( prog, "ldapadd", sizeof("ldapadd")-1 ) == 0 );
+ tool_init( ldapadd ? TOOL_ADD : TOOL_MODIFY );
+
tool_args( argc, argv );
if ( argc != optind ) usage();
@@ -271,19 +273,20 @@
}
if ( infile != NULL ) {
- if (( fp = fopen( infile, "r" )) == NULL ) {
+ if (( ldiffp = ldif_open( infile, "r" )) == NULL ) {
perror( infile );
return( EXIT_FAILURE );
}
} else {
- fp = stdin;
+ ldifdummy.fp = stdin;
+ ldiffp = &ldifdummy;
}
if ( debug ) ldif_debug = debug;
- ld = tool_conn_setup( not, 0 );
+ ld = tool_conn_setup( dont, 0 );
- if ( !not ) {
+ if ( !dont ) {
if ( pw_file || want_bindpw ) {
if ( pw_file ) {
rc = lutil_get_filed_password( pw_file, &passwd );
@@ -296,64 +299,42 @@
tool_bind( ld );
}
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
if( txn ) {
- struct berval *txnCookiep = &txnCookie;
-
- /* create transaction */
- rc = ldap_txn_create_s( ld, &txnCookiep, NULL, NULL );
+ /* start transaction */
+ rc = ldap_txn_start_s( ld, NULL, NULL, &txn_id );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_txn_create_s" );
- if( txn > 2 ) return EXIT_FAILURE;
+ tool_perror( "ldap_txn_start_s", rc, NULL, NULL, NULL, NULL );
+ if( txn > 1 ) return EXIT_FAILURE;
txn = 0;
}
}
#endif
- if ( assertion || authzid || manageDIT || manageDSAit || noop
-#ifdef LDAP_GROUP_TRANSACTION
+ if ( 0
+#ifdef LDAP_X_TXN
|| txn
#endif
- || preread || postread )
+ )
{
- int i = 0;
- LDAPControl c[1];
-
-#ifdef LDAP_GROUP_TRANSACTION
+#ifdef LDAP_X_TXN
if( txn ) {
- int err;
- txnber = ber_alloc_t( LBER_USE_DER );
- if( txnber == NULL ) return EXIT_FAILURE;
-
- err = ber_printf( txnber, "{o}", &txnCookie );
- if( err == -1 ) {
- ber_free( txnber, 1 );
- fprintf( stderr, _("txn grouping control encoding error!\n") );
- return EXIT_FAILURE;
- }
-
- err = ber_flatten2( txnber, &c[i].ldctl_value, 0 );
- if( err == -1 ) return EXIT_FAILURE;
-
- c[i].ldctl_oid = LDAP_CONTROL_GROUPING;
+ c[i].ldctl_oid = LDAP_CONTROL_X_TXN_SPEC;
+ c[i].ldctl_value = *txn_id;
c[i].ldctl_iscritical = 1;
i++;
}
#endif
-
- tool_server_controls( ld, c, i );
}
+ tool_server_controls( ld, c, i );
+
rc = 0;
- count = 0;
retval = 0;
- while (( rc == 0 || contoper ) &&
- ( rbuf = read_one_record( fp )) != NULL )
+ lineno = 1;
+ while (( rc == 0 || contoper ) && ldif_read_record( ldiffp, &nextline,
+ &rbuf, &lmax ))
{
- count++;
-
- start = rbuf;
-
if ( rejfp ) {
len = strlen( rbuf );
if (( rejbuf = (char *)ber_memalloc( len+1 )) == NULL ) {
@@ -363,7 +344,8 @@
memcpy( rejbuf, rbuf, len+1 );
}
- rc = process_ldif_rec( start, count );
+ rc = process_ldif_rec( rbuf, lineno );
+ lineno = nextline+1;
if ( rc ) retval = rc;
if ( rc && rejfp ) {
@@ -379,7 +361,7 @@
}
error_msg = NULL;
- ldap_get_option(ld, LDAP_OPT_ERROR_STRING, &error_msg);
+ ldap_get_option(ld, LDAP_OPT_DIAGNOSTIC_MESSAGE, &error_msg);
if ( error_msg != NULL ) {
if ( *error_msg != '\0' ) {
fprintf( rejfp, _(", additional info: %s"), error_msg );
@@ -390,22 +372,26 @@
}
if (rejfp) ber_memfree( rejbuf );
- ber_memfree( rbuf );
}
+ ber_memfree( rbuf );
-#ifdef LDAP_GROUP_TRANSACTION
- if( txn ) {
+#ifdef LDAP_X_TXN
+ if( retval == 0 && txn ) {
+ rc = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, NULL );
+ if ( rc != LDAP_OPT_SUCCESS ) {
+ fprintf( stderr, "Could not unset controls for ldap_txn_end\n");
+ }
+
/* create transaction */
- rc = ldap_txn_end_s( ld, &txnCookie, !txnabort, NULL, NULL );
+ rc = ldap_txn_end_s( ld, !txnabort, txn_id, NULL, NULL, NULL );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_txn_create_s" );
- if( txn > 2 ) return EXIT_FAILURE;
- txn = 0;
+ tool_perror( "ldap_txn_end_s", rc, NULL, NULL, NULL, NULL );
+ retval = rc;
}
}
#endif
- if ( !not ) {
+ if ( !dont ) {
tool_unbind( ld );
}
@@ -419,24 +405,25 @@
static int
-process_ldif_rec( char *rbuf, int count )
+process_ldif_rec( char *rbuf, int linenum )
{
- char *line, *dn, *type, *newrdn, *newsup, *p;
- int rc, linenum, modop, replicaport;
- int expect_modop, expect_sep, expect_ct, expect_newrdn, expect_newsup;
- int expect_deleteoldrdn, deleteoldrdn;
+ char *line, *dn, *newrdn, *newsup;
+ int rc, modop, replicaport;
+ int expect_modop, expect_sep;
+ int deleteoldrdn;
int saw_replica, use_record, new_entry, delete_entry, got_all;
- LDAPMod **pmods;
+ LDAPMod **pmods, *lm = NULL;
int version;
- struct berval val;
LDAPControl **pctrls;
+ int i, j, k, lines, idn, nmods;
+ struct berval *btype, *vals, **bvl, bv;
+ char *freeval;
+ unsigned char *mops = NULL;
new_entry = ldapadd;
rc = got_all = saw_replica = delete_entry = modop = expect_modop = 0;
- expect_deleteoldrdn = expect_newrdn = expect_newsup = 0;
- expect_sep = expect_ct = 0;
- linenum = 0;
+ expect_sep = 0;
version = 0;
deleteoldrdn = 1;
use_record = force;
@@ -444,237 +431,430 @@
pctrls = NULL;
dn = newrdn = newsup = NULL;
+ lines = ldif_countlines( rbuf );
+ btype = ber_memcalloc( 1, (lines+1)*2*sizeof(struct berval)+lines );
+ if ( !btype )
+ return LDAP_NO_MEMORY;
+
+ vals = btype+lines+1;
+ freeval = (char *)(vals+lines+1);
+ i = -1;
+
while ( rc == 0 && ( line = ldif_getline( &rbuf )) != NULL ) {
- ++linenum;
+ int freev;
- if ( expect_sep && strcasecmp( line, T_MODSEPSTR ) == 0 ) {
- expect_sep = 0;
- expect_ct = 1;
+ if ( *line == '\n' || *line == '\0' ) {
+ break;
+ }
+
+ ++i;
+
+ if ( line[0] == '-' && !line[1] ) {
+ BER_BVZERO( btype+i );
+ freeval[i] = 0;
continue;
}
- if ( ldif_parse_line( line, &type, &val.bv_val, &val.bv_len ) < 0 ) {
+ if ( ( rc = ldif_parse_line2( line, btype+i, vals+i, &freev ) ) < 0 ) {
fprintf( stderr, _("%s: invalid format (line %d) entry: \"%s\"\n"),
- prog, linenum, dn == NULL ? "" : dn );
+ prog, linenum+i, dn == NULL ? "" : dn );
rc = LDAP_PARAM_ERROR;
break;
}
+ freeval[i] = freev;
if ( dn == NULL ) {
- if ( !use_record && strcasecmp( type, T_REPLICA_STR ) == 0 ) {
+ if ( !use_record && !BVICMP( btype+i, &BV_REPLICA )) {
+ char *p;
++saw_replica;
- if (( p = strchr( val.bv_val, ':' )) == NULL ) {
+ if (( p = strchr( vals[i].bv_val, ':' )) == NULL ) {
replicaport = 0;
} else {
*p++ = '\0';
if ( lutil_atoi( &replicaport, p ) != 0 ) {
fprintf( stderr, _("%s: unable to parse replica port \"%s\" (line %d) entry: \"%s\"\n"),
- prog, p, linenum, dn == NULL ? "" : dn );
+ prog, p, linenum+i, dn == NULL ? "" : dn );
rc = LDAP_PARAM_ERROR;
break;
}
}
if ( ldaphost != NULL &&
- strcasecmp( val.bv_val, ldaphost ) == 0 &&
+ strcasecmp( vals[i].bv_val, ldaphost ) == 0 &&
replicaport == ldapport )
{
use_record = 1;
}
- } else if ( count == 1 && linenum == 1 &&
- strcasecmp( type, T_VERSION_STR ) == 0 )
- {
+ } else if ( linenum+i == 1 && !BVICMP( btype+i, &BV_VERSION )) {
int v;
- if( val.bv_len == 0 || lutil_atoi( &v, val.bv_val) != 0 || v != 1 ) {
+ if( vals[i].bv_len == 0 || lutil_atoi( &v, vals[i].bv_val) != 0 || v != 1 ) {
fprintf( stderr,
_("%s: invalid version %s, line %d (ignored)\n"),
- prog, val.bv_val, linenum );
+ prog, vals[i].bv_val, linenum );
}
version++;
- } else if ( strcasecmp( type, T_DN_STR ) == 0 ) {
- if (( dn = ber_strdup( val.bv_val )) == NULL ) {
- perror( "strdup" );
- exit( EXIT_FAILURE );
+ } else if ( !BVICMP( btype+i, &BV_DN )) {
+ dn = vals[i].bv_val;
+ idn = i;
+ if ( !use_record && saw_replica ) {
+ printf(_("%s: skipping change record for entry: %s at line %d\n"),
+ prog, dn, linenum+i);
+ printf(_("\t(LDAP host/port does not match replica: lines)\n"));
+ rc = 0;
+ goto leave;
}
- expect_ct = 1;
}
- goto end_line; /* skip all lines until we see "dn:" */
+ /* skip all lines until we see "dn:" */
}
+ }
- if ( expect_ct ) {
- /* Check for "control" tag after dn and before changetype. */
- if (strcasecmp(type, T_CONTROL_STR) == 0) {
- /* Parse and add it to the list of controls */
- rc = parse_ldif_control( line, &pctrls );
- if (rc != 0) {
- fprintf( stderr,
- _("%s: Error processing %s line, line %d: %s\n"),
- prog, T_CONTROL_STR, linenum, ldap_err2string(rc) );
- }
- goto end_line;
- }
+ /* check to make sure there was a dn: line */
+ if ( !dn ) {
+ rc = 0;
+ goto leave;
+ }
- expect_ct = 0;
- if ( !use_record && saw_replica ) {
- printf(_("%s: skipping change record for entry: %s\n"),
- prog, dn);
- printf(_("\t(LDAP host/port does not match replica: lines)\n"));
- ber_memfree( dn );
- ber_memfree( type );
- ber_memfree( val.bv_val );
- return( 0 );
- }
+ lines = i+1;
- if ( strcasecmp( type, T_CHANGETYPESTR ) == 0 ) {
+ if( lines == 0 ) {
+ rc = 0;
+ goto leave;
+ }
+
+ if( version && lines == 1 ) {
+ rc = 0;
+ goto leave;
+ }
+
+ i = idn+1;
+ /* Check for "control" tag after dn and before changetype. */
+ if (!BVICMP( btype+i, &BV_CONTROL)) {
+ /* Parse and add it to the list of controls */
+ rc = parse_ldif_control( vals+i, &pctrls );
+ if (rc != 0) {
+ fprintf( stderr,
+ _("%s: Error processing %s line, line %d: %s\n"),
+ prog, BV_CONTROL.bv_val, linenum+i, ldap_err2string(rc) );
+ }
+ i++;
+ if ( i>= lines ) {
+short_input:
+ fprintf( stderr,
+ _("%s: Expecting more input after %s line, line %d\n"),
+ prog, btype[i-1].bv_val, linenum+i );
+
+ rc = LDAP_PARAM_ERROR;
+ goto leave;
+ }
+ }
+
+ /* Check for changetype */
+ if ( !BVICMP( btype+i, &BV_CHANGETYPE )) {
#ifdef LIBERAL_CHANGETYPE_MODOP
- /* trim trailing spaces (and log warning ...) */
- int icnt;
- for ( icnt = val.bv_len; --icnt > 0; ) {
- if ( !isspace( (unsigned char) val.bv_val[icnt] ) ) {
- break;
- }
- }
+ /* trim trailing spaces (and log warning ...) */
+ int icnt;
+ for ( icnt = vals[i].bv_len; --icnt > 0; ) {
+ if ( !isspace( (unsigned char) vals[i].bv_val[icnt] ) ) {
+ break;
+ }
+ }
- if ( ++icnt != val.bv_len ) {
- fprintf( stderr, _("%s: illegal trailing space after"
- " \"%s: %s\" trimmed (line %d of entry \"%s\")\n"),
- prog, T_CHANGETYPESTR, val.bv_val, linenum, dn );
- val.bv_val[icnt] = '\0';
- }
+ if ( ++icnt != vals[i].bv_len ) {
+ fprintf( stderr, _("%s: illegal trailing space after"
+ " \"%s: %s\" trimmed (line %d, entry \"%s\")\n"),
+ prog, BV_CHANGETYPE.bv_val, vals[i].bv_val, linenum+i, dn );
+ vals[i].bv_val[icnt] = '\0';
+ }
#endif /* LIBERAL_CHANGETYPE_MODOP */
- if ( strcasecmp( val.bv_val, T_MODIFYCTSTR ) == 0 ) {
- new_entry = 0;
- expect_modop = 1;
- } else if ( strcasecmp( val.bv_val, T_ADDCTSTR ) == 0 ) {
- new_entry = 1;
- } else if ( strcasecmp( val.bv_val, T_MODRDNCTSTR ) == 0
- || strcasecmp( val.bv_val, T_MODDNCTSTR ) == 0
- || strcasecmp( val.bv_val, T_RENAMECTSTR ) == 0)
- {
- expect_newrdn = 1;
- } else if ( strcasecmp( val.bv_val, T_DELETECTSTR ) == 0 ) {
- got_all = delete_entry = 1;
- } else {
- fprintf( stderr,
- _("%s: unknown %s \"%s\" (line %d of entry \"%s\")\n"),
- prog, T_CHANGETYPESTR, val.bv_val, linenum, dn );
+ if ( BVICMP( vals+i, &BV_MODIFYCT ) == 0 ) {
+ new_entry = 0;
+ expect_modop = 1;
+ } else if ( BVICMP( vals+i, &BV_ADDCT ) == 0 ) {
+ new_entry = 1;
+ modop = LDAP_MOD_ADD;
+ } else if ( BVICMP( vals+i, &BV_MODRDNCT ) == 0
+ || BVICMP( vals+i, &BV_MODDNCT ) == 0
+ || BVICMP( vals+i, &BV_RENAMECT ) == 0)
+ {
+ i++;
+ if ( i >= lines )
+ goto short_input;
+ if ( BVICMP( btype+i, &BV_NEWRDN )) {
+ fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+ " \"%s:\" (line %d, entry \"%s\")\n"),
+ prog, BV_NEWRDN.bv_val, btype[i].bv_val, linenum+i, dn );
+ rc = LDAP_PARAM_ERROR;
+ goto leave;
+ }
+ newrdn = vals[i].bv_val;
+ i++;
+ if ( i >= lines )
+ goto short_input;
+ if ( BVICMP( btype+i, &BV_DELETEOLDRDN )) {
+ fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+ " \"%s:\" (line %d, entry \"%s\")\n"),
+ prog, BV_DELETEOLDRDN.bv_val, btype[i].bv_val, linenum+i, dn );
+ rc = LDAP_PARAM_ERROR;
+ goto leave;
+ }
+ deleteoldrdn = ( vals[i].bv_val[0] == '0' ) ? 0 : 1;
+ i++;
+ if ( i < lines ) {
+ if ( BVICMP( btype+i, &BV_NEWSUP )) {
+ fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+ " \"%s:\" (line %d, entry \"%s\")\n"),
+ prog, BV_NEWSUP.bv_val, btype[i].bv_val, linenum+i, dn );
rc = LDAP_PARAM_ERROR;
+ goto leave;
}
- goto end_line;
- } else if ( ldapadd ) { /* missing changetype => add */
- new_entry = 1;
- modop = LDAP_MOD_ADD;
- } else {
- expect_modop = 1; /* missing changetype => modify */
+ newsup = vals[i].bv_val;
+ i++;
}
+ got_all = 1;
+ } else if ( BVICMP( vals+i, &BV_DELETECT ) == 0 ) {
+ got_all = delete_entry = 1;
+ } else {
+ fprintf( stderr,
+ _("%s: unknown %s \"%s\" (line %d, entry \"%s\")\n"),
+ prog, BV_CHANGETYPE.bv_val, vals[i].bv_val, linenum+i, dn );
+ rc = LDAP_PARAM_ERROR;
+ goto leave;
}
+ i++;
+ } else if ( ldapadd ) { /* missing changetype => add */
+ new_entry = 1;
+ modop = LDAP_MOD_ADD;
+ } else {
+ expect_modop = 1; /* missing changetype => modify */
+ }
+ if ( got_all ) {
+ if ( i < lines ) {
+ fprintf( stderr,
+ _("%s: extra lines at end (line %d, entry \"%s\")\n"),
+ prog, linenum+i, dn );
+ rc = LDAP_PARAM_ERROR;
+ goto leave;
+ }
+ goto doit;
+ }
+
+ nmods = lines - i;
+ idn = i;
+
+ if ( new_entry ) {
+ int fv;
+
+ /* Make sure all attributes with multiple values are contiguous */
+ for (; i<lines; i++) {
+ for (j=i+1; j<lines; j++) {
+ if ( !BVICMP( btype+i, btype+j )) {
+ nmods--;
+ /* out of order, move intervening attributes down */
+ if ( j != i+1 ) {
+ bv = vals[j];
+ fv = freeval[j];
+ for (k=j; k>i; k--) {
+ btype[k] = btype[k-1];
+ vals[k] = vals[k-1];
+ freeval[k] = freeval[k-1];
+ }
+ k++;
+ btype[k] = btype[i];
+ vals[k] = bv;
+ freeval[k] = fv;
+ }
+ i++;
+ }
+ }
+ }
+ /* Allocate space for array of mods, array of pointers to mods,
+ * and array of pointers to values, allowing for NULL terminators
+ * for the pointer arrays...
+ */
+ lm = ber_memalloc( nmods * sizeof(LDAPMod) +
+ (nmods+1) * sizeof(LDAPMod*) +
+ (lines + nmods - idn) * sizeof(struct berval *));
+ pmods = (LDAPMod **)(lm+nmods);
+ bvl = (struct berval **)(pmods+nmods+1);
+
+ j = 0;
+ k = -1;
+ BER_BVZERO(&bv);
+ for (i=idn; i<lines; i++) {
+ if ( !BVICMP( btype+i, &BV_DN )) {
+ fprintf( stderr, _("%s: attributeDescription \"%s\":"
+ " (possible missing newline"
+ " after line %d, entry \"%s\"?)\n"),
+ prog, btype[i].bv_val, linenum+i - 1, dn );
+ }
+ if ( BVICMP(btype+i,&bv)) {
+ bvl[k++] = NULL;
+ bv = btype[i];
+ lm[j].mod_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES;
+ lm[j].mod_type = bv.bv_val;
+ lm[j].mod_bvalues = bvl+k;
+ pmods[j] = lm+j;
+ j++;
+ }
+ bvl[k++] = vals+i;
+ }
+ bvl[k] = NULL;
+ pmods[j] = NULL;
+ goto doit;
+ }
+
+ mops = ber_memalloc( lines+1 );
+ mops[lines] = M_SEP;
+ mops[i-1] = M_SEP;
+
+ for ( ; i<lines; i++ ) {
if ( expect_modop ) {
#ifdef LIBERAL_CHANGETYPE_MODOP
/* trim trailing spaces (and log warning ...) */
int icnt;
- for ( icnt = val.bv_len; --icnt > 0; ) {
- if ( !isspace( (unsigned char) val.bv_val[icnt] ) ) break;
+ for ( icnt = vals[i].bv_len; --icnt > 0; ) {
+ if ( !isspace( (unsigned char) vals[i].bv_val[icnt] ) ) break;
}
- if ( ++icnt != val.bv_len ) {
+ if ( ++icnt != vals[i].bv_len ) {
fprintf( stderr, _("%s: illegal trailing space after"
- " \"%s: %s\" trimmed (line %d of entry \"%s\")\n"),
- prog, type, val.bv_val, linenum, dn );
- val.bv_val[icnt] = '\0';
+ " \"%s: %s\" trimmed (line %d, entry \"%s\")\n"),
+ prog, type, vals[i].bv_val, linenum+i, dn );
+ vals[i].bv_val[icnt] = '\0';
}
#endif /* LIBERAL_CHANGETYPE_MODOP */
expect_modop = 0;
expect_sep = 1;
- if ( strcasecmp( type, T_MODOPADDSTR ) == 0 ) {
+ if ( BVICMP( btype+i, &BV_MODOPADD ) == 0 ) {
modop = LDAP_MOD_ADD;
- goto end_line;
- } else if ( strcasecmp( type, T_MODOPREPLACESTR ) == 0 ) {
+ mops[i] = M_SEP;
+ nmods--;
+ } else if ( BVICMP( btype+i, &BV_MODOPREPLACE ) == 0 ) {
+ /* defer handling these since they might have no values.
+ * Use the BVALUES flag to signal that these were
+ * deferred. If values are provided later, this
+ * flag will be switched off.
+ */
modop = LDAP_MOD_REPLACE;
- addmodifyop( &pmods, modop, val.bv_val, NULL );
- goto end_line;
- } else if ( strcasecmp( type, T_MODOPDELETESTR ) == 0 ) {
+ mops[i] = modop | LDAP_MOD_BVALUES;
+ btype[i] = vals[i];
+ } else if ( BVICMP( btype+i, &BV_MODOPDELETE ) == 0 ) {
modop = LDAP_MOD_DELETE;
- addmodifyop( &pmods, modop, val.bv_val, NULL );
- goto end_line;
- } else if ( strcasecmp( type, T_MODOPINCREMENTSTR ) == 0 ) {
+ mops[i] = modop | LDAP_MOD_BVALUES;
+ btype[i] = vals[i];
+ } else if ( BVICMP( btype+i, &BV_MODOPINCREMENT ) == 0 ) {
modop = LDAP_MOD_INCREMENT;
- addmodifyop( &pmods, modop, val.bv_val, NULL );
- goto end_line;
- } else { /* no modify op: use default */
- modop = ldapadd ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
- }
- }
-
- if ( expect_newrdn ) {
- if ( strcasecmp( type, T_NEWRDNSTR ) == 0 ) {
- if (( newrdn = ber_strdup( val.bv_val )) == NULL ) {
- perror( "strdup" );
- exit( EXIT_FAILURE );
- }
- expect_deleteoldrdn = 1;
- expect_newrdn = 0;
- } else {
- fprintf( stderr, _("%s: expecting \"%s:\" but saw"
- " \"%s:\" (line %d of entry \"%s\")\n"),
- prog, T_NEWRDNSTR, type, linenum, dn );
+ mops[i] = M_SEP;
+ nmods--;
+ } else { /* no modify op: invalid LDIF */
+ fprintf( stderr, _("%s: modify operation type is missing at"
+ " line %d, entry \"%s\"\n"),
+ prog, linenum+i, dn );
rc = LDAP_PARAM_ERROR;
+ goto leave;
}
- } else if ( expect_deleteoldrdn ) {
- if ( strcasecmp( type, T_DELETEOLDRDNSTR ) == 0 ) {
- deleteoldrdn = ( *val.bv_val == '0' ) ? 0 : 1;
- expect_deleteoldrdn = 0;
- expect_newsup = 1;
- got_all = 1;
- } else {
- fprintf( stderr, _("%s: expecting \"%s:\" but saw"
- " \"%s:\" (line %d of entry \"%s\")\n"),
- prog, T_DELETEOLDRDNSTR, type, linenum, dn );
+ bv = vals[i];
+ } else if ( expect_sep && BER_BVISEMPTY( btype+i )) {
+ mops[i] = M_SEP;
+ expect_sep = 0;
+ expect_modop = 1;
+ nmods--;
+ } else {
+ if ( BVICMP( btype+i, &bv )) {
+ fprintf( stderr, _("%s: wrong attributeType at"
+ " line %d, entry \"%s\"\n"),
+ prog, linenum+i, dn );
rc = LDAP_PARAM_ERROR;
+ goto leave;
}
- } else if ( expect_newsup ) {
- if ( strcasecmp( type, T_NEWSUPSTR ) == 0 ) {
- if (( newsup = ber_strdup( val.bv_val )) == NULL ) {
- perror( "strdup" );
- exit( EXIT_FAILURE );
- }
- expect_newsup = 0;
- } else {
- fprintf( stderr, _("%s: expecting \"%s:\" but saw"
- " \"%s:\" (line %d of entry \"%s\")\n"),
- prog, T_NEWSUPSTR, type, linenum, dn );
- rc = LDAP_PARAM_ERROR;
+ mops[i] = modop;
+ /* If prev op was deferred and matches this type,
+ * clear the flag
+ */
+ if ( (mops[i-1]&LDAP_MOD_BVALUES) && !BVICMP(btype+i,
+ btype+i-1)) {
+ mops[i-1] = M_SEP;
+ nmods--;
}
- } else if ( got_all ) {
- fprintf( stderr,
- _("%s: extra lines at end (line %d of entry \"%s\")\n"),
- prog, linenum, dn );
- rc = LDAP_PARAM_ERROR;
- } else {
- if ( new_entry && strcasecmp( type, T_DN_STR ) == 0 ) {
- fprintf( stderr, _("%s: attributeDescription \"%s\":"
- " (possible missing newline"
- " after line %d of entry \"%s\"?)\n"),
- prog, type, linenum - 1, dn );
- }
- addmodifyop( &pmods, modop, type, &val );
}
-
-end_line:
- ber_memfree( type );
- ber_memfree( val.bv_val );
}
- if( linenum == 0 ) {
- return 0;
+#if 0 /* we should faithfully encode the LDIF, not combine */
+ /* Make sure all modops with multiple values are contiguous */
+ for (i=idn; i<lines; i++) {
+ if ( mops[i] == M_SEP )
+ continue;
+ for (j=i+1; j<lines; j++) {
+ if ( mops[j] == M_SEP || mops[i] != mops[j] )
+ continue;
+ if ( !BVICMP( btype+i, btype+j )) {
+ nmods--;
+ /* out of order, move intervening attributes down */
+ if ( j != i+1 ) {
+ int c;
+ struct berval bv;
+ char fv;
+
+ c = mops[j];
+ bv = vals[j];
+ fv = freeval[j];
+ for (k=j; k>i; k--) {
+ btype[k] = btype[k-1];
+ vals[k] = vals[k-1];
+ freeval[k] = freeval[k-1];
+ mops[k] = mops[k-1];
+ }
+ k++;
+ btype[k] = btype[i];
+ vals[k] = bv;
+ freeval[k] = fv;
+ mops[k] = c;
+ }
+ i++;
+ }
+ }
}
+#endif
- if( version && linenum == 1 ) {
- return 0;
+ /* Allocate space for array of mods, array of pointers to mods,
+ * and array of pointers to values, allowing for NULL terminators
+ * for the pointer arrays...
+ */
+ lm = ber_memalloc( nmods * sizeof(LDAPMod) +
+ (nmods+1) * sizeof(LDAPMod*) +
+ (lines + nmods - idn) * sizeof(struct berval *));
+ pmods = (LDAPMod **)(lm+nmods);
+ bvl = (struct berval **)(pmods+nmods+1);
+
+ j = 0;
+ k = -1;
+ BER_BVZERO(&bv);
+ mops[idn-1] = M_SEP;
+ for (i=idn; i<lines; i++) {
+ if ( mops[i] == M_SEP )
+ continue;
+ if ( mops[i] != mops[i-1] || BVICMP(btype+i,&bv)) {
+ bvl[k++] = NULL;
+ bv = btype[i];
+ lm[j].mod_op = mops[i] | LDAP_MOD_BVALUES;
+ lm[j].mod_type = bv.bv_val;
+ if ( mops[i] & LDAP_MOD_BVALUES ) {
+ lm[j].mod_bvalues = NULL;
+ } else {
+ lm[j].mod_bvalues = bvl+k;
+ }
+ pmods[j] = lm+j;
+ j++;
+ }
+ bvl[k++] = vals+i;
}
+ bvl[k] = NULL;
+ pmods[j] = NULL;
+doit:
/* If default controls are set (as with -M option) and controls are
specified in the LDIF file, we must add the default controls to
the list of controls sent with the ldap operation.
@@ -711,7 +891,6 @@
}
}
-
if ( rc == 0 ) {
if ( delete_entry ) {
rc = dodelete( dn, pctrls );
@@ -726,21 +905,19 @@
}
}
- if ( dn != NULL ) {
- ber_memfree( dn );
+leave:
+ if (pctrls != NULL) {
+ ldap_controls_free( pctrls );
}
- if ( newrdn != NULL ) {
- ber_memfree( newrdn );
+ if ( lm != NULL ) {
+ ber_memfree( lm );
}
- if ( newsup != NULL ) {
- ber_memfree( newsup );
+ if ( mops != NULL ) {
+ ber_memfree( mops );
}
- if ( pmods != NULL ) {
- ldap_mods_free( pmods, 1 );
- }
- if (pctrls != NULL) {
- ldap_controls_free( pctrls );
- }
+ for (i=lines-1; i>=0; i--)
+ if ( freeval[i] ) ber_memfree( vals[i].bv_val );
+ ber_memfree( btype );
return( rc );
}
@@ -753,30 +930,21 @@
*/
static int
parse_ldif_control(
- char *line,
+ struct berval *bval,
LDAPControl ***ppctrls )
{
char *oid = NULL;
int criticality = 0; /* Default is false if not present */
- char *type=NULL;
- char *val = NULL;
- ber_len_t value_len = 0;
int i, rc=0;
- char *s, *oidStart, *pcolon;
+ char *s, *oidStart;
LDAPControl *newctrl = NULL;
LDAPControl **pctrls = NULL;
+ struct berval type, bv;
+ int freeval;
if (ppctrls) pctrls = *ppctrls;
- s = line + strlen(T_CONTROL_STR); /* Skip over "control" */
- pcolon = s; /* Save this position for later */
- if (*s++ != ':') { /* Make sure colon follows */
- return ( LDAP_PARAM_ERROR );
- }
- while (*s && isspace((unsigned char)*s)) {
- s++; /* Skip white space before OID */
- }
-
- /* OID should come next. Validate and extract it. */
+ /* OID should come first. Validate and extract it. */
+ s = bval->bv_val;
if (*s == 0) return ( LDAP_PARAM_ERROR );
oidStart = s;
while (isdigit((unsigned char)*s) || *s == '.') {
@@ -818,17 +986,16 @@
goto cleanup;
}
- /* Shift value down over OID and criticality so it's in the form
- control: value
- control:: base64-value
- control:< url
- Then we can use ldif_parse_line to extract and decode the value
+ /* Back up so value is in the form
+ a: value
+ a:: base64-value
+ a:< url
+ Then we can use ldif_parse_line2 to extract and decode the value
*/
- while ( (*pcolon++ = *s++) != 0) { /* Shift value */
- /* EMPTY */;
- }
- rc = ldif_parse_line(line, &type, &val, &value_len);
- if (type) ber_memfree(type); /* Don't need this field*/
+ s--;
+ *s = 'a';
+
+ rc = ldif_parse_line2(s, &type, &bv, &freeval);
if (rc < 0) {
rc = LDAP_PARAM_ERROR;
goto cleanup;
@@ -844,9 +1011,10 @@
newctrl->ldctl_oid = oid;
oid = NULL;
newctrl->ldctl_iscritical = criticality;
- newctrl->ldctl_value.bv_len = value_len;
- newctrl->ldctl_value.bv_val = val;
- val = NULL;
+ if ( freeval )
+ newctrl->ldctl_value = bv;
+ else
+ ber_dupbv( &newctrl->ldctl_value, &bv );
/* Add the new control to the passed-in list of controls. */
i = 0;
@@ -875,87 +1043,12 @@
}
ber_memfree(newctrl);
}
- if (val) ber_memfree(val);
if (oid) ber_memfree(oid);
return( rc );
}
-static void
-addmodifyop(
- LDAPMod ***pmodsp,
- int modop,
- const char *attr,
- struct berval *val )
-{
- LDAPMod **pmods;
- int i, j;
-
- pmods = *pmodsp;
- modop |= LDAP_MOD_BVALUES;
-
- i = 0;
- if ( pmods != NULL ) {
- for ( ; pmods[ i ] != NULL; ++i ) {
- if ( strcasecmp( pmods[ i ]->mod_type, attr ) == 0 &&
- pmods[ i ]->mod_op == modop )
- {
- break;
- }
- }
- }
-
- if ( pmods == NULL || pmods[ i ] == NULL ) {
- if (( pmods = (LDAPMod **)ber_memrealloc( pmods, (i + 2) *
- sizeof( LDAPMod * ))) == NULL )
- {
- perror( "realloc" );
- exit( EXIT_FAILURE );
- }
-
- *pmodsp = pmods;
- pmods[ i + 1 ] = NULL;
-
- pmods[ i ] = (LDAPMod *)ber_memcalloc( 1, sizeof( LDAPMod ));
- if ( pmods[ i ] == NULL ) {
- perror( "calloc" );
- exit( EXIT_FAILURE );
- }
-
- pmods[ i ]->mod_op = modop;
- pmods[ i ]->mod_type = ber_strdup( attr );
- if ( pmods[ i ]->mod_type == NULL ) {
- perror( "strdup" );
- exit( EXIT_FAILURE );
- }
- }
-
- if ( val != NULL ) {
- j = 0;
- if ( pmods[ i ]->mod_bvalues != NULL ) {
- for ( ; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
- /* Empty */;
- }
- }
-
- pmods[ i ]->mod_bvalues = (struct berval **) ber_memrealloc(
- pmods[ i ]->mod_bvalues, (j + 2) * sizeof( struct berval * ));
- if ( pmods[ i ]->mod_bvalues == NULL ) {
- perror( "ber_realloc" );
- exit( EXIT_FAILURE );
- }
-
- pmods[ i ]->mod_bvalues[ j + 1 ] = NULL;
- pmods[ i ]->mod_bvalues[ j ] = ber_bvdup( val );
- if ( pmods[ i ]->mod_bvalues[ j ] == NULL ) {
- perror( "ber_bvdup" );
- exit( EXIT_FAILURE );
- }
- }
-}
-
-
static int
domodify(
const char *dn,
@@ -1024,12 +1117,12 @@
}
if ( newentry ) {
- printf( "%sadding new entry \"%s\"\n", not ? "!" : "", dn );
+ printf( "%sadding new entry \"%s\"\n", dont ? "!" : "", dn );
} else {
- printf( "%smodifying entry \"%s\"\n", not ? "!" : "", dn );
+ printf( "%smodifying entry \"%s\"\n", dont ? "!" : "", dn );
}
- if ( !not ) {
+ if ( !dont ) {
int msgid;
if ( newentry ) {
rc = ldap_add_ext( ld, dn, pmods, pctrls, NULL, &msgid );
@@ -1040,14 +1133,15 @@
if ( rc != LDAP_SUCCESS ) {
/* print error message about failed update including DN */
fprintf( stderr, _("%s: update failed: %s\n"), prog, dn );
- ldap_perror( ld, newentry ? "ldap_add" : "ldap_modify" );
+ tool_perror( newentry ? "ldap_add" : "ldap_modify",
+ rc, NULL, NULL, NULL, NULL );
goto done;
} else if ( verbose ) {
printf( _("modify complete\n") );
}
rc = process_response( ld, msgid,
- newentry ? "ldap_add" : "ldap_modify", dn );
+ newentry ? LDAP_RES_ADD : LDAP_RES_MODIFY, dn );
} else {
rc = LDAP_SUCCESS;
@@ -1067,18 +1161,18 @@
int rc;
int msgid;
- printf( _("%sdeleting entry \"%s\"\n"), not ? "!" : "", dn );
- if ( !not ) {
+ printf( _("%sdeleting entry \"%s\"\n"), dont ? "!" : "", dn );
+ if ( !dont ) {
rc = ldap_delete_ext( ld, dn, pctrls, NULL, &msgid );
if ( rc != LDAP_SUCCESS ) {
fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn );
- ldap_perror( ld, "ldap_delete" );
+ tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
goto done;
} else if ( verbose ) {
printf( _("delete complete") );
}
- rc = process_response( ld, msgid, "ldap_delete", dn );
+ rc = process_response( ld, msgid, LDAP_RES_DELETE, dn );
} else {
rc = LDAP_SUCCESS;
@@ -1101,23 +1195,23 @@
int rc;
int msgid;
- printf( _("%smodifying rdn of entry \"%s\"\n"), not ? "!" : "", dn );
+ printf( _("%smodifying rdn of entry \"%s\"\n"), dont ? "!" : "", dn );
if ( verbose ) {
printf( _("\tnew RDN: \"%s\" (%skeep existing values)\n"),
newrdn, deleteoldrdn ? _("do not ") : "" );
}
- if ( !not ) {
+ if ( !dont ) {
rc = ldap_rename( ld, dn, newrdn, newsup, deleteoldrdn,
pctrls, NULL, &msgid );
if ( rc != LDAP_SUCCESS ) {
fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn );
- ldap_perror( ld, "ldap_rename" );
+ tool_perror( "ldap_rename", rc, NULL, NULL, NULL, NULL );
goto done;
} else {
printf( _("rename completed\n") );
}
- rc = process_response( ld, msgid, "ldap_rename", dn );
+ rc = process_response( ld, msgid, LDAP_RES_RENAME, dn );
} else {
rc = LDAP_SUCCESS;
@@ -1128,33 +1222,48 @@
return( rc );
}
+static const char *
+res2str( int res ) {
+ switch ( res ) {
+ case LDAP_RES_ADD:
+ return "ldap_add";
+ case LDAP_RES_DELETE:
+ return "ldap_delete";
+ case LDAP_RES_MODIFY:
+ return "ldap_modify";
+ case LDAP_RES_MODRDN:
+ return "ldap_rename";
+ default:
+ assert( 0 );
+ }
+
+ return "ldap_unknown";
+}
+
static int process_response(
LDAP *ld,
int msgid,
- const char *opstr,
+ int op,
const char *dn )
{
LDAPMessage *res;
- int rc = LDAP_OTHER;
+ int rc = LDAP_OTHER, msgtype;
struct timeval tv = { 0, 0 };
+ int err;
+ char *text = NULL, *matched = NULL, **refs = NULL;
+ LDAPControl **ctrls = NULL;
for ( ; ; ) {
tv.tv_sec = 0;
tv.tv_usec = 100000;
- rc = ldap_result( ld, msgid,
-#ifdef LDAP_GROUP_TRANSACTION
- txn ? 0 : 1,
-#else
- 1,
-#endif
- &tv, &res );
+ rc = ldap_result( ld, msgid, LDAP_MSG_ALL, &tv, &res );
if ( tool_check_abandon( ld, msgid ) ) {
return LDAP_CANCELLED;
}
if ( rc == -1 ) {
- ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
+ ldap_get_option( ld, LDAP_OPT_RESULT_CODE, &rc );
tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
return rc;
}
@@ -1164,99 +1273,32 @@
}
}
- if ( ldap_msgtype( res ) != LDAP_RES_INTERMEDIATE ) {
- int code;
- char *matcheddn = NULL, *text = NULL, **refs = NULL;
- LDAPControl **ctrls = NULL;
- rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, &ctrls, 1 );
+ msgtype = ldap_msgtype( res );
- if ( rc != LDAP_SUCCESS ) {
- fprintf( stderr, "%s: ldap_parse_result: %s (%d)\n",
- prog, ldap_err2string( rc ), rc );
- return rc;
- }
+ rc = ldap_parse_result( ld, res, &err, &matched, &text, &refs, &ctrls, 1 );
+ if ( rc == LDAP_SUCCESS ) rc = err;
- if ( code != LDAP_SUCCESS ) {
- tool_perror( prog, code, NULL, matcheddn, text, refs );
- } else if ( verbose &&
- ((matcheddn && *matcheddn) || (text && *text) || (refs && *refs) ))
- {
- printf( _("Delete Result: %s (%d)\n"),
- ldap_err2string( code ), code );
-
- if ( text && *text ) {
- printf( _("Additional info: %s\n"), text );
- }
-
- if ( matcheddn && *matcheddn ) {
- printf( _("Matched DN: %s\n"), matcheddn );
- }
-
- if ( refs ) {
- int i;
- for( i=0; refs[i]; i++ ) {
- printf(_("Referral: %s\n"), refs[i] );
- }
- }
- }
-
- if (ctrls) {
- tool_print_ctrls( ld, ctrls );
- ldap_controls_free( ctrls );
- }
-
- ber_memfree( text );
- ber_memfree( matcheddn );
- ber_memvfree( (void **) refs );
-
- return code;
+#ifdef LDAP_X_TXN
+ if ( rc == LDAP_X_TXN_SPECIFY_OKAY ) {
+ rc = LDAP_SUCCESS;
+ } else
+#endif
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( res2str( op ), rc, NULL, matched, text, refs );
+ } else if ( msgtype != op ) {
+ fprintf( stderr, "%s: msgtype: expected %d got %d\n",
+ res2str( op ), op, msgtype );
+ rc = LDAP_OTHER;
}
-#ifdef LDAP_GROUP_TRANSACTION
- /* assume (successful) transaction intermediate response */
- return LDAP_SUCCESS;
+ if ( text ) ldap_memfree( text );
+ if ( matched ) ldap_memfree( matched );
+ if ( text ) ber_memvfree( (void **)refs );
-#else
- /* intermediate response? */
- return LDAP_DECODING_ERROR;
-#endif
-}
-
-static char *
-read_one_record( FILE *fp )
-{
- char *buf, line[ LDAPMOD_MAXLINE ];
- int lcur, lmax;
-
- lcur = lmax = 0;
- buf = NULL;
-
- while ( fgets( line, sizeof(line), fp ) != NULL ) {
- int len = strlen( line );
-
- if( len < 2 || ( len == 2 && *line == '\r' )) {
- if( buf == NULL ) {
- continue;
- } else {
- break;
- }
- }
-
- if ( lcur + len + 1 > lmax ) {
- lmax = LDAPMOD_MAXLINE
- * (( lcur + len + 1 ) / LDAPMOD_MAXLINE + 1 );
-
- if (( buf = (char *)ber_memrealloc( buf, lmax )) == NULL ) {
- perror( "realloc" );
- exit( EXIT_FAILURE );
- }
- }
-
- strcpy( buf + lcur, line );
- lcur += len;
+ if ( ctrls ) {
+ tool_print_ctrls( ld, ctrls );
+ ldap_controls_free( ctrls );
}
- return( buf );
+ return rc;
}
-
-
Modified: openldap/vendor/openldap-release/clients/tools/ldapmodrdn.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/ldapmodrdn.c 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/ldapmodrdn.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
/* ldapmodrdn.c - generic program to modify an entry's RDN using LDAP */
-/* $OpenLDAP: pkg/ldap/clients/tools/ldapmodrdn.c,v 1.106.2.7 2007/08/13 18:04:39 quanah Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/ldapmodrdn.c,v 1.116.2.3 2007/08/31 23:13:51 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
@@ -52,6 +52,7 @@
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/unistd.h>
+#include <ac/socket.h>
#include <ac/time.h>
#include <ldap.h>
@@ -90,7 +91,7 @@
const char options[] = "rs:"
- "cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
+ "cd:D:e:f:h:H:IMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
@@ -154,7 +155,7 @@
LDAP *ld;
int rc, retval, havedn;
- tool_init();
+ tool_init( TOOL_MODRDN );
prog = lutil_progname( "ldapmodrdn", argc, argv );
tool_args( argc, argv );
@@ -198,9 +199,7 @@
tool_bind( ld );
- if ( assertion || authzid || manageDSAit || noop ) {
- tool_server_controls( ld, NULL, 0 );
- }
+ tool_server_controls( ld, NULL, 0 );
retval = rc = 0;
if (havedn)
@@ -254,7 +253,7 @@
}
}
- if( not ) return LDAP_SUCCESS;
+ if( dont ) return LDAP_SUCCESS;
rc = ldap_rename( ld, dn, rdn, newSuperior, remove,
NULL, NULL, &id );
@@ -277,7 +276,7 @@
rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
if ( rc < 0 ) {
- ldap_perror( ld, "ldapmodrdn: ldap_result" );
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
return rc;
}
Modified: openldap/vendor/openldap-release/clients/tools/ldappasswd.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/ldappasswd.c 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/ldappasswd.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
/* ldappasswd -- a tool for change LDAP passwords */
-/* $OpenLDAP: pkg/ldap/clients/tools/ldappasswd.c,v 1.127.2.7 2007/08/13 18:04:39 quanah Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/ldappasswd.c,v 1.136.2.3 2007/08/31 23:13:51 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
@@ -81,7 +81,7 @@
const char options[] = "a:As:St:T:"
- "d:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
+ "d:D:e:h:H:InO:o:p:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
@@ -179,7 +179,7 @@
struct berval *retdata = NULL;
LDAPControl **ctrls = NULL;
- tool_init();
+ tool_init( TOOL_PASSWD );
prog = lutil_progname( "ldappasswd", argc, argv );
/* LDAPv3 only */
@@ -266,7 +266,7 @@
}
if( user != NULL || oldpw.bv_val != NULL || newpw.bv_val != NULL ) {
- /* build change password control */
+ /* build the password modify request data */
ber = ber_alloc_t( LBER_USE_DER );
if( ber == NULL ) {
@@ -306,7 +306,7 @@
}
}
- if ( not ) {
+ if ( dont ) {
rc = LDAP_SUCCESS;
goto done;
}
@@ -320,7 +320,7 @@
ber_free( ber, 1 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_extended_operation" );
+ tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
rc = EXIT_FAILURE;
goto done;
}
@@ -337,7 +337,7 @@
rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
if ( rc < 0 ) {
- ldap_perror( ld, "ldappasswd: ldap_result" );
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
return rc;
}
@@ -349,14 +349,14 @@
rc = ldap_parse_result( ld, res,
&code, &matcheddn, &text, &refs, &ctrls, 0 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_parse_result" );
+ tool_perror( "ldap_parse_result", rc, NULL, NULL, NULL, NULL );
rc = EXIT_FAILURE;
goto done;
}
rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_parse_extended_result" );
+ tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
rc = EXIT_FAILURE;
goto done;
}
@@ -393,7 +393,6 @@
if( verbose || code != LDAP_SUCCESS ||
matcheddn || text || refs || ctrls )
{
-
printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );
if( text && *text ) {
Modified: openldap/vendor/openldap-release/clients/tools/ldapsearch.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/ldapsearch.c 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/ldapsearch.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
/* ldapsearch -- a tool for searching LDAP directories */
-/* $OpenLDAP: pkg/ldap/clients/tools/ldapsearch.c,v 1.207.2.12 2007/08/13 20:03:51 ando Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/ldapsearch.c,v 1.234.2.5 2007/08/31 23:13:51 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
@@ -71,7 +71,24 @@
#include "common.h"
+#if !LDAP_DEPRECATED
+/*
+ * NOTE: we use this deprecated function only because
+ * we want ldapsearch to provide some client-side sorting
+ * capability.
+ */
+/* from ldap.h */
+typedef int (LDAP_SORT_AD_CMP_PROC) LDAP_P(( /* deprecated */
+ LDAP_CONST char *left,
+ LDAP_CONST char *right ));
+LDAP_F( int ) /* deprecated */
+ldap_sort_entries LDAP_P(( LDAP *ld,
+ LDAPMessage **chain,
+ LDAP_CONST char *attr,
+ LDAP_SORT_AD_CMP_PROC *cmp ));
+#endif
+
static int scope = LDAP_SCOPE_SUBTREE;
static int deref = -1;
static int attrsonly;
@@ -92,7 +109,7 @@
usage( void )
{
fprintf( stderr, _("usage: %s [options] [filter [attributes...]]\nwhere:\n"), prog);
- fprintf( stderr, _(" filter\tRFC-2254 compliant LDAP search filter\n"));
+ fprintf( stderr, _(" filter\tRFC 4515 compliant LDAP search filter\n"));
fprintf( stderr, _(" attributes\twhitespace-separated list of attribute descriptions\n"));
fprintf( stderr, _(" which may include:\n"));
fprintf( stderr, _(" 1.1 no attributes\n"));
@@ -105,29 +122,21 @@
fprintf( stderr, _(" -A retrieve attribute names only (no values)\n"));
fprintf( stderr, _(" -b basedn base dn for search\n"));
fprintf( stderr, _(" -E [!]<ext>[=<extparam>] search extensions (! indicates criticality)\n"));
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
fprintf( stderr, _(" [!]domainScope (domain scope)\n"));
-#endif
+ fprintf( stderr, _(" !dontUseCopy (Don't Use Copy)\n"));
fprintf( stderr, _(" [!]mv=<filter> (matched values filter)\n"));
-#ifdef LDAP_CONTROL_PAGEDRESULTS
fprintf( stderr, _(" [!]pr=<size>[/prompt|noprompt] (paged results/prompt)\n"));
-#endif
-#ifdef LDAP_CONTROL_SUBENTRIES
fprintf( stderr, _(" [!]subentries[=true|false] (subentries)\n"));
-#endif
fprintf( stderr, _(" [!]sync=ro[/<cookie>] (LDAP Sync refreshOnly)\n"));
fprintf( stderr, _(" rp[/<cookie>][/<slimit>] (LDAP Sync refreshAndPersist)\n"));
+ fprintf( stderr, _(" [!]<oid>=:<value> (generic control; no response handling)\n"));
fprintf( stderr, _(" -F prefix URL prefix for files (default: %s)\n"), def_urlpre);
fprintf( stderr, _(" -l limit time limit (in seconds, or \"none\" or \"max\") for search\n"));
fprintf( stderr, _(" -L print responses in LDIFv1 format\n"));
fprintf( stderr, _(" -LL print responses in LDIF format without comments\n"));
fprintf( stderr, _(" -LLL print responses in LDIF format without comments\n"));
fprintf( stderr, _(" and version\n"));
-#ifdef LDAP_SCOPE_SUBORDINATE
fprintf( stderr, _(" -s scope one of base, one, sub or children (search scope)\n"));
-#else /* ! LDAP_SCOPE_SUBORDINATE */
- fprintf( stderr, _(" -s scope one of base, one, or sub (search scope)\n"));
-#endif /* ! LDAP_SCOPE_SUBORDINATE */
fprintf( stderr, _(" -S attr sort the results by attribute `attr'\n"));
fprintf( stderr, _(" -t write binary values to files in temporary directory\n"));
fprintf( stderr, _(" -tt write all values to files in temporary directory\n"));
@@ -160,9 +169,6 @@
LDAPMessage *result,
int search );
-static void print_ctrls(
- LDAPControl **ctrls );
-
static int dosearch LDAP_P((
LDAP *ld,
char *base,
@@ -185,33 +191,49 @@
static int subentries = 0, valuesReturnFilter = 0;
static char *vrFilter = NULL;
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
-static int domainScope = 0;
+#ifdef LDAP_CONTROL_DONTUSECOPY
+static int dontUseCopy = 0;
#endif
+static int domainScope = 0;
+
static int ldapsync = 0;
static struct berval sync_cookie = { 0, NULL };
static int sync_slimit = -1;
-#ifdef LDAP_CONTROL_PAGEDRESULTS
+/* cookie and morePagedResults moved to common.c */
static int pagedResults = 0;
static int pagePrompt = 1;
static ber_int_t pageSize = 0;
static ber_int_t entriesLeft = 0;
-static ber_int_t morePagedResults = 1;
-static struct berval page_cookie = { 0, NULL };
static int npagedresponses;
static int npagedentries;
static int npagedreferences;
static int npagedextended;
static int npagedpartial;
-static int parse_page_control(
- LDAP *ld,
- LDAPMessage *result,
- struct berval *cookie );
-#endif
+static LDAPControl *c = NULL;
+static int nctrls = 0;
+static int save_nctrls = 0;
+static int
+ctrl_add( void )
+{
+ LDAPControl *tmpc;
+
+ nctrls++;
+ tmpc = realloc( c, sizeof( LDAPControl ) * nctrls );
+ if ( tmpc == NULL ) {
+ nctrls--;
+ fprintf( stderr,
+ _("unable to make room for control; out of memory?\n"));
+ return -1;
+ }
+ c = tmpc;
+
+ return 0;
+}
+
static void
urlize(char *url)
{
@@ -227,7 +249,7 @@
const char options[] = "a:Ab:cE:F:l:Ls:S:tT:uz:"
- "Cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
+ "Cd:D:e:f:h:H:IMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
@@ -297,7 +319,6 @@
vrFilter = cvalue;
protocol = LDAP_VERSION3;
-#ifdef LDAP_CONTROL_PAGEDRESULTS
} else if ( strcasecmp( control, "pr" ) == 0 ) {
int num, tmp;
/* PagedResults control */
@@ -338,8 +359,26 @@
pageSize = (ber_int_t) tmp;
pagedResults = 1 + crit;
+#ifdef LDAP_CONTROL_DONTUSECOPY
+ } else if ( strcasecmp( control, "dontUseCopy" ) == 0 ) {
+ if( dontUseCopy ) {
+ fprintf( stderr,
+ _("dontUseCopy control previously specified\n"));
+ exit( EXIT_FAILURE );
+ }
+ if( cvalue != NULL ) {
+ fprintf( stderr,
+ _("dontUseCopy: no control value expected\n") );
+ usage();
+ }
+ if( !crit ) {
+ fprintf( stderr,
+ _("dontUseCopy: critical flag required\n") );
+ usage();
+ }
+
+ dontUseCopy = 1 + crit;
#endif
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
} else if ( strcasecmp( control, "domainScope" ) == 0 ) {
if( domainScope ) {
fprintf( stderr,
@@ -353,9 +392,7 @@
}
domainScope = 1 + crit;
-#endif
-#ifdef LDAP_CONTROL_SUBENTRIES
} else if ( strcasecmp( control, "subentries" ) == 0 ) {
if( subentries ) {
fprintf( stderr,
@@ -373,7 +410,6 @@
exit( EXIT_FAILURE );
}
if( crit ) subentries *= -1;
-#endif
} else if ( strcasecmp( control, "sync" ) == 0 ) {
char *cookiep;
@@ -423,6 +459,44 @@
}
if ( crit ) ldapsync *= -1;
+ } else if ( tool_is_oid( control ) ) {
+ if ( ctrl_add() ) {
+ exit( EXIT_FAILURE );
+ }
+
+ /* OID */
+ c[ nctrls - 1 ].ldctl_oid = control;
+
+ /* value */
+ if ( cvalue == NULL ) {
+ c[ nctrls - 1 ].ldctl_value.bv_val = NULL;
+ c[ nctrls - 1 ].ldctl_value.bv_len = 0;
+
+ } else if ( cvalue[ 0 ] == ':' ) {
+ struct berval type;
+ struct berval value;
+ int freeval;
+
+ cvalue++;
+
+ /* dummy type "x"
+ * to use ldif_parse_line2() */
+ cvalue[ -2 ] = 'x';
+ ldif_parse_line2( &cvalue[ -2 ], &type,
+ &value, &freeval );
+ cvalue[ -2 ] = '\0';
+
+ if ( freeval ) {
+ c[ nctrls - 1 ].ldctl_value = value;
+
+ } else {
+ ber_dupbv( &c[ nctrls - 1 ].ldctl_value, &value );
+ }
+ }
+
+ /* criticality */
+ c[ nctrls - 1 ].ldctl_iscritical = crit;
+
} else {
fprintf( stderr, _("Invalid search extension name: %s\n"),
control );
@@ -463,12 +537,10 @@
scope = LDAP_SCOPE_BASE;
} else if ( strncasecmp( optarg, "one", sizeof("one")-1 ) == 0 ) {
scope = LDAP_SCOPE_ONELEVEL;
-#ifdef LDAP_SCOPE_SUBORDINATE
} else if (( strcasecmp( optarg, "subordinate" ) == 0 )
|| ( strcasecmp( optarg, "children" ) == 0 ))
{
scope = LDAP_SCOPE_SUBORDINATE;
-#endif
} else if ( strncasecmp( optarg, "sub", sizeof("sub")-1 ) == 0 ) {
scope = LDAP_SCOPE_SUBTREE;
} else {
@@ -551,19 +623,18 @@
{
char *filtpattern, **attrs = NULL, line[BUFSIZ];
FILE *fp = NULL;
- int rc, i, first;
+ int rc, i, first;
LDAP *ld = NULL;
- BerElement *seber = NULL, *vrber = NULL, *prber = NULL;
+ BerElement *seber = NULL, *vrber = NULL;
BerElement *syncber = NULL;
struct berval *syncbvalp = NULL;
+ int err;
- tool_init();
+ tool_init( TOOL_SEARCH );
-#ifdef LDAP_CONTROL_PAGEDRESULTS
npagedresponses = npagedentries = npagedreferences =
npagedextended = npagedpartial = 0;
-#endif
prog = lutil_progname( "ldapsearch", argc, argv );
@@ -672,35 +743,50 @@
tool_bind( ld );
getNextPage:
- if ( assertion || authzid || manageDSAit || noop
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
- || domainScope
+ save_nctrls = nctrls;
+ i = nctrls;
+ if ( nctrls > 0
+#ifdef LDAP_CONTROL_DONTUSECOPY
+ || dontUseCopy
#endif
-#ifdef LDAP_CONTROL_PAGEDRESULTS
+ || domainScope
|| pagedResults
-#endif
-#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
- || chaining
-#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
|| ldapsync
- || subentries || valuesReturnFilter )
+ || subentries
+ || valuesReturnFilter )
{
- int err;
- int i=0;
- LDAPControl c[10];
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+#ifdef LDAP_CONTROL_DONTUSECOPY
+ if ( dontUseCopy ) {
+ if ( ctrl_add() ) {
+ return EXIT_FAILURE;
+ }
+
+ c[i].ldctl_oid = LDAP_CONTROL_DONTUSECOPY;
+ c[i].ldctl_value.bv_val = NULL;
+ c[i].ldctl_value.bv_len = 0;
+ c[i].ldctl_iscritical = dontUseCopy > 1;
+ i++;
+ }
+#endif
+
if ( domainScope ) {
+ if ( ctrl_add() ) {
+ return EXIT_FAILURE;
+ }
+
c[i].ldctl_oid = LDAP_CONTROL_X_DOMAIN_SCOPE;
c[i].ldctl_value.bv_val = NULL;
c[i].ldctl_value.bv_len = 0;
c[i].ldctl_iscritical = domainScope > 1;
i++;
}
-#endif
-#ifdef LDAP_CONTROL_SUBENTRIES
if ( subentries ) {
+ if ( ctrl_add() ) {
+ return EXIT_FAILURE;
+ }
+
if (( seber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
return EXIT_FAILURE;
}
@@ -720,9 +806,12 @@
c[i].ldctl_iscritical = subentries < 1;
i++;
}
-#endif
if ( ldapsync ) {
+ if ( ctrl_add() ) {
+ return EXIT_FAILURE;
+ }
+
if (( syncber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
return EXIT_FAILURE;
}
@@ -751,11 +840,15 @@
}
if ( valuesReturnFilter ) {
- if (( vrber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
+ if ( ctrl_add() ) {
return EXIT_FAILURE;
}
- if ( ( err = ldap_put_vrFilter( vrber, vrFilter ) ) == -1 ) {
+ if (( vrber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
+ return EXIT_FAILURE;
+ }
+
+ if ( ( err = ldap_put_vrFilter( vrber, vrFilter ) ) == -1 ) {
ber_free( vrber, 1 );
fprintf( stderr, _("Bad ValuesReturnFilter: %s\n"), vrFilter );
return EXIT_FAILURE;
@@ -770,38 +863,38 @@
i++;
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
if ( pagedResults ) {
- if (( prber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
+ if ( ctrl_add() ) {
return EXIT_FAILURE;
}
- ber_printf( prber, "{iO}", pageSize, &page_cookie );
- if ( ber_flatten2( prber, &c[i].ldctl_value, 0 ) == -1 ) {
+ if ( ldap_create_page_control_value( ld,
+ pageSize, &pr_cookie, &c[i].ldctl_value ) )
+ {
return EXIT_FAILURE;
}
- if ( page_cookie.bv_val != NULL ) {
- ber_memfree( page_cookie.bv_val );
- page_cookie.bv_val = NULL;
+
+ if ( pr_cookie.bv_val != NULL ) {
+ ber_memfree( pr_cookie.bv_val );
+ pr_cookie.bv_val = NULL;
+ pr_cookie.bv_len = 0;
}
c[i].ldctl_oid = LDAP_CONTROL_PAGEDRESULTS;
c[i].ldctl_iscritical = pagedResults > 1;
i++;
}
-#endif
+ }
- tool_server_controls( ld, c, i );
+ tool_server_controls( ld, c, i );
-#ifdef LDAP_CONTROL_SUBENTRIES
- ber_free( seber, 1 );
-#endif
- ber_free( vrber, 1 );
-#ifdef LDAP_CONTROL_PAGEDRESULTS
- ber_free( prber, 1 );
-#endif
- }
-
+ ber_free( seber, 1 );
+ ber_free( vrber, 1 );
+
+ /* step back to the original number of controls, so that
+ * those set while parsing args are preserved */
+ nctrls = save_nctrls;
+
if ( verbose ) {
fprintf( stderr, _("filter%s: %s\nrequesting: "),
infile != NULL ? _(" pattern") : "",
@@ -824,20 +917,21 @@
}
if (ldif < 2 ) {
+ char *realbase = base;
+
+ if ( realbase == NULL ) {
+ ldap_get_option( ld, LDAP_OPT_DEFBASE, (void **)(char *)&realbase );
+ }
+
printf( "#\n" );
printf(_("# LDAPv%d\n"), protocol);
- printf(_("# base <%s> with scope %s\n"),
- base ? base : "",
+ printf(_("# base <%s>%s with scope %s\n"),
+ realbase ? realbase : "",
+ ( realbase == NULL || realbase != base ) ? " (default)" : "",
((scope == LDAP_SCOPE_BASE) ? "baseObject"
: ((scope == LDAP_SCOPE_ONELEVEL) ? "oneLevel"
-#ifdef LDAP_SCOPE_SUBORDINATE
: ((scope == LDAP_SCOPE_SUBORDINATE) ? "children"
-#endif
- : "subtree"
-#ifdef LDAP_SCOPE_SUBORDINATE
- )
-#endif
- )));
+ : "subtree" ))));
printf(_("# filter%s: %s\n"), infile != NULL ? _(" pattern") : "",
filtpattern);
printf(_("# requesting: "));
@@ -867,15 +961,17 @@
printf(_("\n# with valuesReturnFilter %scontrol: %s"),
valuesReturnFilter > 1 ? _("critical ") : "", vrFilter );
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
if ( pagedResults ) {
printf(_("\n# with pagedResults %scontrol: size=%d"),
(pagedResults > 1) ? _("critical ") : "",
pageSize );
}
-#endif
printf( _("\n#\n\n") );
+
+ if ( realbase && realbase != base ) {
+ ldap_memfree( realbase );
+ }
}
if ( infile == NULL ) {
@@ -883,9 +979,8 @@
attrs, attrsonly, NULL, NULL, NULL, -1 );
} else {
- rc = 0;
first = 1;
- while ( rc == 0 && fgets( line, sizeof( line ), fp ) != NULL ) {
+ while ( fgets( line, sizeof( line ), fp ) != NULL ) {
line[ strlen( line ) - 1 ] = '\0';
if ( !first ) {
putchar( '\n' );
@@ -894,14 +989,17 @@
}
rc = dosearch( ld, base, scope, filtpattern, line,
attrs, attrsonly, NULL, NULL, NULL, -1 );
+
+ if ( rc != 0 && !contoper ) {
+ break;
+ }
}
if ( fp != stdin ) {
fclose( fp );
}
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
- if ( ( rc == LDAP_SUCCESS ) && ( pageSize != 0 ) && ( morePagedResults != 0 ) ) {
+ if (( rc == LDAP_SUCCESS ) && pageSize && pr_morePagedResults ) {
char buf[6];
int i, moreEntries, tmpSize;
@@ -928,7 +1026,8 @@
if ( i > 0 && isdigit( (unsigned char)buf[0] ) ) {
int num = sscanf( buf, "%d", &tmpSize );
if ( num != 1 ) {
- fprintf( stderr, _("Invalid value for PagedResultsControl, %s.\n"), buf);
+ fprintf( stderr,
+ _("Invalid value for PagedResultsControl, %s.\n"), buf);
return EXIT_FAILURE;
}
@@ -938,10 +1037,18 @@
goto getNextPage;
}
-#endif
tool_unbind( ld );
tool_destroy();
+
+ if ( c ) {
+ for ( ; save_nctrls-- > 0; ) {
+ ber_memfree( c[ save_nctrls ].ldctl_value.bv_val );
+ }
+ free( c );
+ c = NULL;
+ }
+
return( rc );
}
@@ -974,13 +1081,18 @@
int cancel_msgid = -1;
if( filtpatt != NULL ) {
- filter = malloc( strlen( filtpatt ) + strlen( value ) );
+ size_t max_fsize = strlen( filtpatt ) + strlen( value ) + 1;
+ filter = malloc( max_fsize );
if( filter == NULL ) {
perror( "malloc" );
return EXIT_FAILURE;
}
- sprintf( filter, filtpatt, value );
+ if( snprintf( filter, max_fsize, filtpatt, value ) >= max_fsize ) {
+ fprintf( stderr, "Bad filter pattern: \"%s\"\n", filtpatt );
+ free( filter );
+ return EXIT_FAILURE;
+ }
if ( verbose ) {
fprintf( stderr, _("filter: %s\n"), filter );
@@ -994,7 +1106,10 @@
filter = value;
}
- if ( not ) {
+ if ( dont ) {
+ if ( filtpatt != NULL ) {
+ free( filter );
+ }
return LDAP_SUCCESS;
}
@@ -1052,7 +1167,7 @@
nextended++;
print_extended( ld, msg );
- if( ldap_msgid( msg ) == 0 ) {
+ if ( ldap_msgid( msg ) == 0 ) {
/* unsolicited extended operation */
goto done;
}
@@ -1066,19 +1181,10 @@
break;
case LDAP_RES_SEARCH_RESULT:
+ /* pagedResults stuff is dealt with
+ * in tool_print_ctrls(), called by
+ * print_results(). */
rc = print_result( ld, msg, 1 );
-#ifdef LDAP_CONTROL_PAGEDRESULTS
- if ( pageSize != 0 ) {
- if ( rc == LDAP_SUCCESS ) {
- rc = parse_page_control( ld, msg, &page_cookie );
- } else {
- morePagedResults = 0;
- }
- } else {
- morePagedResults = 0;
- }
-#endif
-
if ( ldapsync == LDAP_SYNC_REFRESH_AND_PERSIST ) {
break;
}
@@ -1112,8 +1218,8 @@
msgidber = ber_alloc_t(LBER_USE_DER);
ber_printf(msgidber, "{i}", msgid);
ber_flatten(msgidber, &msgidvalp);
- ldap_extended_operation(ld, LDAP_EXOP_X_CANCEL,
- msgidvalp, NULL, NULL, &cancel_msgid);
+ ldap_extended_operation(ld, LDAP_EXOP_CANCEL,
+ msgidvalp, NULL, NULL, &cancel_msgid);
nresponses_psearch = -1;
}
}
@@ -1123,28 +1229,34 @@
done:
if ( rc == -1 ) {
- ldap_perror( ld, "ldap_result" );
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
return( rc );
}
ldap_msgfree( res );
-#ifdef LDAP_CONTROL_PAGEDRESULTS
+
if ( pagedResults ) {
npagedresponses += nresponses;
npagedentries += nentries;
npagedextended += nextended;
npagedpartial += npartial;
npagedreferences += nreferences;
- if ( ( morePagedResults == 0 ) && ( ldif < 2 ) ) {
+ if ( ( pr_morePagedResults == 0 ) && ( ldif < 2 ) ) {
printf( _("\n# numResponses: %d\n"), npagedresponses );
- if( npagedentries ) printf( _("# numEntries: %d\n"), npagedentries );
- if( npagedextended ) printf( _("# numExtended: %d\n"), npagedextended );
- if( npagedpartial ) printf( _("# numPartial: %d\n"), npagedpartial );
- if( npagedreferences ) printf( _("# numReferences: %d\n"), npagedreferences );
+ if( npagedentries ) {
+ printf( _("# numEntries: %d\n"), npagedentries );
+ }
+ if( npagedextended ) {
+ printf( _("# numExtended: %d\n"), npagedextended );
+ }
+ if( npagedpartial ) {
+ printf( _("# numPartial: %d\n"), npagedpartial );
+ }
+ if( npagedreferences ) {
+ printf( _("# numReferences: %d\n"), npagedreferences );
+ }
}
- } else
-#endif
- if ( ldif < 2 ) {
+ } else if ( ldif < 2 ) {
printf( _("\n# numResponses: %d\n"), nresponses );
if( nentries ) printf( _("# numEntries: %d\n"), nentries );
if( nextended ) printf( _("# numExtended: %d\n"), nextended );
@@ -1184,12 +1296,12 @@
rc = ldap_get_entry_controls( ld, entry, &ctrls );
if( rc != LDAP_SUCCESS ) {
fprintf(stderr, _("print_entry: %d\n"), rc );
- ldap_perror( ld, "ldap_get_entry_controls" );
+ tool_perror( "ldap_get_entry_controls", rc, NULL, NULL, NULL, NULL );
exit( EXIT_FAILURE );
}
if( ctrls ) {
- print_ctrls( ctrls );
+ tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}
@@ -1282,7 +1394,7 @@
rc = ldap_parse_reference( ld, reference, &refs, &ctrls, 0 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror(ld, "ldap_parse_reference");
+ tool_perror( "ldap_parse_reference", rc, NULL, NULL, NULL, NULL );
exit( EXIT_FAILURE );
}
@@ -1296,7 +1408,7 @@
}
if( ctrls ) {
- print_ctrls( ctrls );
+ tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}
}
@@ -1317,7 +1429,7 @@
&retoid, &retdata, 0 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror(ld, "ldap_parse_extended_result");
+ tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
exit( EXIT_FAILURE );
}
@@ -1355,7 +1467,7 @@
&retoid, &retdata, &ctrls, 0 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror(ld, "ldap_parse_intermediate");
+ tool_perror( "ldap_parse_intermediate", rc, NULL, NULL, NULL, NULL );
exit( EXIT_FAILURE );
}
@@ -1376,7 +1488,7 @@
}
if( ctrls ) {
- print_ctrls( ctrls );
+ tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}
}
@@ -1405,7 +1517,7 @@
&err, &matcheddn, &text, &refs, &ctrls, 0 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror(ld, "ldap_parse_result");
+ tool_perror( "ldap_parse_result", rc, NULL, NULL, NULL, NULL );
exit( EXIT_FAILURE );
}
@@ -1432,13 +1544,28 @@
if( text ) {
if( *text ) {
- if( !ldif ) {
- tool_write_ldif( LDIF_PUT_TEXT, "text",
- text, strlen(text) );
- } else {
- fprintf( stderr, _("Additional information: %s\n"), text );
+ if( !ldif ) {
+ if ( err == LDAP_PARTIAL_RESULTS ) {
+ char *line;
+
+ for ( line = text; line != NULL; ) {
+ char *next = strchr( line, '\n' );
+
+ tool_write_ldif( LDIF_PUT_TEXT,
+ "text", line,
+ next ? next - line : strlen( line ) );
+
+ line = next ? next + 1 : NULL;
+ }
+
+ } else {
+ tool_write_ldif( LDIF_PUT_TEXT, "text",
+ text, strlen(text) );
+ }
+ } else {
+ fprintf( stderr, _("Additional information: %s\n"), text );
+ }
}
- }
ber_memfree( text );
}
@@ -1456,145 +1583,13 @@
ber_memvfree( (void **) refs );
}
+ pr_morePagedResults = 0;
+
if( ctrls ) {
- print_ctrls( ctrls );
+ tool_print_ctrls( ld, ctrls );
ldap_controls_free( ctrls );
}
return err;
}
-static void print_ctrls(
- LDAPControl **ctrls )
-{
- int i;
- for(i=0; ctrls[i] != NULL; i++ ) {
- /* control: OID criticality base64value */
- struct berval *b64 = NULL;
- ber_len_t len;
- char *str;
-
- len = ldif ? 2 : 0;
- len += strlen( ctrls[i]->ldctl_oid );
-
- /* add enough for space after OID and the critical value itself */
- len += ctrls[i]->ldctl_iscritical
- ? sizeof("true") : sizeof("false");
-
- /* convert to base64 */
- if( ctrls[i]->ldctl_value.bv_len ) {
- b64 = ber_memalloc( sizeof(struct berval) );
-
- b64->bv_len = LUTIL_BASE64_ENCODE_LEN(
- ctrls[i]->ldctl_value.bv_len ) + 1;
- b64->bv_val = ber_memalloc( b64->bv_len + 1 );
-
- b64->bv_len = lutil_b64_ntop(
- (unsigned char *) ctrls[i]->ldctl_value.bv_val,
- ctrls[i]->ldctl_value.bv_len,
- b64->bv_val, b64->bv_len );
- }
-
- if( b64 ) {
- len += 1 + b64->bv_len;
- }
-
- str = malloc( len + 1 );
- if ( ldif ) {
- strcpy( str, ": " );
- } else {
- str[0] = '\0';
- }
- strcat( str, ctrls[i]->ldctl_oid );
- strcat( str, ctrls[i]->ldctl_iscritical
- ? " true" : " false" );
-
- if( b64 ) {
- strcat(str, " ");
- strcat(str, b64->bv_val );
- }
-
- if ( ldif < 2 ) {
- tool_write_ldif( ldif ? LDIF_PUT_COMMENT : LDIF_PUT_VALUE,
- "control", str, len );
- }
-
- free( str );
- ber_bvfree( b64 );
- }
-}
-
-#ifdef LDAP_CONTROL_PAGEDRESULTS
-static int
-parse_page_control(
- LDAP *ld,
- LDAPMessage *result,
- struct berval *cookie )
-{
- int rc;
- int err;
- LDAPControl **ctrl = NULL;
- LDAPControl *ctrlp = NULL;
- BerElement *ber;
- ber_tag_t tag;
-
- rc = ldap_parse_result( ld, result,
- &err, NULL, NULL, NULL, &ctrl, 0 );
-
- if( rc != LDAP_SUCCESS ) {
- ldap_perror(ld, "ldap_parse_result");
- exit( EXIT_FAILURE );
- }
-
- if ( err != LDAP_SUCCESS ) {
- fprintf( stderr, "%s (%d)\n", ldap_err2string(err), err );
- }
-
- if ( ctrl ) {
- /* There might be others, e.g. ppolicy... */
- ctrlp = ldap_find_control( LDAP_CONTROL_PAGEDRESULTS, ctrl );
- }
-
- if ( ctrlp ) {
- /* Parse the control value
- * searchResult ::= SEQUENCE {
- * size INTEGER (0..maxInt),
- * -- result set size estimate from server - unused
- * cookie OCTET STRING
- * }
- */
- ctrlp = *ctrl;
- ber = ber_init( &ctrlp->ldctl_value );
- if ( ber == NULL ) {
- fprintf( stderr, _("Internal error.\n") );
- return EXIT_FAILURE;
- }
-
- tag = ber_scanf( ber, "{io}", &entriesLeft, cookie );
- (void) ber_free( ber, 1 );
-
- if( tag == LBER_ERROR ) {
- fprintf( stderr,
- _("Paged results response control could not be decoded.\n") );
- return EXIT_FAILURE;
- }
-
- if( entriesLeft < 0 ) {
- fprintf( stderr,
- _("Invalid entries estimate in paged results response.\n") );
- return EXIT_FAILURE;
- }
-
- if ( cookie->bv_len == 0 ) {
- morePagedResults = 0;
- }
-
- ldap_controls_free( ctrl );
-
- } else {
- morePagedResults = 0;
- }
-
- return err;
-}
-#endif
Modified: openldap/vendor/openldap-release/clients/tools/ldapwhoami.c
===================================================================
--- openldap/vendor/openldap-release/clients/tools/ldapwhoami.c 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/clients/tools/ldapwhoami.c 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
/* ldapwhoami.c -- a tool for asking the directory "Who Am I?" */
-/* $OpenLDAP: pkg/ldap/clients/tools/ldapwhoami.c,v 1.33.2.6 2007/08/13 18:04:39 quanah Exp $ */
+/* $OpenLDAP: pkg/ldap/clients/tools/ldapwhoami.c,v 1.42.2.2 2007/08/31 23:13:51 quanah Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 1998-2007 The OpenLDAP Foundation.
@@ -62,7 +62,7 @@
const char options[] = ""
- "d:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
+ "d:D:e:h:H:InO:o:p:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
@@ -109,18 +109,15 @@
main( int argc, char *argv[] )
{
int rc;
- char *user = NULL;
-
LDAP *ld = NULL;
-
char *matcheddn = NULL, *text = NULL, **refs = NULL;
char *retoid = NULL;
struct berval *retdata = NULL;
- int id, code=0;
+ int id, code = 0;
LDAPMessage *res;
LDAPControl **ctrls = NULL;
- tool_init();
+ tool_init( TOOL_WHOAMI );
prog = lutil_progname( "ldapwhoami", argc, argv );
/* LDAPv3 only */
@@ -128,12 +125,8 @@
tool_args( argc, argv );
- if( argc - optind > 1 ) {
+ if( argc - optind > 0 ) {
usage();
- } else if ( argc - optind == 1 ) {
- user = strdup( argv[optind] );
- } else {
- user = NULL;
}
if ( pw_file || want_bindpw ) {
@@ -150,19 +143,17 @@
tool_bind( ld );
- if ( not ) {
+ if ( dont ) {
rc = LDAP_SUCCESS;
goto skip;
}
- if ( assertion || authzid || manageDSAit || noop ) {
- tool_server_controls( ld, NULL, 0 );
- }
+ tool_server_controls( ld, NULL, 0 );
rc = ldap_whoami( ld, NULL, NULL, &id );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_whoami" );
+ tool_perror( "ldap_whoami", rc, NULL, NULL, NULL, NULL );
rc = EXIT_FAILURE;
goto skip;
}
@@ -179,7 +170,7 @@
rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
if ( rc < 0 ) {
- ldap_perror( ld, "ldapwhoami: ldap_result" );
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
return rc;
}
@@ -191,8 +182,12 @@
rc = ldap_parse_result( ld, res,
&code, &matcheddn, &text, &refs, &ctrls, 0 );
- if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_parse_result" );
+ if ( rc == LDAP_SUCCESS ) {
+ rc = code;
+ }
+
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_result", rc, NULL, matcheddn, text, refs );
rc = EXIT_FAILURE;
goto skip;
}
@@ -200,7 +195,7 @@
rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_parse_result" );
+ tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
rc = EXIT_FAILURE;
goto skip;
}
Modified: openldap/vendor/openldap-release/configure
===================================================================
--- openldap/vendor/openldap-release/configure 2007-12-15 09:11:30 UTC (rev 880)
+++ openldap/vendor/openldap-release/configure 2007-12-15 09:23:29 UTC (rev 881)
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.560.2.33 2007/06/10 18:39:53 hallvard Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.631.2.7 2007/10/16 23:43:09 quanah Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_LDBM BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT BUILD_SLURPD LDAP_LIBS SLAPD_LIBS SLURPD_LIBS LDBM_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1006,7 +1006,7 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-debug enable debugging [yes]
+ --enable-debug enable debugging no|yes|traditional [yes]
--enable-dynamic enable linking built binaries with dynamic libs [no]
--enable-syslog enable syslog support [auto]
--enable-proctitle enable proctitle support [yes]
@@ -1015,7 +1015,8 @@
SLAPD (Standalone LDAP Daemon) Options:
--enable-slapd enable building slapd [yes]
- --enable-aci enable per-object ACIs (experimental) [no]
+ --enable-dynacl enable run-time loadable ACL support (experimental) [no]
+ --enable-aci enable per-object ACIs (experimental) no|yes|mod [no]
--enable-cleartext enable cleartext passwords [yes]
--enable-crypt enable crypt(3) passwords [no]
--enable-lmpasswd enable LAN Manager passwords [no]
@@ -1033,9 +1034,6 @@
--enable-dnssrv enable dnssrv backend no|yes|mod [no]
--enable-hdb enable Hierarchical DB backend no|yes|mod [yes]
--enable-ldap enable ldap backend no|yes|mod [no]
- --enable-ldbm enable ldbm backend no|yes|mod [no]
- --enable-ldbm-api use LDBM API auto|berkeley|bcompat|mdbm|gdbm [auto]
- --enable-ldbm-type use LDBM type auto|btree|hash [auto]
--enable-meta enable metadirectory backend no|yes|mod [no]
--enable-monitor enable monitor backend no|yes|mod [yes]
--enable-null enable null backend no|yes|mod [no]
@@ -1049,23 +1047,22 @@
--enable-overlays enable all available overlays no|yes|mod
--enable-accesslog In-Directory Access Logging overlay no|yes|mod [no]
--enable-auditlog Audit Logging overlay no|yes|mod [no]
- --enable-denyop Deny Operation overlay no|yes|mod [no]
+ --enable-constraint Attribute Constraint overlay no|yes|mod [no]
+ --enable-dds Dynamic Directory Services overlay no|yes|mod [no]
--enable-dyngroup Dynamic Group overlay no|yes|mod [no]
--enable-dynlist Dynamic List overlay no|yes|mod [no]
- --enable-lastmod Last Modification overlay no|yes|mod [no]
+ --enable-memberof Reverse Group Membership overlay no|yes|mod [no]
--enable-ppolicy Password Policy overlay no|yes|mod [no]
--enable-proxycache Proxy Cache overlay no|yes|mod [no]
--enable-refint Referential Integrity overlay no|yes|mod [no]
--enable-retcode Return Code testing overlay no|yes|mod [no]
--enable-rwm Rewrite/Remap overlay no|yes|mod [no]
+ --enable-seqmod Sequential Modify overlay no|yes|mod [yes]
--enable-syncprov Syncrepl Provider overlay no|yes|mod [yes]
--enable-translucent Translucent Proxy overlay no|yes|mod [no]
--enable-unique Attribute Uniqueness overlay no|yes|mod [no]
--enable-valsort Value Sorting overlay no|yes|mod [no]
-SLURPD (Replication Daemon) Options:
- --enable-slurpd enable building slurpd [auto]
-
Library Generation & Linking Options
--enable-static[=PKGS]
build static libraries [default=yes]
@@ -1084,11 +1081,10 @@
--with-cyrus-sasl with Cyrus SASL support [auto]
--with-fetch with fetch(3) URL support [auto]
--with-threads with threads [auto]
- --with-tls with TLS/SSL support [auto]
+ --with-tls with TLS/SSL support auto|openssl|gnutls [auto]
--with-yielding-select with implicitly yielding select [auto]
--with-mp with multiple precision statistics auto|longlong|long|bignum|gmp [auto]
--with-odbc with specific ODBC support iodbc|unixodbc|auto [auto]
-
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
@@ -1597,8 +1593,11 @@
SHTOOL="$ac_cv_shtool"
-TB="`$SHTOOL echo -e '%B' 2>/dev/null`"
-TN="`$SHTOOL echo -e '%b' 2>/dev/null`"
+TB="" TN=""
+if test -t 1; then
+ TB="`$SHTOOL echo -e '%B' 2>/dev/null`"
+ TN="`$SHTOOL echo -e '%b' 2>/dev/null`"
+fi
OPENLDAP_CVS=""
if test -d $ac_aux_dir/CVS; then
@@ -2177,7 +2176,7 @@
enableval="$enable_debug"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes traditional ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2263,7 +2262,6 @@
fi;
# end --enable-proctitle
ol_enable_referrals=${ol_enable_referrals-no}
-ol_enable_kbind=${ol_enable_kbind-no}
# OpenLDAP --enable-ipv6
# Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -2357,7 +2355,6 @@
ol_with_fetch="auto"
fi; # end --with-fetch
-ol_with_kerberos=${ol_with_kerberos-auto}
# OpenLDAP --with-threads
# Check whether --with-threads or --without-threads was given.
@@ -2388,7 +2385,7 @@
withval="$with_tls"
ol_arg=invalid
- for ol_val in auto openssl yes no ; do
+ for ol_val in auto openssl gnutls yes no ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2503,6 +2500,29 @@
ol_enable_slapd=yes
fi;
# end --enable-slapd
+# OpenLDAP --enable-dynacl
+
+ # Check whether --enable-dynacl or --disable-dynacl was given.
+if test "${enable_dynacl+set}" = set; then
+ enableval="$enable_dynacl"
+
+ ol_arg=invalid
+ for ol_val in auto yes no ; do
+ if test "$enableval" = "$ol_val" ; then
+ ol_arg="$ol_val"
+ fi
+ done
+ if test "$ol_arg" = "invalid" ; then
+ { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-dynacl" >&5
+echo "$as_me: error: bad value $enableval for --enable-dynacl" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ ol_enable_dynacl="$ol_arg"
+
+else
+ ol_enable_dynacl=no
+fi;
+# end --enable-dynacl
# OpenLDAP --enable-aci
# Check whether --enable-aci or --disable-aci was given.
@@ -2510,7 +2530,7 @@
enableval="$enable_aci"
ol_arg=invalid
- for ol_val in auto yes no ; do
+ for ol_val in no yes mod ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
@@ -2641,7 +2661,6 @@
ol_enable_modules=no
fi;
# end --enable-modules
-ol_enable_multimaster=${ol_enable_multimaster-no}
# OpenLDAP --enable-rewrite
# Check whether --enable-rewrite or --disable-rewrite was given.
@@ -2762,7 +2781,6 @@
dnssrv \
hdb \
ldap \
- ldbm \
meta \
monitor \
null \
@@ -2891,95 +2909,6 @@
ol_enable_ldap=${ol_enable_backends:-no}
fi;
# end --enable-ldap
-# OpenLDAP --enable-ldbm
-
- # Check whether --enable-ldbm or --disable-ldbm was given.
-if test "${enable_ldbm+set}" = set; then
- enableval="$enable_ldbm"
-
- ol_arg=invalid
- for ol_val in no yes mod ; do
- if test "$enableval" = "$ol_val" ; then
- ol_arg="$ol_val"
- fi
- done
- if test "$ol_arg" = "invalid" ; then
- { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-ldbm" >&5
-echo "$as_me: error: bad value $enableval for --enable-ldbm" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ol_enable_ldbm="$ol_arg"
-
-else
- ol_enable_ldbm=${ol_enable_backends:-no}
-fi;
-# end --enable-ldbm
-
-# Check whether --with-ldbm_api or --without-ldbm_api was given.
-if test "${with_ldbm_api+set}" = set; then
- withval="$with_ldbm_api"
-
- { echo "$as_me:$LINENO: WARNING: Please use --enable-ldbm-api instead of --with-ldbm-api" >&5
-echo "$as_me: WARNING: Please use --enable-ldbm-api instead of --with-ldbm-api" >&2;}
- enable_ldbm_api="$with_ldbm_api"
-fi;
-# OpenLDAP --enable-ldbm_api
-
- # Check whether --enable-ldbm_api or --disable-ldbm_api was given.
-if test "${enable_ldbm_api+set}" = set; then
- enableval="$enable_ldbm_api"
-
- ol_arg=invalid
- for ol_val in auto berkeley bcompat mdbm gdbm ; do
- if test "$enableval" = "$ol_val" ; then
- ol_arg="$ol_val"
- fi
- done
- if test "$ol_arg" = "invalid" ; then
- { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-ldbm_api" >&5
-echo "$as_me: error: bad value $enableval for --enable-ldbm_api" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ol_enable_ldbm_api="$ol_arg"
-
-else
- ol_enable_ldbm_api=auto
-fi;
-# end --enable-ldbm_api
-
-
-# Check whether --with-ldbm_type or --without-ldbm_type was given.
-if test "${with_ldbm_type+set}" = set; then
- withval="$with_ldbm_type"
-
- { echo "$as_me:$LINENO: WARNING: Please use --enable-ldbm-type instead of --with-ldbm-type" >&5
-echo "$as_me: WARNING: Please use --enable-ldbm-type instead of --with-ldbm-type" >&2;}
- enable_ldbm_type="$with_ldbm_type"
-fi;
-# OpenLDAP --enable-ldbm_type
-
- # Check whether --enable-ldbm_type or --disable-ldbm_type was given.
-if test "${enable_ldbm_type+set}" = set; then
- enableval="$enable_ldbm_type"
-
- ol_arg=invalid
- for ol_val in auto btree hash ; do
- if test "$enableval" = "$ol_val" ; then
- ol_arg="$ol_val"
- fi
- done
- if test "$ol_arg" = "invalid" ; then
- { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-ldbm_type" >&5
-echo "$as_me: error: bad value $enableval for --enable-ldbm_type" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ol_enable_ldbm_type="$ol_arg"
-
-else
- ol_enable_ldbm_type=auto
-fi;
-# end --enable-ldbm_type
-
# OpenLDAP --enable-meta
# Check whether --enable-meta or --disable-meta was given.
@@ -3167,15 +3096,17 @@
Overlays="accesslog \
auditlog \
- denyop \
+ constraint \
+ dds \
dyngroup \
dynlist \
- lastmod \
+ memberof \
ppolicy \
proxycache \
refint \
retcode \
rwm \
+ seqmod \
syncprov \
translucent \
unique \
@@ -3256,11 +3187,11 @@
fi;
# end --enable-auditlog
-# OpenLDAP --enable-denyop
+# OpenLDAP --enable-constraint
- # Check whether --enable-denyop or --disable-denyop was given.
-if test "${enable_denyop+set}" = set; then
- enableval="$enable_denyop"
+ # Check whether --enable-constraint or --disable-constraint was given.
+if test "${enable_constraint+set}" = set; then
+ enableval="$enable_constraint"
ol_arg=invalid
for ol_val in no yes mod ; do
@@ -3269,17 +3200,41 @@
fi
done
if test "$ol_arg" = "invalid" ; then
- { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-denyop" >&5
-echo "$as_me: error: bad value $enableval for --enable-denyop" >&2;}
+ { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-constraint" >&5
+echo "$as_me: error: bad value $enableval for --enable-constraint" >&2;}
{ (exit 1); exit 1; }; }
fi
- ol_enable_denyop="$ol_arg"
+ ol_enable_constraint="$ol_arg"
else
- ol_enable_denyop=${ol_enable_overlays:-no}
+ ol_enable_constraint=${ol_enable_overlays:-no}
fi;
-# end --enable-denyop
+# end --enable-constraint
+# OpenLDAP --enable-dds
+
+ # Check whether --enable-dds or --disable-dds was given.
+if test "${enable_dds+set}" = set; then
+ enableval="$enable_dds"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; do
+ if test "$enableval" = "$ol_val" ; then
+ ol_arg="$ol_val"
+ fi
+ done
+ if test "$ol_arg" = "invalid" ; then
+ { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-dds" >&5
+echo "$as_me: error: bad value $enableval for --enable-dds" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ ol_enable_dds="$ol_arg"
+
+else
+ ol_enable_dds=${ol_enable_overlays:-no}
+fi;
+# end --enable-dds
+
# OpenLDAP --enable-dyngroup
# Check whether --enable-dyngroup or --disable-dyngroup was given.
@@ -3328,11 +3283,11 @@
fi;
# end --enable-dynlist
-# OpenLDAP --enable-lastmod
+# OpenLDAP --enable-memberof
- # Check whether --enable-lastmod or --disable-lastmod was given.
-if test "${enable_lastmod+set}" = set; then
- enableval="$enable_lastmod"
+ # Check whether --enable-memberof or --disable-memberof was given.
+if test "${enable_memberof+set}" = set; then
+ enableval="$enable_memberof"
ol_arg=invalid
for ol_val in no yes mod ; do
@@ -3341,16 +3296,16 @@
fi
done
if test "$ol_arg" = "invalid" ; then
- { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-lastmod" >&5
-echo "$as_me: error: bad value $enableval for --enable-lastmod" >&2;}
+ { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-memberof" >&5
+echo "$as_me: error: bad value $enableval for --enable-memberof" >&2;}
{ (exit 1); exit 1; }; }
fi
- ol_enable_lastmod="$ol_arg"
+ ol_enable_memberof="$ol_arg"
else
- ol_enable_lastmod=${ol_enable_overlays:-no}
+ ol_enable_memberof=${ol_enable_overlays:-no}
fi;
-# end --enable-lastmod
+# end --enable-memberof
# OpenLDAP --enable-ppolicy
@@ -3472,6 +3427,30 @@
fi;
# end --enable-rwm
+# OpenLDAP --enable-seqmod
+
+ # Check whether --enable-seqmod or --disable-seqmod was given.
+if test "${enable_seqmod+set}" = set; then
+ enableval="$enable_seqmod"
+
+ ol_arg=invalid
+ for ol_val in no yes mod ; do
+ if test "$enableval" = "$ol_val" ; then
+ ol_arg="$ol_val"
+ fi
+ done
+ if test "$ol_arg" = "invalid" ; then
+ { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-seqmod" >&5
+echo "$as_me: error: bad value $enableval for --enable-seqmod" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ ol_enable_seqmod="$ol_arg"
+
+else
+ ol_enable_seqmod=${ol_enable_overlays:-yes}
+fi;
+# end --enable-seqmod
+
# OpenLDAP --enable-syncprov
# Check whether --enable-syncprov or --disable-syncprov was given.
@@ -3569,35 +3548,6 @@
# end --enable-valsort
-# Check whether --enable-xxslurpdoptions or --disable-xxslurpdoptions was given.
-if test "${enable_xxslurpdoptions+set}" = set; then
- enableval="$enable_xxslurpdoptions"
-
-fi;
-# OpenLDAP --enable-slurpd
-
- # Check whether --enable-slurpd or --disable-slurpd was given.
-if test "${enable_slurpd+set}" = set; then
- enableval="$enable_slurpd"
-
- ol_arg=invalid
- for ol_val in auto yes no ; do
- if test "$enableval" = "$ol_val" ; then
- ol_arg="$ol_val"
- fi
- done
- if test "$ol_arg" = "invalid" ; then
- { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-slurpd" >&5
-echo "$as_me: error: bad value $enableval for --enable-slurpd" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ol_enable_slurpd="$ol_arg"
-
-else
- ol_enable_slurpd=auto
-fi;
-# end --enable-slurpd
-
# Check whether --enable-xxliboptions or --disable-xxliboptions was given.
if test "${enable_xxliboptions+set}" = set; then
enableval="$enable_xxliboptions"
@@ -3675,10 +3625,6 @@
{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-modules argument" >&5
echo "$as_me: WARNING: slapd disabled, ignoring --enable-modules argument" >&2;}
fi
- if test $ol_enable_multimaster = yes ; then
- { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-multimaster argument" >&5
-echo "$as_me: WARNING: slapd disabled, ignoring --enable-multimaster argument" >&2;}
- fi
if test $ol_enable_wrappers = yes ; then
{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-wrappers argument" >&5
echo "$as_me: WARNING: slapd disabled, ignoring --enable-wrappers argument" >&2;}
@@ -3687,23 +3633,14 @@
{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-rlookups argument" >&5
echo "$as_me: WARNING: slapd disabled, ignoring --enable-rlookups argument" >&2;}
fi
- if test $ol_enable_aci = yes ; then
+ if test $ol_enable_dynacl = yes ; then
+ { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-dynacl argument" >&5
+echo "$as_me: WARNING: slapd disabled, ignoring --enable-dynacl argument" >&2;}
+ fi
+ if test $ol_enable_aci != no ; then
{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-aci argument" >&5
echo "$as_me: WARNING: slapd disabled, ignoring --enable-aci argument" >&2;}
fi
- if test $ol_enable_ldbm_api != auto ; then
- { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-ldbm-api argument" >&5
-echo "$as_me: WARNING: slapd disabled, ignoring --enable-ldbm-api argument" >&2;}
- fi
- if test $ol_enable_ldbm_type != auto ; then
- { echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-ldbm-type argument" >&5
-echo "$as_me: WARNING: slapd disabled, ignoring --enable-ldbm-type argument" >&2;}
- fi
- if test $ol_enable_slurpd = yes ; then
- { { echo "$as_me:$LINENO: error: slurpd requires slapd" >&5
-echo "$as_me: error: slurpd requires slapd" >&2;}
- { (exit 1); exit 1; }; }
- fi
if test $ol_enable_rewrite = yes ; then
{ echo "$as_me:$LINENO: WARNING: slapd disabled, ignoring --enable-rewrite argument" >&5
echo "$as_me: WARNING: slapd disabled, ignoring --enable-rewrite argument" >&2;}
@@ -3727,91 +3664,36 @@
ol_enable_backends=
ol_enable_overlays=
ol_enable_modules=no
- ol_enable_multimaster=no
ol_enable_rlookups=no
+ ol_enable_dynacl=no
ol_enable_aci=no
ol_enable_wrappers=no
- ol_enable_ldbm_api=no
- ol_enable_ldbm_type=no
-
- ol_enable_slurpd=no
-
ol_enable_rewrite=no
-elif test $ol_enable_ldbm = no ; then
+elif test $ol_enable_modules != yes &&
+ test $ol_enable_bdb = no &&
+ test $ol_enable_dnssrv = no &&
+ test $ol_enable_hdb = no &&
+ test $ol_enable_ldap = no &&
+ test $ol_enable_meta = no &&
+ test $ol_enable_monitor = no &&
+ test $ol_enable_null = no &&
+ test $ol_enable_passwd = no &&
+ test $ol_enable_perl = no &&
+ test $ol_enable_relay = no &&
+ test $ol_enable_shell = no &&
+ test $ol_enable_sql = no ; then
- if test $ol_enable_ldbm_api != auto ; then
- { echo "$as_me:$LINENO: WARNING: LDBM disabled, ignoring --enable-ldbm-api argument" >&5
-echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-api argument" >&2;}
- fi
-
- if test $ol_enable_ldbm_type != auto ; then
- { echo "$as_me:$LINENO: WARNING: LDBM disabled, ignoring --enable-ldbm-type argument" >&5
-echo "$as_me: WARNING: LDBM disabled, ignoring --enable-ldbm-type argument" >&2;}
- fi
-
- if test $ol_enable_modules != yes &&
- test $ol_enable_bdb = no &&
- test $ol_enable_dnssrv = no &&
- test $ol_enable_hdb = no &&
- test $ol_enable_ldap = no &&
- test $ol_enable_meta = no &&
- test $ol_enable_monitor = no &&
- test $ol_enable_null = no &&
- test $ol_enable_passwd = no &&
- test $ol_enable_perl = no &&
- test $ol_enable_relay = no &&
- test $ol_enable_shell = no &&
- test $ol_enable_sql = no ; then
-
- if test $ol_enable_slapd = yes ; then
- { { echo "$as_me:$LINENO: error: slapd requires a backend" >&5
+ if test $ol_enable_slapd = yes ; then
+ { { echo "$as_me:$LINENO: error: slapd requires a backend" >&5
echo "$as_me: error: slapd requires a backend" >&2;}
{ (exit 1); exit 1; }; }
- else
- { echo "$as_me:$LINENO: WARNING: skipping slapd, no backend specified" >&5
+ else
+ { echo "$as_me:$LINENO: WARNING: skipping slapd, no backend specified" >&5
echo "$as_me: WARNING: skipping slapd, no backend specified" >&2;}
- ol_enable_slapd=no
- fi
+ ol_enable_slapd=no
fi
-
- ol_enable_ldbm_api=no
- ol_enable_ldbm_type=no
-
- if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
- ol_enable_ldbm_api=berkeley
- fi
-
-else
- if test $ol_enable_ldbm_api = gdbm &&
- test $ol_enable_ldbm_type = btree ; then
- { { echo "$as_me:$LINENO: error: GDBM only supports LDBM type hash" >&5
-echo "$as_me: error: GDBM only supports LDBM type hash" >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test $ol_enable_ldbm_api = mdbm &&
- test $ol_enable_ldbm_type = btree ; then
- { { echo "$as_me:$LINENO: error: MDBM only supports LDBM type hash" >&5
-echo "$as_me: error: MDBM only supports LDBM type hash" >&2;}
- { (exit 1); exit 1; }; }
- fi
- if test $ol_enable_ldbm_api = ndbm &&
- test $ol_enable_ldbm_type = btree ; then
- { { echo "$as_me:$LINENO: error: NDBM only supports LDBM type hash" >&5
-echo "$as_me: error: NDBM only supports LDBM type hash" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- if test $ol_enable_bdb/$ol_enable_hdb != no/no ; then
- if test $ol_enable_ldbm_api = auto ; then
- ol_enable_ldbm_api=berkeley
- elif test $ol_enable_ldbm_api != berkeley ; then
- { { echo "$as_me:$LINENO: error: LDBM API not compatible with BDB/HDB" >&5
-echo "$as_me: error: LDBM API not compatible with BDB/HDB" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
fi
if test $ol_enable_meta/$ol_enable_ldap = yes/no ; then
@@ -3820,14 +3702,6 @@
{ (exit 1); exit 1; }; }
fi
-if test $ol_enable_slurpd = yes ; then
- if test $ol_with_threads = no ; then
- { { echo "$as_me:$LINENO: error: slurpd requires threads" >&5
-echo "$as_me: error: slurpd requires threads" >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
-
if test $ol_enable_lmpasswd = yes ; then
if test $ol_with_tls = no ; then
{ { echo "$as_me:$LINENO: error: LAN Manager passwords require OpenSSL" >&5
@@ -3836,25 +3710,6 @@
fi
fi
-if test $ol_enable_kbind = yes ; then
- if test $ol_with_kerberos = no ; then
- { { echo "$as_me:$LINENO: error: options require --with-kerberos" >&5
-echo "$as_me: error: options require --with-kerberos" >&2;}
- { (exit 1); exit 1; }; }
- elif test $ol_with_kerberos = auto ; then
- ol_with_kerberos=yes
- fi
-
-elif test $ol_enable_kbind = no ; then
- if test $ol_with_kerberos = auto ; then
- ol_with_kerberos=no
- elif test $ol_with_kerberos != no ; then
- { echo "$as_me:$LINENO: WARNING: Kerberos detection enabled unnecessarily" >&5
-echo "$as_me: WARNING: Kerberos detection enabled unnecessarily" >&2;};
- ol_with_kerberos=no
- fi
-fi
-
if test $ol_enable_spasswd = yes ; then
if test $ol_with_cyrus_sasl = no ; then
{ { echo "$as_me:$LINENO: error: options require --with-cyrus-sasl" >&5
@@ -3868,15 +3723,13 @@
echo "${ECHO_T}done" >&6
LDAP_LIBS=
-LDBM_LIBS=
+BDB_LIBS=
LTHREAD_LIBS=
LUTIL_LIBS=
SLAPD_LIBS=
-SLURPD_LIBS=
BUILD_SLAPD=no
-BUILD_SLURPD=no
BUILD_THREAD=no
@@ -3887,7 +3740,6 @@
BUILD_DNSSRV=no
BUILD_HDB=no
BUILD_LDAP=no
-BUILD_LDBM=no
BUILD_META=no
BUILD_MONITOR=no
BUILD_NULL=no
@@ -3899,15 +3751,19 @@
BUILD_ACCESSLOG=no
BUILD_AUDITLOG=no
+BUILD_CONSTRAINT=no
+BUILD_DDS=no
BUILD_DENYOP=no
BUILD_DYNGROUP=no
BUILD_DYNLIST=no
BUILD_LASTMOD=no
+BUILD_MEMBEROF=no
BUILD_PPOLICY=no
BUILD_PROXYCACHE=no
BUILD_REFINT=no
BUILD_RETCODE=no
BUILD_RWM=no
+BUILD_SEQMOD=no
BUILD_SYNCPROV=no
BUILD_TRANSLUCENT=no
BUILD_UNIQUE=no
@@ -3939,6 +3795,7 @@
LIBSLAPI=
LIBSLAPITOOLS=
AUTH_LIBS=
+ICU_LIBS=
SLAPD_SLP_LIBS=
SLAPD_GMP_LIBS=
@@ -5737,7 +5594,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5740 "configure"' > conftest.$ac_ext
+ echo '#line 5597 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7717,11 +7574,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7720: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7577: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7724: \$? = $ac_status" >&5
+ echo "$as_me:7581: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7979,11 +7836,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7982: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7839: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7986: \$? = $ac_status" >&5
+ echo "$as_me:7843: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8041,11 +7898,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8044: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7901: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8048: \$? = $ac_status" >&5
+ echo "$as_me:7905: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10289,7 +10146,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10292 "configure"
+#line 10149 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10387,7 +10244,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10390 "configure"
+#line 10247 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12873,6 +12730,7 @@
fi
echo "$as_me:$LINENO: result: $ol_cv_mkdep" >&5
echo "${ECHO_T}$ol_cv_mkdep" >&6
+ test "$ol_cv_mkdep" = no && OL_MKDEP=":"
else
cc_cv_mkdep=yes
OL_MKDEP_FLAGS="${MKDEP_FLAGS}"
@@ -13965,6 +13823,9 @@
+
+
+
for ac_header in \
arpa/inet.h \
arpa/nameser.h \
@@ -13995,9 +13856,11 @@
sysexits.h \
sys/file.h \
sys/filio.h \
+ sys/fstyp.h \
sys/errno.h \
sys/ioctl.h \
sys/param.h \
+ sys/privgrp.h \
sys/resource.h \
sys/select.h \
sys/socket.h \
@@ -14006,6 +13869,7 @@
sys/time.h \
sys/types.h \
sys/uio.h \
+ sys/vmount.h \
syslog.h \
termios.h \
unistd.h \
@@ -15739,8 +15603,10 @@
fi
done
+if test $ac_cv_func_poll = yes; then
-for ac_header in poll.h
+
+for ac_header in poll.h sys/poll.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -15889,6 +15755,7 @@
done
+fi
for ac_header in sys/epoll.h
@@ -16041,9 +15908,9 @@
done
if test "${ac_cv_header_sys_epoll_h}" = yes; then
-echo "$as_me:$LINENO: checking for epoll system call" >&5
+ echo "$as_me:$LINENO: checking for epoll system call" >&5
echo $ECHO_N "checking for epoll system call... $ECHO_C" >&6
-if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
else
@@ -16053,7 +15920,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-int main(int argc, char *argv)
+int main(int argc, char **argv)
{
int epfd = epoll_create(256);
exit (epfd == -1 ? 1 : 0);
@@ -16090,6 +15957,208 @@
fi
fi
+
+for ac_header in sys/devpoll.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## --------------------------------------------- ##
+## Report this to <http://www.openldap.org/its/> ##
+## --------------------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+if test "${ac_cv_header_sys_devpoll_h}" = yes \
+ -a "${ac_cv_header_poll_h}" = yes ; \
+then
+ echo "$as_me:$LINENO: checking for /dev/poll" >&5
+echo $ECHO_N "checking for /dev/poll... $ECHO_C" >&6
+ if test "$cross_compiling" = yes; then
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+int main(int argc, char **argv)
+{
+ int devpollfd = open("/dev/poll", /* O_RDWR */ 2);
+ exit (devpollfd == -1 ? 1 : 0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DEVPOLL 1
+_ACEOF
+
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+
# strerror checks
echo "$as_me:$LINENO: checking declaration of sys_errlist" >&5
echo $ECHO_N "checking declaration of sys_errlist... $ECHO_C" >&6
@@ -16107,7 +16176,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <errno.h>
-#ifdef WINNT
+#ifdef _WIN32
#include <stdlib.h>
#endif
int
@@ -16472,7 +16541,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <errno.h>
-#ifdef WINNT
+#ifdef _WIN32
#include <stdlib.h>
#endif
int
@@ -16597,25 +16666,23 @@
for ac_header in regex.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -16640,100 +16707,17 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_header_compiler=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## --------------------------------------------- ##
-## Report this to <http://www.openldap.org/its/> ##
-## --------------------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -16743,6 +16727,7 @@
done
+
if test "$ac_cv_header_regex_h" != yes ; then
{ { echo "$as_me:$LINENO: error: POSIX regex.h required." >&5
echo "$as_me: error: POSIX regex.h required." >&2;}
@@ -17248,6 +17233,302 @@
fi
if test $have_uuid = no ; then
+
+for ac_header in uuid/uuid.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## --------------------------------------------- ##
+## Report this to <http://www.openldap.org/its/> ##
+## --------------------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ if test $ac_cv_header_uuid_uuid_h = yes ; then
+ save_LIBS="$LIBS"
+ echo "$as_me:$LINENO: checking for library containing uuid_generate" >&5
+echo $ECHO_N "checking for library containing uuid_generate... $ECHO_C" >&6
+if test "${ac_cv_search_uuid_generate+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+ac_cv_search_uuid_generate=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char uuid_generate ();
+int
+main ()
+{
+uuid_generate ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_search_uuid_generate="none required"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+if test "$ac_cv_search_uuid_generate" = no; then
+ for ac_lib in uuid; do
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char uuid_generate ();
+int
+main ()
+{
+uuid_generate ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_search_uuid_generate="-l$ac_lib"
+break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ done
+fi
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_search_uuid_generate" >&5
+echo "${ECHO_T}$ac_cv_search_uuid_generate" >&6
+if test "$ac_cv_search_uuid_generate" != no; then
+ test "$ac_cv_search_uuid_generate" = "none required" || LIBS="$ac_cv_search_uuid_generate $LIBS"
+ have_uuid=yes
+else
+ :
+fi
+
+ LIBS="$save_LIBS"
+
+ if test have_uuid = yes ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UUID_GENERATE 1
+_ACEOF
+
+
+ test "$ac_cv_search_uuid_generate" = "none required" || \
+ SLAPD_LIBS="$SLAPD_LIBS $ac_cv_search_uuid_generate"
+ fi
+ fi
+fi
+
+if test $have_uuid = no ; then
echo "$as_me:$LINENO: checking to see if -lrpcrt4 is needed for win32 UUID support" >&5
echo $ECHO_N "checking to see if -lrpcrt4 is needed for win32 UUID support... $ECHO_C" >&6
save_LIBS="$LIBS"
@@ -18155,166 +18436,15 @@
fi
fi
-ol_link_kbind=no
-ol_link_krb5=no
-ol_link_krb4=no
-case $ol_with_kerberos in yes | auto | k5 | k5only | k425)
-
-
-for ac_header in krb5.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test $ol_with_tls = yes ; then
+ ol_with_tls=auto
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+ol_link_tls=no
+if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## --------------------------------------------- ##
-## Report this to <http://www.openldap.org/its/> ##
-## --------------------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
- if test $ac_cv_header_krb5_h = yes ; then
-
-for ac_header in heim_err.h
+for ac_header in openssl/ssl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -18463,20 +18593,15 @@
done
- if test $ac_cv_header_heim_err_h = yes ; then
- krb5_impl=heimdal
- else
- krb5_impl=mit
- fi
- if test $krb5_impl = mit; then
- echo "$as_me:$LINENO: checking for main in -lk5crypto" >&5
-echo $ECHO_N "checking for main in -lk5crypto... $ECHO_C" >&6
-if test "${ac_cv_lib_k5crypto_main+set}" = set; then
+ if test $ac_cv_header_openssl_ssl_h = yes ; then
+ echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
+echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6
+if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lk5crypto $LIBS"
+LIBS="-lssl -lcrypto $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -18484,11 +18609,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char SSL_library_init ();
int
main ()
{
-main ();
+SSL_library_init ();
;
return 0;
}
@@ -18515,33 +18646,35 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_k5crypto_main=yes
+ ac_cv_lib_ssl_SSL_library_init=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_k5crypto_main=no
+ac_cv_lib_ssl_SSL_library_init=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_main" >&5
-echo "${ECHO_T}$ac_cv_lib_k5crypto_main" >&6
-if test $ac_cv_lib_k5crypto_main = yes; then
- krb5crypto=k5crypto
+echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6
+if test $ac_cv_lib_ssl_SSL_library_init = yes; then
+ have_openssl=yes
+ need_rsaref=no
else
- krb5crypto=crypto
+ have_openssl=no
fi
- echo "$as_me:$LINENO: checking for main in -lkrb5" >&5
-echo $ECHO_N "checking for main in -lkrb5... $ECHO_C" >&6
-if test "${ac_cv_lib_krb5_main+set}" = set; then
+ if test $have_openssl = no ; then
+ echo "$as_me:$LINENO: checking for ssl3_accept in -lssl" >&5
+echo $ECHO_N "checking for ssl3_accept in -lssl... $ECHO_C" >&6
+if test "${ac_cv_lib_ssl_ssl3_accept+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb5 -l$krb5crypto -lcom_err $LIBS"
+LIBS="-lssl -lcrypto -lRSAglue -lrsaref $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -18549,11 +18682,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char ssl3_accept ();
int
main ()
{
-main ();
+ssl3_accept ();
;
return 0;
}
@@ -18580,596 +18719,100 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_krb5_main=yes
+ ac_cv_lib_ssl_ssl3_accept=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_krb5_main=no
+ac_cv_lib_ssl_ssl3_accept=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_main" >&5
-echo "${ECHO_T}$ac_cv_lib_krb5_main" >&6
-if test $ac_cv_lib_krb5_main = yes; then
- have_krb5=yes
- KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"
+echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_ssl3_accept" >&5
+echo "${ECHO_T}$ac_cv_lib_ssl_ssl3_accept" >&6
+if test $ac_cv_lib_ssl_ssl3_accept = yes; then
+ have_openssl=yes
+ need_rsaref=yes
else
- have_krb5=no
+ have_openssl=no
fi
+ fi
- elif test $krb5_impl = heimdal; then
- echo "$as_me:$LINENO: checking for main in -ldes" >&5
-echo $ECHO_N "checking for main in -ldes... $ECHO_C" >&6
-if test "${ac_cv_lib_des_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldes $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ if test $have_openssl = yes ; then
+ ol_with_tls=openssl
+ ol_link_tls=yes
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_des_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_des_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_des_main" >&5
-echo "${ECHO_T}$ac_cv_lib_des_main" >&6
-if test $ac_cv_lib_des_main = yes; then
- krb5crypto=des
-else
- krb5crypto=crypto
-fi
-
-
- echo "$as_me:$LINENO: checking for main in -lkrb5" >&5
-echo $ECHO_N "checking for main in -lkrb5... $ECHO_C" >&6
-if test "${ac_cv_lib_krb5_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_krb5_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_krb5_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_main" >&5
-echo "${ECHO_T}$ac_cv_lib_krb5_main" >&6
-if test $ac_cv_lib_krb5_main = yes; then
- have_krb5=yes
- KRB5_LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err"
-else
- have_krb5=no
-fi
-
-
-
cat >>confdefs.h <<\_ACEOF
-#define HAVE_HEIMDAL_KERBEROS 1
+#define HAVE_OPENSSL 1
_ACEOF
- else
- have_krb5=no
- { echo "$as_me:$LINENO: WARNING: Unrecognized Kerberos5 Implementation" >&5
-echo "$as_me: WARNING: Unrecognized Kerberos5 Implementation" >&2;}
- fi
+ if test $need_rsaref = yes; then
- if test $have_krb5 = yes ; then
- ol_link_krb5=yes
-
-
cat >>confdefs.h <<\_ACEOF
-#define HAVE_KRB5 1
+#define HAVE_RSAREF 1
_ACEOF
- if test $ol_with_kerberos = k5only ; then
- ol_with_kerberos=found
+ TLS_LIBS="-lssl -lcrypto -lRSAglue -lrsaref"
+ else
+ TLS_LIBS="-lssl -lcrypto"
fi
- elif test $ol_with_kerberos != auto ; then
- { { echo "$as_me:$LINENO: error: Required Kerberos 5 support not available" >&5
-echo "$as_me: error: Required Kerberos 5 support not available" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- fi
- ;;
-esac
-
-if test $ol_link_krb5 = yes &&
- { test $ol_with_kerberos = yes ||
- test $ol_with_kerberos = auto ||
- test $ol_with_kerberos = k425; }; then
-
-
-
-for ac_header in kerberosIV/krb.h kerberosIV/des.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking OpenSSL library version (CRL checking capability)" >&5
+echo $ECHO_N "checking OpenSSL library version (CRL checking capability)... $ECHO_C" >&6
+if test "${ol_cv_ssl_crl_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+#ifdef HAVE_OPENSSL_SSL_H
+#include <openssl/ssl.h>
+#endif
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## --------------------------------------------- ##
-## Report this to <http://www.openldap.org/its/> ##
-## --------------------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+/* Require 0.9.7d+ */
+#if OPENSSL_VERSION_NUMBER >= 0x0090704fL
+ char *__ssl_compat = "0.9.7d";
+#endif
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
-fi
-
-done
-
-
- if test $ac_cv_header_kerberosIV_krb_h = yes ; then
- if test $krb5_impl = mit; then
- echo "$as_me:$LINENO: checking for main in -lkrb4" >&5
-echo $ECHO_N "checking for main in -lkrb4... $ECHO_C" >&6
-if test "${ac_cv_lib_krb4_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "__ssl_compat" >/dev/null 2>&1; then
+ ol_cv_ssl_crl_compat=yes
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb4 -ldes425 -lkrb5 -l$krb5crypto -lcom_err $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_krb4_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_krb4_main=no
+ ol_cv_ssl_crl_compat=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_main" >&5
-echo "${ECHO_T}$ac_cv_lib_krb4_main" >&6
-if test $ac_cv_lib_krb4_main = yes; then
- have_k425=yes
- KRB4_LIBS="-lkrb4 -ldes425"
-else
- have_k425=no
-fi
+rm -f conftest*
-
- elif test $krb5_impl = heimdal; then
- echo "$as_me:$LINENO: checking for main in -lkrb4" >&5
-echo $ECHO_N "checking for main in -lkrb4... $ECHO_C" >&6
-if test "${ac_cv_lib_krb4_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb4 -lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_krb4_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_krb4_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_main" >&5
-echo "${ECHO_T}$ac_cv_lib_krb4_main" >&6
-if test $ac_cv_lib_krb4_main = yes; then
- have_k425=yes
- KRB4_LIBS="-lkrb4"
-else
- have_k425=no
-fi
+echo "$as_me:$LINENO: result: $ol_cv_ssl_crl_compat" >&5
+echo "${ECHO_T}$ol_cv_ssl_crl_compat" >&6
+ if test $ol_cv_ssl_crl_compat = yes ; then
- else
- have_425=no
- { echo "$as_me:$LINENO: WARNING: Unrecongized Kerberos V Implementation" >&5
-echo "$as_me: WARNING: Unrecongized Kerberos V Implementation" >&2;}
- fi
-
- if test $have_k425 = yes ; then
- ol_with_kerberos=found
- ol_link_krb4=yes
-
-
cat >>confdefs.h <<\_ACEOF
-#define HAVE_KRB425 1
+#define HAVE_OPENSSL_CRL 1
_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KRB4 1
-_ACEOF
-
-
- echo "$as_me:$LINENO: checking for des_debug in Kerberos libraries" >&5
-echo $ECHO_N "checking for des_debug in Kerberos libraries... $ECHO_C" >&6
-if test "${ol_cv_var_des_debug+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- save_LIBS="$LIBS"
- LIBS="$KRB4_LIBS $KRB5_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <kerberosIV/krb.h>
-#include <kerberosIV/des.h>
-extern int des_debug;
-
-int
-main ()
-{
-
-des_debug = 1;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_var_des_debug=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_var_des_debug=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$save_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_var_des_debug" >&5
-echo "${ECHO_T}$ol_cv_var_des_debug" >&6
-
- if test $ol_cv_var_des_debug = yes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DES_DEBUG 1
-_ACEOF
-
fi
-
- LIBS="$save_LIBS"
fi
fi
fi
-if test $ol_link_krb5 = yes ; then
- ol_with_kerberos=found
-fi
+if test $ol_link_tls = no ; then
+ if test $ol_with_tls = gnutls || test $ol_with_tls = auto ; then
-case $ol_with_kerberos in yes | auto | k4 | kth)
-
-
-
-
-for ac_header in krb.h des.h krb-archaeology.h
+for ac_header in gnutls/gnutls.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -19319,14 +18962,14 @@
done
- if test $ac_cv_header_krb_h = yes ; then
- echo "$as_me:$LINENO: checking for main in -lkrb" >&5
-echo $ECHO_N "checking for main in -lkrb... $ECHO_C" >&6
-if test "${ac_cv_lib_krb_main+set}" = set; then
+ if test $ac_cv_header_gnutls_gnutls_h = yes ; then
+ echo "$as_me:$LINENO: checking for gnutls_init in -lgnutls" >&5
+echo $ECHO_N "checking for gnutls_init in -lgnutls... $ECHO_C" >&6
+if test "${ac_cv_lib_gnutls_gnutls_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb -ldes $LIBS"
+LIBS="-lgnutls $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19334,283 +18977,17 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_krb_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_krb_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_krb_main" >&5
-echo "${ECHO_T}$ac_cv_lib_krb_main" >&6
-if test $ac_cv_lib_krb_main = yes; then
- have_k4=yes
-else
- have_k4=no
-fi
-
-
- if test $have_k4 = yes ; then
- ol_with_kerberos=found
- ol_link_krb4=yes
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KRB4 1
-_ACEOF
-
-
- KRB4_LIBS="-lkrb -ldes"
-
- if test $ac_cv_header_krb_archaeology_h = yes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KTH_KERBEROS 1
-_ACEOF
-
- fi
- fi
- fi
- ;;
-esac
-
-if test $ol_link_krb4 = yes && test $ol_enable_kbind != no ; then
- ol_link_kbind=yes
-
-elif test $ol_enable_kbind = yes ; then
- { { echo "$as_me:$LINENO: error: Kerberos IV detection failed" >&5
-echo "$as_me: error: Kerberos IV detection failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-if test $ol_link_krb4 = yes || test $ol_link_krb5 = yes ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KERBEROS 1
-_ACEOF
-
-
-elif test $ol_with_kerberos != auto && test $ol_with_kerberos != no ; then
- { { echo "$as_me:$LINENO: error: Kerberos detection failed" >&5
-echo "$as_me: error: Kerberos detection failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-
-ol_link_tls=no
-if test $ol_with_tls != no ; then
-
-for ac_header in openssl/ssl.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## --------------------------------------------- ##
-## Report this to <http://www.openldap.org/its/> ##
-## --------------------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
- if test $ac_cv_header_openssl_ssl_h = yes ; then
- echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
-echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6
-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl -lcrypto $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char SSL_library_init ();
+char gnutls_init ();
int
main ()
{
-SSL_library_init ();
+gnutls_init ();
;
return 0;
}
@@ -19637,174 +19014,40 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_ssl_SSL_library_init=yes
+ ac_cv_lib_gnutls_gnutls_init=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_ssl_SSL_library_init=no
+ac_cv_lib_gnutls_gnutls_init=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6
-if test $ac_cv_lib_ssl_SSL_library_init = yes; then
- have_openssl=yes
- need_rsaref=no
+echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_init" >&5
+echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_init" >&6
+if test $ac_cv_lib_gnutls_gnutls_init = yes; then
+ have_gnutls=yes
else
- have_openssl=no
+ have_gnutls=no
fi
- if test $have_openssl = no ; then
- echo "$as_me:$LINENO: checking for ssl3_accept in -lssl" >&5
-echo $ECHO_N "checking for ssl3_accept in -lssl... $ECHO_C" >&6
-if test "${ac_cv_lib_ssl_ssl3_accept+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl -lcrypto -lRSAglue -lrsaref $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ if test $have_gnutls = yes ; then
+ ol_with_tls=gnutls
+ ol_link_tls=yes
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char ssl3_accept ();
-int
-main ()
-{
-ssl3_accept ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_ssl_ssl3_accept=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ TLS_LIBS="-lgnutls"
-ac_cv_lib_ssl_ssl3_accept=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_ssl3_accept" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_ssl3_accept" >&6
-if test $ac_cv_lib_ssl_ssl3_accept = yes; then
- have_openssl=yes
- need_rsaref=yes
-else
- have_openssl=no
-fi
- fi
-
- if test $have_openssl = yes ; then
- ol_with_tls=found
- ol_link_tls=yes
-
-
cat >>confdefs.h <<\_ACEOF
-#define HAVE_OPENSSL 1
+#define HAVE_GNUTLS 1
_ACEOF
-
- if test $need_rsaref = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RSAREF 1
-_ACEOF
-
-
- TLS_LIBS="-lssl -lcrypto -lRSAglue -lrsaref"
- else
- TLS_LIBS="-lssl -lcrypto"
fi
fi
- echo "$as_me:$LINENO: checking OpenSSL library version (CRL checking capability)" >&5
-echo $ECHO_N "checking OpenSSL library version (CRL checking capability)... $ECHO_C" >&6
-if test "${ol_cv_ssl_crl_compat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_OPENSSL_SSL_H
-#include <openssl/ssl.h>
-#else
-#include <ssl.h>
-#endif
-
-/* Require 0.9.7d+ */
-#if OPENSSL_VERSION_NUMBER >= 0x0090704fL
- char *__ssl_compat = "0.9.7d";
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__ssl_compat" >/dev/null 2>&1; then
- ol_cv_ssl_crl_compat=yes
-else
- ol_cv_ssl_crl_compat=no
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_ssl_crl_compat" >&5
-echo "${ECHO_T}$ol_cv_ssl_crl_compat" >&6
-
- if test $ol_cv_ssl_crl_compat = no ; then
- ol_link_ssl=no
- else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OPENSSL_CRL 1
-_ACEOF
-
- fi
fi
-
-else
- { echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5
-echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
fi
WITH_TLS=no
@@ -19815,17 +19058,18 @@
_ACEOF
WITH_TLS=yes
-
elif test $ol_with_tls = auto ; then
{ echo "$as_me:$LINENO: WARNING: Could not locate TLS/SSL package" >&5
echo "$as_me: WARNING: Could not locate TLS/SSL package" >&2;}
{ echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5
echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
-
elif test $ol_with_tls != no ; then
{ { echo "$as_me:$LINENO: error: Could not locate TLS/SSL package" >&5
echo "$as_me: error: Could not locate TLS/SSL package" >&2;}
{ (exit 1); exit 1; }; }
+else
+ { echo "$as_me:$LINENO: WARNING: TLS data protection not supported!" >&5
+echo "$as_me: WARNING: TLS data protection not supported!" >&2;}
fi
if test $ol_enable_lmpasswd != no; then
@@ -24455,8 +23699,7 @@
fi
-
-for ac_func in pthread_kill pthread_rwlock_destroy
+for ac_func in pthread_kill
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -24558,6 +23801,73 @@
done
+ echo "$as_me:$LINENO: checking for pthread_rwlock_destroy with <pthread.h>" >&5
+echo $ECHO_N "checking for pthread_rwlock_destroy with <pthread.h>... $ECHO_C" >&6
+if test "${ol_cv_func_pthread_rwlock_destroy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <pthread.h>
+pthread_rwlock_t rwlock;
+
+int
+main ()
+{
+pthread_rwlock_destroy(&rwlock);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ol_cv_func_pthread_rwlock_destroy=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ol_cv_func_pthread_rwlock_destroy=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $ol_cv_func_pthread_rwlock_destroy" >&5
+echo "${ECHO_T}$ol_cv_func_pthread_rwlock_destroy" >&6
+ if test $ol_cv_func_pthread_rwlock_destroy = yes ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PTHREAD_RWLOCK_DESTROY 1
+_ACEOF
+
+ fi
+
echo "$as_me:$LINENO: checking for pthread_detach with <pthread.h>" >&5
echo $ECHO_N "checking for pthread_detach with <pthread.h>... $ECHO_C" >&6
if test "${ol_cv_func_pthread_detach+set}" = set; then
@@ -25094,7 +24404,7 @@
#endif
/* make sure task runs first */
-#if HAVE_THR_YIELD
+#ifdef HAVE_THR_YIELD
thr_yield();
#elif defined( HAVE_SCHED_YIELD )
sched_yield();
@@ -27907,14 +27217,12 @@
ol_cv_func_gethostbyaddr_r_nargs=0
fi
-ol_link_ldbm=no
+ol_link_bdb=no
-case $ol_enable_ldbm_api in auto | berkeley | bcompat)
+if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
+ ol_cv_berkeley_db=no
- if test $ol_enable_ldbm_api = bcompat; then \
-
-
-for ac_header in db_185.h db.h
+for ac_header in db.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -28063,51 +27371,9 @@
done
-if test $ac_cv_header_db_185_h = yes || test $ac_cv_header_db_h = yes; then
- echo "$as_me:$LINENO: checking if Berkeley DB header compatibility" >&5
-echo $ECHO_N "checking if Berkeley DB header compatibility... $ECHO_C" >&6
-if test "${ol_cv_header_db1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+if test $ac_cv_header_db_h = yes; then
+ ol_cv_lib_db=no
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#if HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
- /* this check could be improved */
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#if DB_VERSION_MAJOR == 1
- __db_version_1
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version_1" >/dev/null 2>&1; then
- ol_cv_header_db1=yes
-else
- ol_cv_header_db1=no
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_header_db1" >&5
-echo "${ECHO_T}$ol_cv_header_db1" >&6
-
- if test $ol_cv_header_db1 = yes ; then
- ol_cv_lib_db=no
-
echo "$as_me:$LINENO: checking for Berkeley DB major version" >&5
echo $ECHO_N "checking for Berkeley DB major version... $ECHO_C" >&6
if test "${ol_cv_bdb_major+set}" = set; then
@@ -28477,15 +27743,15 @@
echo "${ECHO_T}$ol_cv_bdb_minor" >&6
if test $ol_cv_bdb_major = 4 ; then
- if test $ol_cv_bdb_minor = 5 ; then
+ if test $ol_cv_bdb_minor = 6 ; then
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb45)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb45)... $ECHO_C" >&6
-if test "${ol_cv_db_db45+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.6)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4.6)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_dot_6+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb45
+ ol_DB_LIB=-ldb-4.6
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -28566,12 +27832,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db45=yes
+ ol_cv_db_db_4_dot_6=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db45=no
+ol_cv_db_db_4_dot_6=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -28579,22 +27845,22 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db45" >&5
-echo "${ECHO_T}$ol_cv_db_db45" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_6" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_dot_6" >&6
- if test $ol_cv_db_db45 = yes ; then
- ol_cv_lib_db=-ldb45
+ if test $ol_cv_db_db_4_dot_6 = yes ; then
+ ol_cv_lib_db=-ldb-4.6
fi
fi
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-45)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-45)... $ECHO_C" >&6
-if test "${ol_cv_db_db_45+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb46)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb46)... $ECHO_C" >&6
+if test "${ol_cv_db_db46+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-45
+ ol_DB_LIB=-ldb46
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -28675,12 +27941,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_45=yes
+ ol_cv_db_db46=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_45=no
+ol_cv_db_db46=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -28688,22 +27954,22 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_45" >&5
-echo "${ECHO_T}$ol_cv_db_db_45" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db46" >&5
+echo "${ECHO_T}$ol_cv_db_db46" >&6
- if test $ol_cv_db_db_45 = yes ; then
- ol_cv_lib_db=-ldb-45
+ if test $ol_cv_db_db46 = yes ; then
+ ol_cv_lib_db=-ldb46
fi
fi
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.5)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.5)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_5+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-46)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-46)... $ECHO_C" >&6
+if test "${ol_cv_db_db_46+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-4.5
+ ol_DB_LIB=-ldb-46
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -28784,12 +28050,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_5=yes
+ ol_cv_db_db_46=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_4_dot_5=no
+ol_cv_db_db_46=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -28797,22 +28063,22 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_5" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_5" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_46" >&5
+echo "${ECHO_T}$ol_cv_db_db_46" >&6
- if test $ol_cv_db_db_4_dot_5 = yes ; then
- ol_cv_lib_db=-ldb-4.5
+ if test $ol_cv_db_db_46 = yes ; then
+ ol_cv_lib_db=-ldb-46
fi
fi
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-5)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-5)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_5+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-6)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4-6)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_6+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-4-5
+ ol_DB_LIB=-ldb-4-6
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -28893,12 +28159,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_4_5=yes
+ ol_cv_db_db_4_6=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_4_5=no
+ol_cv_db_db_4_6=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -28906,23 +28172,23 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_5" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_5" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_6" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_6" >&6
- if test $ol_cv_db_db_4_5 = yes ; then
- ol_cv_lib_db=-ldb-4-5
+ if test $ol_cv_db_db_4_6 = yes ; then
+ ol_cv_lib_db=-ldb-4-6
fi
fi
- elif test $ol_cv_bdb_minor = 4 ; then
+ elif test $ol_cv_bdb_minor = 5 ; then
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb44)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb44)... $ECHO_C" >&6
-if test "${ol_cv_db_db44+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.5)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4.5)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_dot_5+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb44
+ ol_DB_LIB=-ldb-4.5
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -29003,12 +28269,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db44=yes
+ ol_cv_db_db_4_dot_5=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db44=no
+ol_cv_db_db_4_dot_5=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -29016,3283 +28282,15 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db44" >&5
-echo "${ECHO_T}$ol_cv_db_db44" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_5" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_dot_5" >&6
- if test $ol_cv_db_db44 = yes ; then
- ol_cv_lib_db=-ldb44
+ if test $ol_cv_db_db_4_dot_5 = yes ; then
+ ol_cv_lib_db=-ldb-4.5
fi
fi
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-44)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-44)... $ECHO_C" >&6
-if test "${ol_cv_db_db_44+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-44
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_44=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_44=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_44" >&5
-echo "${ECHO_T}$ol_cv_db_db_44" >&6
-
- if test $ol_cv_db_db_44 = yes ; then
- ol_cv_lib_db=-ldb-44
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.4)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.4)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_4+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4.4
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_4=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_dot_4=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_4" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_4" >&6
-
- if test $ol_cv_db_db_4_dot_4 = yes ; then
- ol_cv_lib_db=-ldb-4.4
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-4)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-4)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_4+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4-4
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_4=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_4=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_4" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_4" >&6
-
- if test $ol_cv_db_db_4_4 = yes ; then
- ol_cv_lib_db=-ldb-4-4
- fi
-fi
-
- elif test $ol_cv_bdb_minor = 3 ; then
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb43)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb43)... $ECHO_C" >&6
-if test "${ol_cv_db_db43+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb43
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db43=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db43=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db43" >&5
-echo "${ECHO_T}$ol_cv_db_db43" >&6
-
- if test $ol_cv_db_db43 = yes ; then
- ol_cv_lib_db=-ldb43
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-43)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-43)... $ECHO_C" >&6
-if test "${ol_cv_db_db_43+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-43
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_43=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_43=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_43" >&5
-echo "${ECHO_T}$ol_cv_db_db_43" >&6
-
- if test $ol_cv_db_db_43 = yes ; then
- ol_cv_lib_db=-ldb-43
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.3)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.3)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_3+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4.3
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_3=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_dot_3=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_3" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_3" >&6
-
- if test $ol_cv_db_db_4_dot_3 = yes ; then
- ol_cv_lib_db=-ldb-4.3
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-3)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-3)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_3+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4-3
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_3=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_3=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_3" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_3" >&6
-
- if test $ol_cv_db_db_4_3 = yes ; then
- ol_cv_lib_db=-ldb-4-3
- fi
-fi
-
- elif test $ol_cv_bdb_minor = 2 ; then
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb42)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb42)... $ECHO_C" >&6
-if test "${ol_cv_db_db42+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb42
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db42=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db42=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db42" >&5
-echo "${ECHO_T}$ol_cv_db_db42" >&6
-
- if test $ol_cv_db_db42 = yes ; then
- ol_cv_lib_db=-ldb42
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-42)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-42)... $ECHO_C" >&6
-if test "${ol_cv_db_db_42+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-42
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_42=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_42=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_42" >&5
-echo "${ECHO_T}$ol_cv_db_db_42" >&6
-
- if test $ol_cv_db_db_42 = yes ; then
- ol_cv_lib_db=-ldb-42
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.2)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.2)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4.2
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_2=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_dot_2=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_2" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_2" >&6
-
- if test $ol_cv_db_db_4_dot_2 = yes ; then
- ol_cv_lib_db=-ldb-4.2
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-2)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-2)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4-2
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_2=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_2=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_2" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_2" >&6
-
- if test $ol_cv_db_db_4_2 = yes ; then
- ol_cv_lib_db=-ldb-4-2
- fi
-fi
-
- elif test $ol_cv_bdb_minor = 1 ; then
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb41)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb41)... $ECHO_C" >&6
-if test "${ol_cv_db_db41+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb41
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db41=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db41=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db41" >&5
-echo "${ECHO_T}$ol_cv_db_db41" >&6
-
- if test $ol_cv_db_db41 = yes ; then
- ol_cv_lib_db=-ldb41
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-41)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-41)... $ECHO_C" >&6
-if test "${ol_cv_db_db_41+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-41
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_41=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_41=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_41" >&5
-echo "${ECHO_T}$ol_cv_db_db_41" >&6
-
- if test $ol_cv_db_db_41 = yes ; then
- ol_cv_lib_db=-ldb-41
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.1)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.1)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4.1
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_1=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_dot_1=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_1" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_1" >&6
-
- if test $ol_cv_db_db_4_dot_1 = yes ; then
- ol_cv_lib_db=-ldb-4.1
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-1)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-1)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4-1
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_1=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_1=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_1" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_1" >&6
-
- if test $ol_cv_db_db_4_1 = yes ; then
- ol_cv_lib_db=-ldb-4-1
- fi
-fi
-
- fi
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4" >&5
-echo "${ECHO_T}$ol_cv_db_db_4" >&6
-
- if test $ol_cv_db_db_4 = yes ; then
- ol_cv_lib_db=-ldb-4
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb4)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb4)... $ECHO_C" >&6
-if test "${ol_cv_db_db4+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb4
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db4=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db4=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db4" >&5
-echo "${ECHO_T}$ol_cv_db_db4" >&6
-
- if test $ol_cv_db_db4 = yes ; then
- ol_cv_lib_db=-ldb4
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb)... $ECHO_C" >&6
-if test "${ol_cv_db_db+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db" >&5
-echo "${ECHO_T}$ol_cv_db_db" >&6
-
- if test $ol_cv_db_db = yes ; then
- ol_cv_lib_db=-ldb
- fi
-fi
-
-
-elif test $ol_cv_bdb_major = 3 ; then
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb3)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb3)... $ECHO_C" >&6
-if test "${ol_cv_db_db3+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb3
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db3=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db3=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db3" >&5
-echo "${ECHO_T}$ol_cv_db_db3" >&6
-
- if test $ol_cv_db_db3 = yes ; then
- ol_cv_lib_db=-ldb3
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-3)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-3)... $ECHO_C" >&6
-if test "${ol_cv_db_db_3+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-3
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_3=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_3=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_3" >&5
-echo "${ECHO_T}$ol_cv_db_db_3" >&6
-
- if test $ol_cv_db_db_3 = yes ; then
- ol_cv_lib_db=-ldb-3
- fi
-fi
-
-
-elif test $ol_cv_bdb_major = 2 ; then
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb2)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb2)... $ECHO_C" >&6
-if test "${ol_cv_db_db2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb2
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db2=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db2=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db2" >&5
-echo "${ECHO_T}$ol_cv_db_db2" >&6
-
- if test $ol_cv_db_db2 = yes ; then
- ol_cv_lib_db=-ldb2
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-2)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-2)... $ECHO_C" >&6
-if test "${ol_cv_db_db_2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-2
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_2=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_2=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_2" >&5
-echo "${ECHO_T}$ol_cv_db_db_2" >&6
-
- if test $ol_cv_db_db_2 = yes ; then
- ol_cv_lib_db=-ldb-2
- fi
-fi
-
-
-elif test $ol_cv_bdb_major = 1 ; then
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb1)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb1)... $ECHO_C" >&6
-if test "${ol_cv_db_db1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb1
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db1=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db1=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db1" >&5
-echo "${ECHO_T}$ol_cv_db_db1" >&6
-
- if test $ol_cv_db_db1 = yes ; then
- ol_cv_lib_db=-ldb1
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-1)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-1)... $ECHO_C" >&6
-if test "${ol_cv_db_db_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-1
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_1=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_1=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_1" >&5
-echo "${ECHO_T}$ol_cv_db_db_1" >&6
-
- if test $ol_cv_db_db_1 = yes ; then
- ol_cv_lib_db=-ldb-1
- fi
-fi
-
-fi
-if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (default)" >&5
-echo $ECHO_N "checking for Berkeley DB link (default)... $ECHO_C" >&6
-if test "${ol_cv_db_none+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_none=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_none=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_none" >&5
-echo "${ECHO_T}$ol_cv_db_none" >&6
-
- if test $ol_cv_db_none = yes ; then
- ol_cv_lib_db=yes
- fi
-fi
-
-
- if test "$ol_cv_lib_db" != no ; then
- ol_cv_berkeley_db=yes
- fi
- fi
-fi
-
- else
- ol_cv_berkeley_db=no
-
-for ac_header in db.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## --------------------------------------------- ##
-## Report this to <http://www.openldap.org/its/> ##
-## --------------------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-if test $ac_cv_header_db_h = yes; then
- ol_cv_lib_db=no
-
-echo "$as_me:$LINENO: checking for Berkeley DB major version" >&5
-echo $ECHO_N "checking for Berkeley DB major version... $ECHO_C" >&6
-if test "${ol_cv_bdb_major+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_cv_bdb_major=0
- if test $ol_cv_bdb_major = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-#if DB_VERSION_MAJOR == 4
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_major=4
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_major = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-#if DB_VERSION_MAJOR == 3
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_major=3
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_major = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-#if DB_VERSION_MAJOR == 2
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_major=2
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_major = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-#if DB_VERSION_MAJOR == 1
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_major=1
-else
- :
-fi
-rm -f conftest*
-
- fi
-
- if test $ol_cv_bdb_major = 0 ; then
- { { echo "$as_me:$LINENO: error: Unknown Berkeley DB major version" >&5
-echo "$as_me: error: Unknown Berkeley DB major version" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_bdb_major" >&5
-echo "${ECHO_T}$ol_cv_bdb_major" >&6
-
-echo "$as_me:$LINENO: checking for Berkeley DB minor version" >&5
-echo $ECHO_N "checking for Berkeley DB minor version... $ECHO_C" >&6
-if test "${ol_cv_bdb_minor+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_cv_bdb_minor=0
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 9
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=9
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 8
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=8
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 7
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=7
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 6
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=6
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 5
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=5
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 4
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=4
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 3
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=3
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 2
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=2
-else
- :
-fi
-rm -f conftest*
-
- fi
- if test $ol_cv_bdb_minor = 0 ; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <db.h>
-#ifndef DB_VERSION_MINOR
-# define DB_VERSION_MINOR 0
-#endif
-#if DB_VERSION_MINOR == 1
-__db_version
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "__db_version" >/dev/null 2>&1; then
- ol_cv_bdb_minor=1
-else
- :
-fi
-rm -f conftest*
-
- fi
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_bdb_minor" >&5
-echo "${ECHO_T}$ol_cv_bdb_minor" >&6
-
-if test $ol_cv_bdb_major = 4 ; then
- if test $ol_cv_bdb_minor = 5 ; then
- if test $ol_cv_lib_db = no ; then
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb45)" >&5
echo $ECHO_N "checking for Berkeley DB link (-ldb45)... $ECHO_C" >&6
if test "${ol_cv_db_db45+set}" = set; then
@@ -32511,13 +28509,13 @@
fi
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.5)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.5)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_5+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-5)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4-5)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_5+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-4.5
+ ol_DB_LIB=-ldb-4-5
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -32598,12 +28596,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_5=yes
+ ol_cv_db_db_4_5=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_4_dot_5=no
+ol_cv_db_db_4_5=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -32611,22 +28609,23 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_5" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_5" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_5" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_5" >&6
- if test $ol_cv_db_db_4_dot_5 = yes ; then
- ol_cv_lib_db=-ldb-4.5
+ if test $ol_cv_db_db_4_5 = yes ; then
+ ol_cv_lib_db=-ldb-4-5
fi
fi
+ elif test $ol_cv_bdb_minor = 4 ; then
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-5)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-5)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_5+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.4)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4.4)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_dot_4+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-4-5
+ ol_DB_LIB=-ldb-4.4
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -32707,12 +28706,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_4_5=yes
+ ol_cv_db_db_4_dot_4=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_4_5=no
+ol_cv_db_db_4_dot_4=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -32720,15 +28719,14 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_5" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_5" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_4" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_dot_4" >&6
- if test $ol_cv_db_db_4_5 = yes ; then
- ol_cv_lib_db=-ldb-4-5
+ if test $ol_cv_db_db_4_dot_4 = yes ; then
+ ol_cv_lib_db=-ldb-4.4
fi
fi
- elif test $ol_cv_bdb_minor = 4 ; then
if test $ol_cv_lib_db = no ; then
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb44)" >&5
echo $ECHO_N "checking for Berkeley DB link (-ldb44)... $ECHO_C" >&6
@@ -32948,13 +28946,13 @@
fi
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.4)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.4)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_4+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-4)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4-4)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_4+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-4.4
+ ol_DB_LIB=-ldb-4-4
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -33035,12 +29033,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_4=yes
+ ol_cv_db_db_4_4=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_4_dot_4=no
+ol_cv_db_db_4_4=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -33048,22 +29046,23 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_4" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_4" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_4" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_4" >&6
- if test $ol_cv_db_db_4_dot_4 = yes ; then
- ol_cv_lib_db=-ldb-4.4
+ if test $ol_cv_db_db_4_4 = yes ; then
+ ol_cv_lib_db=-ldb-4-4
fi
fi
+ elif test $ol_cv_bdb_minor = 3 ; then
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-4)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-4)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_4+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.3)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4.3)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_dot_3+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-4-4
+ ol_DB_LIB=-ldb-4.3
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -33144,12 +29143,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_4_4=yes
+ ol_cv_db_db_4_dot_3=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_4_4=no
+ol_cv_db_db_4_dot_3=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -33157,15 +29156,14 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_4" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_4" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_3" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_dot_3" >&6
- if test $ol_cv_db_db_4_4 = yes ; then
- ol_cv_lib_db=-ldb-4-4
+ if test $ol_cv_db_db_4_dot_3 = yes ; then
+ ol_cv_lib_db=-ldb-4.3
fi
fi
- elif test $ol_cv_bdb_minor = 3 ; then
if test $ol_cv_lib_db = no ; then
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb43)" >&5
echo $ECHO_N "checking for Berkeley DB link (-ldb43)... $ECHO_C" >&6
@@ -33385,13 +29383,13 @@
fi
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.3)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.3)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_3+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-3)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4-3)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_3+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-4.3
+ ol_DB_LIB=-ldb-4-3
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -33472,12 +29470,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_3=yes
+ ol_cv_db_db_4_3=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_4_dot_3=no
+ol_cv_db_db_4_3=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -33485,22 +29483,23 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_3" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_3" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_3" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_3" >&6
- if test $ol_cv_db_db_4_dot_3 = yes ; then
- ol_cv_lib_db=-ldb-4.3
+ if test $ol_cv_db_db_4_3 = yes ; then
+ ol_cv_lib_db=-ldb-4-3
fi
fi
+ elif test $ol_cv_bdb_minor = 2 ; then
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-3)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4-3)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_3+set}" = set; then
+ echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.2)" >&5
+echo $ECHO_N "checking for Berkeley DB link (-ldb-4.2)... $ECHO_C" >&6
+if test "${ol_cv_db_db_4_dot_2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ol_DB_LIB=-ldb-4-3
+ ol_DB_LIB=-ldb-4.2
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
@@ -33581,12 +29580,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ol_cv_db_db_4_3=yes
+ ol_cv_db_db_4_dot_2=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ol_cv_db_db_4_3=no
+ol_cv_db_db_4_dot_2=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -33594,15 +29593,14 @@
LIBS="$ol_LIBS"
fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_3" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_3" >&6
+echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_2" >&5
+echo "${ECHO_T}$ol_cv_db_db_4_dot_2" >&6
- if test $ol_cv_db_db_4_3 = yes ; then
- ol_cv_lib_db=-ldb-4-3
+ if test $ol_cv_db_db_4_dot_2 = yes ; then
+ ol_cv_lib_db=-ldb-4.2
fi
fi
- elif test $ol_cv_bdb_minor = 2 ; then
if test $ol_cv_lib_db = no ; then
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb42)" >&5
echo $ECHO_N "checking for Berkeley DB link (-ldb42)... $ECHO_C" >&6
@@ -33822,115 +29820,6 @@
fi
if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.2)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.2)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4.2
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_4_dot_2=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_4_dot_2=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_4_dot_2" >&5
-echo "${ECHO_T}$ol_cv_db_db_4_dot_2" >&6
-
- if test $ol_cv_db_db_4_dot_2 = yes ; then
- ol_cv_lib_db=-ldb-4.2
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4-2)" >&5
echo $ECHO_N "checking for Berkeley DB link (-ldb-4-2)... $ECHO_C" >&6
if test "${ol_cv_db_db_4_2+set}" = set; then
@@ -34039,444 +29928,7 @@
fi
fi
- elif test $ol_cv_bdb_minor = 1 ; then
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb41)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb41)... $ECHO_C" >&6
-if test "${ol_cv_db_db41+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb41
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db41=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db41=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db41" >&5
-echo "${ECHO_T}$ol_cv_db_db41" >&6
-
- if test $ol_cv_db_db41 = yes ; then
- ol_cv_lib_db=-ldb41
fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-41)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-41)... $ECHO_C" >&6
-if test "${ol_cv_db_db_41+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-41
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VERSION_MAJOR > 1
- {
- char *version;
- int major, minor, patch;
-
- version = db_version( &major, &minor, &patch );
-
- if( major != DB_VERSION_MAJOR ||
- minor < DB_VERSION_MINOR )
- {
- printf("Berkeley DB version mismatch\n"
- "\theader: %s\n\tlibrary: %s\n",
- DB_VERSION_STRING, version);
- return 1;
- }
- }
-#endif
-
-#if DB_VERSION_MAJOR > 2
- db_env_create( NULL, 0 );
-#elif DB_VERSION_MAJOR > 1
- db_appexit( NULL );
-#else
- (void) dbopen( NULL, 0, 0, 0, NULL);
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ol_cv_db_db_41=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ol_cv_db_db_41=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
- LIBS="$ol_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $ol_cv_db_db_41" >&5
-echo "${ECHO_T}$ol_cv_db_db_41" >&6
-
- if test $ol_cv_db_db_41 = yes ; then
- ol_cv_lib_db=-ldb-41
- fi
-fi
-
- if test $ol_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.1)" >&5
-echo $ECHO_N "checking for Berkeley DB link (-ldb-4.1)... $ECHO_C" >&6
-if test "${ol_cv_db_db_4_dot_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ol_DB_LIB=-ldb-4.1
- ol_LIBS=$LIBS
- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#ifdef HAVE_DB_185_H
-# include <db_185.h>
-#else
-# include <db.h>
-#endif
-
-#ifndef DB_VERSION_MAJOR
-# define DB_VERSION_MAJOR 1
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-int
-main ()
-{
-
-#if DB_VER