From b4cb3e39c693e091436953ad35a36ce46ad54ef4 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 20 Jan 2005 19:03:41 +0000 Subject: [PATCH] Sync with HEAD --- CHANGES | 4 +- COPYRIGHT | 2 +- INSTALL | 2 +- Makefile.in | 2 +- README | 3 +- acconfig.h | 2 +- acinclude.m4 | 2 +- aclocal.m4 | 2 +- build/config.guess | 4 +- build/config.sub | 4 +- build/crupdate | 4 +- build/dir.mk | 2 +- build/info.mk | 2 +- build/lib-shared.mk | 2 +- build/lib-static.mk | 2 +- build/lib.mk | 2 +- build/ltmain.sh | 2 +- build/man.mk | 2 +- build/mkdep | 2 +- build/mkdep.aix | 2 +- build/mkrelease | 11 +- build/mkvers.bat | 2 +- build/mkversion | 6 +- build/mod.mk | 2 +- build/openldap.m4 | 2 +- build/rules.mk | 2 +- build/srv.mk | 2 +- build/top.mk | 2 +- build/version.h | 4 +- build/version.sh | 2 +- build/version.var | 2 +- clients/Makefile.in | 2 +- clients/tools/Makefile.in | 4 +- clients/tools/common.c | 2 +- clients/tools/common.h | 2 +- clients/tools/ldapcompare.c | 2 +- clients/tools/ldapdelete.c | 2 +- clients/tools/ldapmodify.c | 2 +- clients/tools/ldapmodrdn.c | 2 +- clients/tools/ldappasswd.c | 2 +- clients/tools/ldapsearch.c | 2 +- clients/tools/ldapwhoami.c | 2 +- configure | 112 +- configure.in | 116 +- contrib/ldapc++/COPYRIGHT | 2 +- contrib/ldapc++/src/ac/time.h | 2 +- contrib/slapd-modules/comp_match/Makefile | 2 +- contrib/slapd-modules/dsaschema/README | 2 +- contrib/slapd-modules/dsaschema/dsaschema.c | 2 +- contrib/slapd-modules/passwd/README | 2 +- contrib/slapd-modules/passwd/kerberos.c | 2 +- contrib/slapd-modules/passwd/netscape.c | 2 +- contrib/slapd-modules/smbk5pwd/README | 9 +- contrib/slapd-modules/smbk5pwd/smbk5pwd.c | 140 +- contrib/slapd-tools/README | 2 +- contrib/slapi-plugins/addrdnvalues/README | 2 +- doc/Makefile.in | 2 +- doc/man/Makefile.in | 2 +- doc/man/man1/Makefile.in | 2 +- doc/man/man1/ldapcompare.1 | 2 +- doc/man/man1/ldapdelete.1 | 2 +- doc/man/man1/ldapmodify.1 | 2 +- doc/man/man1/ldapmodrdn.1 | 2 +- doc/man/man1/ldappasswd.1 | 2 +- doc/man/man1/ldapsearch.1 | 2 +- doc/man/man1/ldapwhoami.1 | 2 +- doc/man/man3/Makefile.in | 2 +- doc/man/man3/lber-decode.3 | 2 +- doc/man/man3/lber-encode.3 | 2 +- doc/man/man3/lber-memory.3 | 2 +- doc/man/man3/lber-types.3 | 2 +- doc/man/man3/ldap.3 | 2 +- doc/man/man3/ldap_abandon.3 | 2 +- doc/man/man3/ldap_add.3 | 2 +- doc/man/man3/ldap_bind.3 | 2 +- doc/man/man3/ldap_compare.3 | 2 +- doc/man/man3/ldap_delete.3 | 2 +- doc/man/man3/ldap_error.3 | 2 +- doc/man/man3/ldap_first_attribute.3 | 2 +- doc/man/man3/ldap_first_entry.3 | 2 +- doc/man/man3/ldap_first_message.3 | 2 +- doc/man/man3/ldap_first_reference.3 | 2 +- doc/man/man3/ldap_get_dn.3 | 2 +- doc/man/man3/ldap_get_values.3 | 2 +- doc/man/man3/ldap_modify.3 | 2 +- doc/man/man3/ldap_modrdn.3 | 2 +- doc/man/man3/ldap_open.3 | 2 +- doc/man/man3/ldap_parse_reference.3 | 2 +- doc/man/man3/ldap_parse_result.3 | 2 +- doc/man/man3/ldap_result.3 | 2 +- doc/man/man3/ldap_schema.3 | 2 +- doc/man/man3/ldap_search.3 | 2 +- doc/man/man3/ldap_sort.3 | 2 +- doc/man/man3/ldap_url.3 | 2 +- doc/man/man5/Makefile.in | 2 +- doc/man/man5/ldap.conf.5 | 2 +- doc/man/man5/ldif.5 | 2 +- doc/man/man5/slapd-bdb.5 | 8 +- doc/man/man5/slapd-dnssrv.5 | 2 +- doc/man/man5/slapd-ldap.5 | 2 +- doc/man/man5/slapd-ldbm.5 | 8 +- doc/man/man5/slapd-meta.5 | 2 +- doc/man/man5/slapd-monitor.5 | 2 +- doc/man/man5/slapd-passwd.5 | 2 +- doc/man/man5/slapd-shell.5 | 2 +- doc/man/man5/slapd-sql.5 | 320 +++-- doc/man/man5/slapd.access.5 | 17 +- doc/man/man5/slapd.conf.5 | 21 +- doc/man/man5/slapd.plugin.5 | 2 +- doc/man/man5/slapd.replog.5 | 2 +- doc/man/man5/slapo-chain.5 | 2 +- doc/man/man5/slapo-glue.5 | 2 +- doc/man/man5/slapo-lastmod.5 | 2 +- doc/man/man5/slapo-pcache.5 | 2 +- doc/man/man5/slapo-ppolicy.5 | 2 +- doc/man/man5/slapo-refint.5 | 2 +- doc/man/man5/slapo-rwm.5 | 2 +- doc/man/man5/slapo-syncprov.5 | 2 +- doc/man/man5/slapo-unique.5 | 2 +- doc/man/man8/Makefile.in | 2 +- doc/man/man8/slapacl.8 | 2 +- doc/man/man8/slapadd.8 | 30 +- doc/man/man8/slapauth.8 | 2 +- doc/man/man8/slapcat.8 | 14 +- doc/man/man8/slapd.8 | 2 +- doc/man/man8/slapdn.8 | 2 +- doc/man/man8/slapindex.8 | 2 +- doc/man/man8/slappasswd.8 | 8 +- doc/man/man8/slaptest.8 | 2 +- doc/man/man8/slurpd.8 | 2 +- include/Makefile.in | 2 +- include/ac/alloca.h | 2 +- include/ac/assert.h | 2 +- include/ac/bytes.h | 2 +- include/ac/crypt.h | 2 +- include/ac/ctype.h | 2 +- include/ac/dirent.h | 2 +- include/ac/errno.h | 2 +- include/ac/fdset.h | 2 +- include/ac/krb.h | 2 +- include/ac/krb5.h | 2 +- include/ac/localize.h | 2 +- include/ac/param.h | 2 +- include/ac/regex.h | 2 +- include/ac/setproctitle.h | 2 +- include/ac/signal.h | 2 +- include/ac/socket.h | 2 +- include/ac/stdarg.h | 2 +- include/ac/stdlib.h | 2 +- include/ac/string.h | 2 +- include/ac/sysexits.h | 2 +- include/ac/syslog.h | 2 +- include/ac/termios.h | 2 +- include/ac/time.h | 2 +- include/ac/unistd.h | 2 +- include/ac/wait.h | 2 +- include/avl.h | 2 +- include/getopt-compat.h | 2 +- include/lber.h | 2 +- include/lber_pvt.h | 2 +- include/lber_types.h.in | 2 +- include/ldap.h | 7 +- include/ldap_cdefs.h | 2 +- include/ldap_config.h.in | 2 +- include/ldap_defaults.h | 2 +- include/ldap_features.h.in | 2 +- include/ldap_int_thread.h | 2 +- include/ldap_log.h | 2 +- include/ldap_pvt.h | 2 +- include/ldap_pvt_thread.h | 2 +- include/ldap_pvt_uc.h | 2 +- include/ldap_queue.h | 2 +- include/ldap_rq.h | 2 +- include/ldap_schema.h | 2 +- include/ldap_utf8.h | 2 +- include/ldif.h | 9 +- include/lutil.h | 2 +- include/lutil_hash.h | 2 +- include/lutil_ldap.h | 2 +- include/lutil_lockf.h | 2 +- include/lutil_md5.h | 2 +- include/lutil_sha1.h | 2 +- include/portable.h.in | 2 +- include/rewrite.h | 2 +- include/slapi-plugin.h | 2 +- include/sysexits-compat.h | 2 +- libraries/Makefile.in | 2 +- libraries/liblber/Makefile.in | 2 +- libraries/liblber/assert.c | 2 +- libraries/liblber/bprint.c | 2 +- libraries/liblber/debug.c | 2 +- libraries/liblber/decode.c | 2 +- libraries/liblber/dtest.c | 2 +- libraries/liblber/encode.c | 2 +- libraries/liblber/etest.c | 2 +- libraries/liblber/idtest.c | 2 +- libraries/liblber/io.c | 2 +- libraries/liblber/lber-int.h | 2 +- libraries/liblber/memory.c | 2 +- libraries/liblber/nt_err.c | 2 +- libraries/liblber/options.c | 2 +- libraries/liblber/sockbuf.c | 2 +- libraries/liblber/stdio.c | 2 +- libraries/libldap/Makefile.in | 2 +- libraries/libldap/abandon.c | 2 +- libraries/libldap/add.c | 2 +- libraries/libldap/addentry.c | 2 +- libraries/libldap/apitest.c | 2 +- libraries/libldap/bind.c | 2 +- libraries/libldap/cancel.c | 2 +- libraries/libldap/charray.c | 2 +- libraries/libldap/compare.c | 2 +- libraries/libldap/controls.c | 2 +- libraries/libldap/cyrus.c | 2 +- libraries/libldap/delete.c | 2 +- libraries/libldap/dnssrv.c | 2 +- libraries/libldap/dntest.c | 2 +- libraries/libldap/error.c | 2 +- libraries/libldap/extended.c | 2 +- libraries/libldap/filter.c | 2 +- libraries/libldap/free.c | 2 +- libraries/libldap/ftest.c | 2 +- libraries/libldap/getattr.c | 2 +- libraries/libldap/getdn.c | 21 +- libraries/libldap/getentry.c | 2 +- libraries/libldap/getvalues.c | 2 +- libraries/libldap/groupings.c | 2 +- libraries/libldap/init.c | 2 +- libraries/libldap/kbind.c | 2 +- libraries/libldap/ldap-int.h | 2 +- libraries/libldap/messages.c | 2 +- libraries/libldap/modify.c | 2 +- libraries/libldap/modrdn.c | 2 +- libraries/libldap/open.c | 2 +- libraries/libldap/options.c | 2 +- libraries/libldap/os-ip.c | 2 +- libraries/libldap/os-local.c | 2 +- libraries/libldap/passwd.c | 2 +- libraries/libldap/ppolicy.c | 2 +- libraries/libldap/print.c | 2 +- libraries/libldap/references.c | 2 +- libraries/libldap/request.c | 2 +- libraries/libldap/result.c | 2 +- libraries/libldap/sasl.c | 2 +- libraries/libldap/sbind.c | 2 +- libraries/libldap/schema.c | 2 +- libraries/libldap/search.c | 2 +- libraries/libldap/sort.c | 2 +- libraries/libldap/sortctrl.c | 2 +- libraries/libldap/string.c | 2 +- libraries/libldap/t61.c | 2 +- libraries/libldap/test.c | 2 +- libraries/libldap/tls.c | 2 +- libraries/libldap/txn.c | 2 +- libraries/libldap/unbind.c | 2 +- libraries/libldap/url.c | 591 ++++++-- libraries/libldap/utf-8-conv.c | 2 +- libraries/libldap/utf-8.c | 2 +- libraries/libldap/util-int.c | 2 +- libraries/libldap/vlvctrl.c | 2 +- libraries/libldap/whoami.c | 2 +- libraries/libldap_r/Makefile.in | 2 +- libraries/libldap_r/rdwr.c | 2 +- libraries/libldap_r/rq.c | 2 +- libraries/libldap_r/thr_cthreads.c | 2 +- libraries/libldap_r/thr_lwp.c | 2 +- libraries/libldap_r/thr_nt.c | 2 +- libraries/libldap_r/thr_posix.c | 2 +- libraries/libldap_r/thr_pth.c | 2 +- libraries/libldap_r/thr_stub.c | 2 +- libraries/libldap_r/thr_thr.c | 2 +- libraries/libldap_r/threads.c | 2 +- libraries/libldap_r/tpool.c | 2 +- libraries/liblunicode/Makefile.in | 2 +- libraries/liblunicode/ucdata/ucdata.c | 2 +- libraries/liblunicode/ucdata/ucdata.h | 2 +- libraries/liblunicode/ucdata/ucgendat.c | 2 +- libraries/liblunicode/ucdata/ucpgba.c | 2 +- libraries/liblunicode/ucdata/ucpgba.h | 2 +- libraries/liblunicode/ucstr.c | 2 +- libraries/liblunicode/ure/ure.c | 2 +- libraries/liblunicode/ure/ure.h | 2 +- libraries/liblunicode/ure/urestubs.c | 2 +- libraries/liblunicode/utbm/utbm.c | 2 +- libraries/liblunicode/utbm/utbm.h | 2 +- libraries/liblunicode/utbm/utbmstub.c | 2 +- libraries/liblutil/Makefile.in | 2 +- libraries/liblutil/avl.c | 2 +- libraries/liblutil/base64.c | 2 +- libraries/liblutil/csn.c | 2 +- libraries/liblutil/detach.c | 2 +- libraries/liblutil/entropy.c | 2 +- libraries/liblutil/fetch.c | 2 +- libraries/liblutil/getopt.c | 2 +- libraries/liblutil/getpass.c | 2 +- libraries/liblutil/getpeereid.c | 2 +- libraries/liblutil/hash.c | 2 +- libraries/liblutil/ldif.c | 125 +- libraries/liblutil/lockf.c | 2 +- libraries/liblutil/md5.c | 2 +- libraries/liblutil/memcmp.c | 2 +- libraries/liblutil/ntservice.c | 2 +- libraries/liblutil/passfile.c | 2 +- libraries/liblutil/passwd.c | 11 +- libraries/liblutil/ptest.c | 2 +- libraries/liblutil/sasl.c | 2 +- libraries/liblutil/setproctitle.c | 2 +- libraries/liblutil/sha1.c | 2 +- libraries/liblutil/signal.c | 2 +- libraries/liblutil/sockpair.c | 2 +- libraries/liblutil/testavl.c | 2 +- libraries/liblutil/utils.c | 2 +- libraries/liblutil/uuid.c | 2 +- libraries/librewrite/Makefile.in | 2 +- libraries/librewrite/config.c | 2 +- libraries/librewrite/context.c | 8 +- libraries/librewrite/info.c | 6 +- libraries/librewrite/ldapmap.c | 2 +- libraries/librewrite/map.c | 2 +- libraries/librewrite/params.c | 2 +- libraries/librewrite/parse.c | 2 +- libraries/librewrite/rewrite-int.h | 2 +- libraries/librewrite/rewrite-map.h | 2 +- libraries/librewrite/rewrite.c | 19 +- libraries/librewrite/rule.c | 7 +- libraries/librewrite/session.c | 2 +- libraries/librewrite/subst.c | 2 +- libraries/librewrite/var.c | 2 +- libraries/librewrite/xmap.c | 2 +- servers/Makefile.in | 2 +- servers/slapd/Makefile.in | 27 +- servers/slapd/abandon.c | 2 +- servers/slapd/acl.c | 18 +- servers/slapd/aclparse.c | 74 +- servers/slapd/ad.c | 2 +- servers/slapd/add.c | 4 +- servers/slapd/at.c | 2 +- servers/slapd/attr.c | 2 +- servers/slapd/ava.c | 2 +- servers/slapd/back-bdb/Makefile.in | 6 +- servers/slapd/back-bdb/add.c | 40 +- servers/slapd/back-bdb/attr.c | 2 +- servers/slapd/back-bdb/back-bdb.h | 21 +- servers/slapd/back-bdb/bind.c | 19 +- servers/slapd/back-bdb/cache.c | 7 +- servers/slapd/back-bdb/compare.c | 78 +- servers/slapd/back-bdb/config.c | 43 +- servers/slapd/back-bdb/ctxcsn.c | 443 ------ servers/slapd/back-bdb/dbcache.c | 5 +- servers/slapd/back-bdb/delete.c | 89 +- servers/slapd/back-bdb/dn2entry.c | 2 +- servers/slapd/back-bdb/dn2id.c | 126 +- servers/slapd/back-bdb/error.c | 2 +- servers/slapd/back-bdb/extended.c | 2 +- servers/slapd/back-bdb/filterindex.c | 2 +- servers/slapd/back-bdb/id2entry.c | 2 +- servers/slapd/back-bdb/idl.c | 81 +- servers/slapd/back-bdb/idl.h | 2 +- servers/slapd/back-bdb/index.c | 4 +- servers/slapd/back-bdb/init.c | 114 +- servers/slapd/back-bdb/key.c | 2 +- servers/slapd/back-bdb/modify.c | 114 +- servers/slapd/back-bdb/modrdn.c | 109 +- servers/slapd/back-bdb/nextid.c | 2 +- servers/slapd/back-bdb/operational.c | 10 +- servers/slapd/back-bdb/proto-bdb.h | 57 +- servers/slapd/back-bdb/referral.c | 4 +- servers/slapd/back-bdb/search.c | 1264 ++--------------- servers/slapd/back-bdb/tools.c | 2 +- servers/slapd/back-bdb/trans.c | 2 +- servers/slapd/back-dnssrv/Makefile.in | 2 +- servers/slapd/back-dnssrv/bind.c | 2 +- servers/slapd/back-dnssrv/compare.c | 2 +- servers/slapd/back-dnssrv/config.c | 2 +- servers/slapd/back-dnssrv/init.c | 2 +- servers/slapd/back-dnssrv/proto-dnssrv.h | 2 +- servers/slapd/back-dnssrv/referral.c | 2 +- servers/slapd/back-dnssrv/search.c | 2 +- servers/slapd/back-hdb/Makefile.in | 6 +- servers/slapd/back-hdb/back-bdb.h | 2 +- servers/slapd/back-ldap/Makefile.in | 6 +- servers/slapd/back-ldap/add.c | 8 +- servers/slapd/back-ldap/back-ldap.h | 39 +- servers/slapd/back-ldap/bind.c | 68 +- servers/slapd/{overlays => back-ldap}/chain.c | 104 +- servers/slapd/back-ldap/compare.c | 6 +- servers/slapd/back-ldap/config.c | 14 +- servers/slapd/back-ldap/delete.c | 10 +- servers/slapd/back-ldap/extended.c | 6 +- servers/slapd/back-ldap/init.c | 17 +- servers/slapd/back-ldap/modify.c | 6 +- servers/slapd/back-ldap/modrdn.c | 6 +- servers/slapd/back-ldap/proto-ldap.h | 29 +- servers/slapd/back-ldap/search.c | 25 +- servers/slapd/back-ldap/unbind.c | 2 +- servers/slapd/back-ldbm/Makefile.in | 2 +- servers/slapd/back-ldbm/add.c | 3 +- servers/slapd/back-ldbm/alias.c | 2 +- servers/slapd/back-ldbm/attr.c | 2 +- servers/slapd/back-ldbm/back-ldbm.h | 2 +- servers/slapd/back-ldbm/bind.c | 23 +- servers/slapd/back-ldbm/cache.c | 2 +- servers/slapd/back-ldbm/close.c | 2 +- servers/slapd/back-ldbm/compare.c | 2 +- servers/slapd/back-ldbm/config.c | 2 +- servers/slapd/back-ldbm/dbcache.c | 2 +- servers/slapd/back-ldbm/delete.c | 21 +- servers/slapd/back-ldbm/dn2id.c | 2 +- servers/slapd/back-ldbm/entry.c | 2 +- servers/slapd/back-ldbm/extended.c | 2 +- servers/slapd/back-ldbm/filterindex.c | 2 +- servers/slapd/back-ldbm/id2children.c | 2 +- servers/slapd/back-ldbm/id2entry.c | 2 +- servers/slapd/back-ldbm/idl.c | 2 +- servers/slapd/back-ldbm/index.c | 2 +- servers/slapd/back-ldbm/init.c | 2 +- servers/slapd/back-ldbm/key.c | 2 +- servers/slapd/back-ldbm/ldbm.c | 2 +- servers/slapd/back-ldbm/ldbm.h | 2 +- servers/slapd/back-ldbm/modify.c | 20 +- servers/slapd/back-ldbm/modrdn.c | 20 +- servers/slapd/back-ldbm/nextid.c | 2 +- servers/slapd/back-ldbm/operational.c | 2 +- servers/slapd/back-ldbm/proto-back-ldbm.h | 2 +- servers/slapd/back-ldbm/referral.c | 44 +- servers/slapd/back-ldbm/search.c | 69 +- servers/slapd/back-ldbm/tools.c | 2 +- servers/slapd/back-meta/Makefile.in | 2 +- servers/slapd/back-meta/add.c | 42 +- servers/slapd/back-meta/attribute.c | 4 +- servers/slapd/back-meta/back-meta.h | 48 +- servers/slapd/back-meta/bind.c | 232 +-- servers/slapd/back-meta/candidates.c | 38 +- servers/slapd/back-meta/compare.c | 86 +- servers/slapd/back-meta/config.c | 44 +- servers/slapd/back-meta/conn.c | 161 ++- servers/slapd/back-meta/delete.c | 17 +- servers/slapd/back-meta/dncache.c | 5 +- servers/slapd/back-meta/group.c | 4 +- servers/slapd/back-meta/init.c | 65 +- servers/slapd/back-meta/map.c | 114 +- servers/slapd/back-meta/modify.c | 129 +- servers/slapd/back-meta/modrdn.c | 42 +- servers/slapd/back-meta/proto-meta.h | 2 +- servers/slapd/back-meta/search.c | 86 +- servers/slapd/back-meta/suffixmassage.c | 8 +- servers/slapd/back-meta/unbind.c | 23 +- servers/slapd/back-monitor/Makefile.in | 2 +- servers/slapd/back-monitor/back-monitor.h | 2 +- servers/slapd/back-monitor/backend.c | 2 +- servers/slapd/back-monitor/bind.c | 2 +- servers/slapd/back-monitor/cache.c | 2 +- servers/slapd/back-monitor/compare.c | 2 +- servers/slapd/back-monitor/conn.c | 4 +- servers/slapd/back-monitor/database.c | 2 +- servers/slapd/back-monitor/entry.c | 2 +- servers/slapd/back-monitor/init.c | 2 +- servers/slapd/back-monitor/listener.c | 2 +- servers/slapd/back-monitor/log.c | 6 +- servers/slapd/back-monitor/modify.c | 2 +- servers/slapd/back-monitor/operation.c | 4 +- servers/slapd/back-monitor/operational.c | 2 +- servers/slapd/back-monitor/overlay.c | 2 +- .../slapd/back-monitor/proto-back-monitor.h | 2 +- servers/slapd/back-monitor/rww.c | 4 +- servers/slapd/back-monitor/search.c | 2 +- servers/slapd/back-monitor/sent.c | 4 +- servers/slapd/back-monitor/thread.c | 4 +- servers/slapd/back-monitor/time.c | 4 +- servers/slapd/back-null/Makefile.in | 2 +- servers/slapd/back-null/null.c | 49 +- servers/slapd/back-passwd/Makefile.in | 2 +- servers/slapd/back-passwd/back-passwd.h | 2 +- servers/slapd/back-passwd/config.c | 2 +- servers/slapd/back-passwd/init.c | 2 +- servers/slapd/back-passwd/proto-passwd.h | 2 +- servers/slapd/back-passwd/search.c | 2 +- servers/slapd/back-perl/Makefile.in | 2 +- servers/slapd/back-perl/SampleLDAP.pm | 2 +- servers/slapd/back-perl/add.c | 2 +- servers/slapd/back-perl/asperl_undefs.h | 2 +- servers/slapd/back-perl/bind.c | 2 +- servers/slapd/back-perl/close.c | 2 +- servers/slapd/back-perl/compare.c | 2 +- servers/slapd/back-perl/config.c | 2 +- servers/slapd/back-perl/delete.c | 2 +- servers/slapd/back-perl/init.c | 2 +- servers/slapd/back-perl/modify.c | 2 +- servers/slapd/back-perl/modrdn.c | 2 +- servers/slapd/back-perl/perl_back.h | 2 +- servers/slapd/back-perl/proto-perl.h | 2 +- servers/slapd/back-perl/search.c | 2 +- servers/slapd/back-relay/Makefile.in | 2 +- servers/slapd/back-relay/back-relay.h | 2 +- servers/slapd/back-relay/config.c | 2 +- servers/slapd/back-relay/init.c | 2 +- servers/slapd/back-relay/op.c | 2 +- servers/slapd/back-relay/proto-back-relay.h | 2 +- servers/slapd/back-shell/Makefile.in | 2 +- servers/slapd/back-shell/add.c | 2 +- servers/slapd/back-shell/bind.c | 2 +- servers/slapd/back-shell/compare.c | 2 +- servers/slapd/back-shell/config.c | 2 +- servers/slapd/back-shell/delete.c | 2 +- servers/slapd/back-shell/fork.c | 2 +- servers/slapd/back-shell/init.c | 2 +- servers/slapd/back-shell/modify.c | 2 +- servers/slapd/back-shell/modrdn.c | 2 +- servers/slapd/back-shell/proto-shell.h | 2 +- servers/slapd/back-shell/result.c | 2 +- servers/slapd/back-shell/search.c | 2 +- servers/slapd/back-shell/searchexample.conf | 2 +- servers/slapd/back-shell/searchexample.sh | 2 +- servers/slapd/back-shell/shell.h | 2 +- servers/slapd/back-shell/unbind.c | 2 +- servers/slapd/back-sql/Makefile.in | 2 +- servers/slapd/back-sql/add.c | 581 +++++--- servers/slapd/back-sql/api.c | 39 +- servers/slapd/back-sql/back-sql.h | 245 +++- servers/slapd/back-sql/bind.c | 79 +- servers/slapd/back-sql/compare.c | 153 +- servers/slapd/back-sql/config.c | 203 ++- servers/slapd/back-sql/delete.c | 287 ++-- servers/slapd/back-sql/entry-id.c | 468 +++++- servers/slapd/back-sql/init.c | 128 +- servers/slapd/back-sql/modify.c | 160 ++- servers/slapd/back-sql/modrdn.c | 471 +++--- servers/slapd/back-sql/operational.c | 21 +- servers/slapd/back-sql/proto-sql.h | 29 +- .../rdbms_depend/ibmdb2/backsql_create.sql | 7 - .../back-sql/rdbms_depend/ibmdb2/slapd.conf | 2 +- .../rdbms_depend/ibmdb2/testdb_create.sql | 7 + .../rdbms_depend/ibmdb2/testdb_data.sql | 2 + .../rdbms_depend/ibmdb2/testdb_metadata.sql | 45 +- .../rdbms_depend/mssql/testdb_metadata.sql | 2 +- .../rdbms_depend/mysql/backsql_create.sql | 7 - .../back-sql/rdbms_depend/mysql/slapd.conf | 2 +- .../rdbms_depend/mysql/testdb_create.sql | 7 + .../rdbms_depend/mysql/testdb_data.sql | 2 + .../rdbms_depend/mysql/testdb_metadata.sql | 21 +- .../back-sql/rdbms_depend/oracle/slapd.conf | 2 +- .../rdbms_depend/oracle/testdb_metadata.sql | 2 +- .../rdbms_depend/pgsql/backsql_create.sql | 7 - .../back-sql/rdbms_depend/pgsql/slapd.conf | 2 +- .../rdbms_depend/pgsql/testdb_create.sql | 8 + .../rdbms_depend/pgsql/testdb_data.sql | 1 + .../rdbms_depend/pgsql/testdb_metadata.sql | 23 +- .../rdbms_depend/timesten/dnreverse/Makefile | 2 +- .../timesten/dnreverse/dnreverse.cpp | 2 +- .../back-sql/rdbms_depend/timesten/slapd.conf | 2 +- .../rdbms_depend/timesten/testdb_metadata.sql | 2 +- servers/slapd/back-sql/schema-map.c | 170 +-- servers/slapd/back-sql/schema-map.h | 116 -- servers/slapd/back-sql/search.c | 515 +++++-- servers/slapd/back-sql/sql-types.h | 35 - servers/slapd/back-sql/sql-wrap.c | 64 +- servers/slapd/back-sql/util.c | 70 +- servers/slapd/backend.c | 282 ++-- servers/slapd/backover.c | 6 +- servers/slapd/bind.c | 3 +- servers/slapd/cancel.c | 2 +- servers/slapd/ch_malloc.c | 2 +- servers/slapd/compare.c | 2 +- servers/slapd/component.c | 416 +++--- servers/slapd/component.h | 34 +- servers/slapd/config.c | 55 +- servers/slapd/config.h | 2 +- servers/slapd/connection.c | 34 +- servers/slapd/controls.c | 21 +- servers/slapd/cr.c | 2 +- servers/slapd/ctxcsn.c | 2 +- servers/slapd/daemon.c | 3 +- servers/slapd/delete.c | 2 +- servers/slapd/dn.c | 2 +- servers/slapd/entry.c | 50 +- servers/slapd/extended.c | 3 +- servers/slapd/filter.c | 2 +- servers/slapd/filterentry.c | 73 +- servers/slapd/frontend.c | 4 +- servers/slapd/globals.c | 2 +- servers/slapd/index.c | 2 +- servers/slapd/init.c | 2 +- servers/slapd/kerberos.c | 2 +- servers/slapd/ldapsync.c | 115 +- servers/slapd/limits.c | 16 +- servers/slapd/lock.c | 5 +- servers/slapd/main.c | 2 +- servers/slapd/matchedValues.c | 2 +- servers/slapd/modify.c | 2 +- servers/slapd/modrdn.c | 9 +- servers/slapd/mods.c | 2 +- servers/slapd/module.c | 2 +- servers/slapd/mr.c | 2 +- servers/slapd/mra.c | 2 +- servers/slapd/nt_svc.c | 2 +- servers/slapd/oc.c | 2 +- servers/slapd/oidm.c | 2 +- servers/slapd/operation.c | 20 +- servers/slapd/operational.c | 2 +- servers/slapd/overlays/Makefile.in | 7 +- servers/slapd/overlays/collect.c | 2 +- servers/slapd/overlays/denyop.c | 2 +- servers/slapd/overlays/dyngroup.c | 2 +- servers/slapd/overlays/glue.c | 2 +- servers/slapd/overlays/lastmod.c | 2 +- servers/slapd/overlays/overlays.c | 8 +- servers/slapd/overlays/pcache.c | 2 +- servers/slapd/overlays/ppolicy.c | 16 +- servers/slapd/overlays/refint.c | 2 +- servers/slapd/overlays/rwm.c | 42 +- servers/slapd/overlays/rwm.h | 8 +- servers/slapd/overlays/rwmconf.c | 2 +- servers/slapd/overlays/rwmdn.c | 257 ++-- servers/slapd/overlays/rwmmap.c | 98 +- servers/slapd/overlays/seqmod.c | 2 +- servers/slapd/overlays/syncprov.c | 133 +- servers/slapd/overlays/unique.c | 2 +- servers/slapd/passwd.c | 35 +- servers/slapd/phonetic.c | 2 +- servers/slapd/proto-slap.h | 28 +- servers/slapd/referral.c | 61 +- servers/slapd/repl.c | 2 +- servers/slapd/result.c | 2 +- servers/slapd/root_dse.c | 7 +- servers/slapd/sasl.c | 2 +- servers/slapd/saslauthz.c | 6 +- servers/slapd/schema.c | 2 +- servers/slapd/schema/README | 10 +- servers/slapd/schema/collective.schema | 190 --- servers/slapd/schema/corba.schema | 4 +- servers/slapd/schema/core.schema | 11 +- servers/slapd/schema/cosine.schema | 6 +- servers/slapd/schema/duaconf.schema | 253 ---- servers/slapd/schema/dyngroup.schema | 11 +- servers/slapd/schema/inetorgperson.schema | 2 +- servers/slapd/schema/java.schema | 2 +- servers/slapd/schema/misc.schema | 8 +- servers/slapd/schema/nis.schema | 2 +- servers/slapd/schema/openldap.schema | 2 +- servers/slapd/schema/ppolicy.schema | 14 +- servers/slapd/schema_check.c | 4 +- servers/slapd/schema_init.c | 186 ++- servers/slapd/schema_prep.c | 20 +- servers/slapd/schemaparse.c | 2 +- servers/slapd/search.c | 26 +- servers/slapd/sessionlog.c | 135 -- servers/slapd/sets.c | 89 +- servers/slapd/sets.h | 2 +- servers/slapd/shell-backends/Makefile.in | 2 +- servers/slapd/shell-backends/passwd-shell.c | 2 +- servers/slapd/shell-backends/shellutil.c | 2 +- servers/slapd/shell-backends/shellutil.h | 2 +- servers/slapd/sl_malloc.c | 11 +- servers/slapd/slap.h | 120 +- servers/slapd/slapacl.c | 8 +- servers/slapd/slapadd.c | 465 +----- servers/slapd/slapauth.c | 2 +- servers/slapd/slapcat.c | 16 +- servers/slapd/slapcommon.c | 114 +- servers/slapd/slapcommon.h | 20 +- servers/slapd/slapdn.c | 2 +- servers/slapd/slapi/Makefile.in | 2 +- servers/slapd/slapi/ibm_pblock_params.h | 2 +- servers/slapd/slapi/plugin.c | 2 +- servers/slapd/slapi/printmsg.c | 2 +- servers/slapd/slapi/proto-slapi.h | 2 +- servers/slapd/slapi/slapi.h | 2 +- servers/slapd/slapi/slapi_ext.c | 2 +- servers/slapd/slapi/slapi_ops.c | 2 +- servers/slapd/slapi/slapi_pblock.c | 6 +- servers/slapd/slapi/slapi_utils.c | 2 +- servers/slapd/slapindex.c | 2 +- servers/slapd/slappasswd.c | 2 +- servers/slapd/slaptest.c | 2 +- servers/slapd/starttls.c | 2 +- servers/slapd/str2filter.c | 2 +- servers/slapd/syncrepl.c | 571 ++------ servers/slapd/syntax.c | 2 +- servers/slapd/unbind.c | 2 +- servers/slapd/user.c | 2 +- servers/slapd/value.c | 2 +- servers/slapd/zn_malloc.c | 2 +- servers/slurpd/Makefile.in | 2 +- servers/slurpd/admin.c | 2 +- servers/slurpd/args.c | 2 +- servers/slurpd/ch_malloc.c | 2 +- servers/slurpd/config.c | 2 +- servers/slurpd/fm.c | 2 +- servers/slurpd/globals.c | 2 +- servers/slurpd/globals.h | 2 +- servers/slurpd/ldap_op.c | 28 +- servers/slurpd/lock.c | 6 +- servers/slurpd/main.c | 2 +- servers/slurpd/nt_svc.c | 2 +- servers/slurpd/proto-slurp.h | 2 +- servers/slurpd/re.c | 2 +- servers/slurpd/reject.c | 2 +- servers/slurpd/replica.c | 2 +- servers/slurpd/replog.c | 2 +- servers/slurpd/ri.c | 2 +- servers/slurpd/rq.c | 2 +- servers/slurpd/sanity.c | 2 +- servers/slurpd/slurp.h | 2 +- servers/slurpd/st.c | 2 +- tests/Makefile.in | 4 +- tests/data/acl.out.master | 5 + tests/data/chain.out | 410 ++++++ tests/data/chainmod.out | 389 +++++ tests/data/ditcontentrules.conf | 2 +- tests/data/relay.out | 24 +- tests/data/slapd-acl.conf | 3 +- tests/data/slapd-cache-master.conf | 2 +- tests/data/slapd-chain1.conf | 57 + tests/data/slapd-chain2.conf | 58 + tests/data/slapd-component.conf | 2 +- tests/data/slapd-dn.conf | 2 +- tests/data/slapd-dnssrv.conf | 2 +- tests/data/slapd-emptydn.conf | 2 +- tests/data/slapd-glue.conf | 2 +- tests/data/slapd-idassert.conf | 4 +- tests/data/slapd-ldapglue.conf | 2 +- tests/data/slapd-ldapgluegroups.conf | 2 +- tests/data/slapd-ldapgluepeople.conf | 2 +- tests/data/slapd-limits.conf | 2 +- tests/data/slapd-master.conf | 2 +- tests/data/slapd-nis-master.conf | 2 +- tests/data/slapd-passwd.conf | 2 +- tests/data/slapd-ppolicy.conf | 2 +- tests/data/slapd-proxycache.conf | 2 +- tests/data/slapd-pw.conf | 2 +- tests/data/slapd-ref-slave.conf | 2 +- tests/data/slapd-referrals.conf | 2 +- tests/data/slapd-refint.conf | 2 +- tests/data/slapd-relay.conf | 2 +- tests/data/slapd-repl-master.conf | 2 +- tests/data/slapd-repl-slave.conf | 21 +- tests/data/slapd-schema.conf | 7 +- tests/data/slapd-sql.conf | 14 +- tests/data/slapd-syncrepl-master.conf | 5 +- tests/data/slapd-syncrepl-slave-persist1.conf | 21 +- tests/data/slapd-syncrepl-slave-persist2.conf | 2 +- tests/data/slapd-syncrepl-slave-persist3.conf | 4 +- tests/data/slapd-syncrepl-slave-refresh1.conf | 12 +- tests/data/slapd-syncrepl-slave-refresh2.conf | 5 +- tests/data/slapd-unique.conf | 2 +- tests/data/slapd-whoami.conf | 2 +- tests/data/slapd.conf | 2 +- tests/data/slapd2.conf | 2 +- tests/data/sql-read.out | 128 +- tests/data/sql-write.out | 410 ++++++ tests/data/test-chain1.ldif | 366 +++++ tests/data/test-chain2.ldif | 83 ++ tests/data/test.schema | 2 +- tests/progs/Makefile.in | 2 +- tests/progs/slapd-addel.c | 2 +- tests/progs/slapd-modify.c | 2 +- tests/progs/slapd-modrdn.c | 2 +- tests/progs/slapd-read.c | 2 +- tests/progs/slapd-search.c | 2 +- tests/progs/slapd-tester.c | 2 +- tests/run.in | 2 +- tests/scripts/acfilter.sh | 2 +- tests/scripts/all | 2 +- tests/scripts/conf.sh | 4 +- tests/scripts/defines.sh | 8 +- tests/scripts/passwd-search | 2 +- tests/scripts/relay | 32 +- tests/scripts/sql-all | 2 +- tests/scripts/sql-test000-read | 32 +- tests/scripts/sql-test900-write | 272 +++- tests/scripts/start-server | 2 +- tests/scripts/start-server-nolog | 2 +- tests/scripts/start-server2 | 2 +- tests/scripts/start-server2-nolog | 2 +- tests/scripts/startup_nis_ldap_server.sh | 2 +- tests/scripts/test000-rootdse | 2 +- tests/scripts/test001-slapadd | 2 +- tests/scripts/test002-populate | 2 +- tests/scripts/test003-search | 2 +- tests/scripts/test004-modify | 2 +- tests/scripts/test005-modrdn | 2 +- tests/scripts/test006-acls | 26 +- tests/scripts/test007-replication | 122 +- tests/scripts/test008-concurrency | 2 +- tests/scripts/test009-referral | 2 +- tests/scripts/test010-passwd | 2 +- tests/scripts/test011-glue-slapadd | 2 +- tests/scripts/test012-glue-populate | 2 +- tests/scripts/test013-language | 2 +- tests/scripts/test014-whoami | 2 +- tests/scripts/test015-xsearch | 2 +- tests/scripts/test016-subref | 2 +- tests/scripts/test017-syncreplication-refresh | 25 +- tests/scripts/test018-syncreplication-persist | 66 +- tests/scripts/test019-syncreplication-cascade | 2 +- tests/scripts/test020-proxycache | 2 +- tests/scripts/test021-certificate | 2 +- tests/scripts/test022-ppolicy | 2 +- tests/scripts/test023-refint | 2 +- tests/scripts/test024-unique | 2 +- tests/scripts/test025-limits | 2 +- tests/scripts/test026-dn | 2 +- tests/scripts/test027-emptydn | 2 +- tests/scripts/test028-idassert | 2 +- tests/scripts/test029-ldapglue | 2 +- tests/scripts/test030-relay | 25 +- tests/scripts/test031-component-filter | 2 +- tests/scripts/test032-chain | 246 ++++ 808 files changed, 10028 insertions(+), 8373 deletions(-) delete mode 100644 servers/slapd/back-bdb/ctxcsn.c rename servers/slapd/{overlays => back-ldap}/chain.c (84%) delete mode 100644 servers/slapd/back-sql/schema-map.h delete mode 100644 servers/slapd/back-sql/sql-types.h delete mode 100644 servers/slapd/schema/collective.schema delete mode 100644 servers/slapd/schema/duaconf.schema delete mode 100644 servers/slapd/sessionlog.c create mode 100644 tests/data/chain.out create mode 100644 tests/data/chainmod.out create mode 100644 tests/data/slapd-chain1.conf create mode 100644 tests/data/slapd-chain2.conf create mode 100644 tests/data/test-chain1.ldif create mode 100644 tests/data/test-chain2.ldif create mode 100755 tests/scripts/test032-chain diff --git a/CHANGES b/CHANGES index cafb2dd824..94d9d133ba 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ OpenLDAP 2.3 Change Log -OpenLDAP 2.3.0alpha Release - Alpha release +OpenLDAP 2.3.1alpha Release + Changes not tracked diff --git a/COPYRIGHT b/COPYRIGHT index 62b39c310c..5550e3abe1 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright 1998-2004 The OpenLDAP Foundation +Copyright 1998-2005 The OpenLDAP Foundation All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/INSTALL b/INSTALL index a6cbf42886..042bc9ac5b 100644 --- a/INSTALL +++ b/INSTALL @@ -107,7 +107,7 @@ $OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18 This work is part of OpenLDAP Software . -Copyright 1998-2004 The OpenLDAP Foundation. +Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Makefile.in b/Makefile.in index de7956753e..4255ebb46e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/README b/README index ea464e1f86..13ccd465e3 100644 --- a/README +++ b/README @@ -80,7 +80,8 @@ $OpenLDAP$ This work is part of OpenLDAP Software . -Copyright 1998-2004 The OpenLDAP Foundation. All rights reserved. +Copyright 1998-2005 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 diff --git a/acconfig.h b/acconfig.h index f6f86c05c9..865c099294 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,6 +1,6 @@ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation + * Copyright 1998-2005 The OpenLDAP Foundation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/acinclude.m4 b/acinclude.m4 index eab0d993a3..0fa0825cca 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2,7 +2,7 @@ dnl OpenLDAP Autoconf Macros dnl $OpenLDAP$ dnl This work is part of OpenLDAP Software . dnl -dnl Copyright 1998-2004 The OpenLDAP Foundation. +dnl Copyright 1998-2005 The OpenLDAP Foundation. dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without diff --git a/aclocal.m4 b/aclocal.m4 index 6127720d02..72c05bfe23 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -10,7 +10,7 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. -dnl Copyright 1998-2004 The OpenLDAP Foundation. +dnl Copyright 1998-2005 The OpenLDAP Foundation. dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without diff --git a/build/config.guess b/build/config.guess index b9228c00ed..92dfff05c8 100755 --- a/build/config.guess +++ b/build/config.guess @@ -1,6 +1,6 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1998-2004 The OpenLDAP Foundation. +# Copyright 1998-2005 The OpenLDAP Foundation. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002 Free Software Foundation, Inc. @@ -30,7 +30,7 @@ timestamp='2002-10-21-OpenLDAP' # configuration script generated by Autoconf, and is distributable # under the same distributions terms as OpenLDAP inself. -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/config.sub b/build/config.sub index 8178cd540f..90348ce971 100755 --- a/build/config.sub +++ b/build/config.sub @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1998-2004 The OpenLDAP Foundation. +# Copyright 1998-2005 The OpenLDAP Foundation. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002 Free Software Foundation, Inc. @@ -35,7 +35,7 @@ timestamp='2002-09-05 (OpenLDAP)' # configuration script generated by Autoconf, and is distributable # under the same distributions terms as OpenLDAP inself. -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/crupdate b/build/crupdate index a4725f3ab3..d70ca114d2 100755 --- a/build/crupdate +++ b/build/crupdate @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -18,5 +18,5 @@ set -e # exit immediately if any errors occur -find . -type f -not -name 'LICENSE*' -print -exec perl -pi -e 's/Copyright ([0-9]{4})([,\-][0-9]{2,4})*,? The OpenLDAP Foundation/Copyright $1-2004 The OpenLDAP Foundation/g;' {} \; +find . -type f -not -name 'LICENSE*' -print -exec perl -pi -e 's/Copyright ([0-9]{4})([,\-][0-9]{2,4})*,? The OpenLDAP Foundation/Copyright $1-2005 The OpenLDAP Foundation/g;' {} \; diff --git a/build/dir.mk b/build/dir.mk index d05989335b..8f7b434a5d 100644 --- a/build/dir.mk +++ b/build/dir.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/info.mk b/build/info.mk index f6ab841626..2857d4431a 100644 --- a/build/info.mk +++ b/build/info.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/lib-shared.mk b/build/lib-shared.mk index 9e8d23bafa..a77a64ab07 100644 --- a/build/lib-shared.mk +++ b/build/lib-shared.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/lib-static.mk b/build/lib-static.mk index 0698732b8f..3111f75d25 100644 --- a/build/lib-static.mk +++ b/build/lib-static.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/lib.mk b/build/lib.mk index 787891df9a..f467ae3f37 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/ltmain.sh b/build/ltmain.sh index c654e165a5..cc95125f02 100755 --- a/build/ltmain.sh +++ b/build/ltmain.sh @@ -28,7 +28,7 @@ # configuration script generated by Autoconf, and is distributable # under the same distributions terms as OpenLDAP inself. -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/man.mk b/build/man.mk index 1ed076db80..0e113f634a 100644 --- a/build/man.mk +++ b/build/man.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/mkdep b/build/mkdep index 20b4079680..0e8ce3d857 100755 --- a/build/mkdep +++ b/build/mkdep @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/mkdep.aix b/build/mkdep.aix index c06c21a3be..2e68dec52c 100755 --- a/build/mkdep.aix +++ b/build/mkdep.aix @@ -1,7 +1,7 @@ #! /bin/sh ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/mkrelease b/build/mkrelease index ee866c850d..dcd32b2105 100755 --- a/build/mkrelease +++ b/build/mkrelease @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ echo Release: $RELNAME echo CVS Tag: $CVSTAG echo Modules: $* -cvs -q export -r $CVSTAG -d $RELNAME $* +cvs -q export -kkv -r $CVSTAG -d $RELNAME $* if test ! -d $RELNAME ; then echo "error: $RELNAME doesn't exists" @@ -53,10 +53,13 @@ fi if test ! -e $RELNAME/build/version.sh ; then echo "No build version" - exit 1 + OL_STRING="something" +else + eval `$RELNAME/build/version.sh` fi -eval `$RELNAME/build/version.sh` +echo "Rolling up $OL_STRING ..." + tar cf $RELNAME.tar $RELNAME gzip -9 -c $RELNAME.tar > $RELNAME.tgz diff --git a/build/mkvers.bat b/build/mkvers.bat index fb7df6c7ac..6dbf2d241e 100755 --- a/build/mkvers.bat +++ b/build/mkvers.bat @@ -1,7 +1,7 @@ :: $OpenLDAP$ :: This work is part of OpenLDAP Software . :: -:: Copyright 1998-2004 The OpenLDAP Foundation. +:: Copyright 1998-2005 The OpenLDAP Foundation. :: All rights reserved. :: :: Redistribution and use in source and binary forms, with or without diff --git a/build/mkversion b/build/mkversion index af6022238d..41dd81e175 100755 --- a/build/mkversion +++ b/build/mkversion @@ -3,7 +3,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -55,7 +55,7 @@ WHOWHERE="$USER@`uname -n`:`pwd`" cat << __EOF__ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,7 +68,7 @@ cat << __EOF__ */ static const char copyright[] = -"Copyright 1998-2004 The OpenLDAP Foundation. All rights reserved.\n" +"Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved.\n" "COPYING RESTRICTIONS APPLY\n"; $static $const char $SYMBOL[] = diff --git a/build/mod.mk b/build/mod.mk index c5bc3fb69f..9ee55b3c01 100644 --- a/build/mod.mk +++ b/build/mod.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/openldap.m4 b/build/openldap.m4 index e22dd29d62..1cf676e442 100644 --- a/build/openldap.m4 +++ b/build/openldap.m4 @@ -2,7 +2,7 @@ dnl OpenLDAP Autoconf Macros dnl $OpenLDAP$ dnl This work is part of OpenLDAP Software . dnl -dnl Copyright 1998-2004 The OpenLDAP Foundation. +dnl Copyright 1998-2005 The OpenLDAP Foundation. dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without diff --git a/build/rules.mk b/build/rules.mk index b8bc8d85e8..3e411c5bc0 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/srv.mk b/build/srv.mk index 7337172c06..b735c374fc 100644 --- a/build/srv.mk +++ b/build/srv.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/top.mk b/build/top.mk index 3806dcf42d..58b250d924 100644 --- a/build/top.mk +++ b/build/top.mk @@ -1,5 +1,5 @@ # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/version.h b/build/version.h index 836f74e914..79b2ea90a4 100644 --- a/build/version.h +++ b/build/version.h @@ -1,6 +1,6 @@ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -13,6 +13,6 @@ */ static const char copyright[] = -"Copyright 1998-2004 The OpenLDAP Foundation. All rights reserved.\n" +"Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved.\n" "COPYING RESTRICTIONS APPLY.\n"; diff --git a/build/version.sh b/build/version.sh index b6d003ce18..f409278951 100755 --- a/build/version.sh +++ b/build/version.sh @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/build/version.var b/build/version.var index ade064c3d4..bdd1988ae9 100644 --- a/build/version.var +++ b/build/version.var @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/clients/Makefile.in b/clients/Makefile.in index 453e8107fb..87df1e4553 100644 --- a/clients/Makefile.in +++ b/clients/Makefile.in @@ -1,6 +1,6 @@ # Clients Makefile.in for OpenLDAP # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in index 84cb82a40b..2776e673f1 100644 --- a/clients/tools/Makefile.in +++ b/clients/tools/Makefile.in @@ -1,6 +1,6 @@ # Makefile for LDAP tools # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -103,5 +103,5 @@ install-local: FORCE done \ ) $(RM) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT) - $(LN) $(DESTDIR)$(bindir)/ldapmodify$(EXEEXT) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT) + $(LN_S) $(DESTDIR)$(bindir)/ldapmodify$(EXEEXT) $(DESTDIR)$(bindir)/ldapadd$(EXEEXT) diff --git a/clients/tools/common.c b/clients/tools/common.c index 21a8181061..415be46b9d 100644 --- a/clients/tools/common.c +++ b/clients/tools/common.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * Portions Copyright 2003 Kurt D. Zeilenga. * Portions Copyright 2003 IBM Corporation. * All rights reserved. diff --git a/clients/tools/common.h b/clients/tools/common.h index 2675a8751c..3022721d5b 100644 --- a/clients/tools/common.h +++ b/clients/tools/common.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c index 056b47ac77..7023e9b63d 100644 --- a/clients/tools/ldapcompare.c +++ b/clients/tools/ldapcompare.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 1998-2001 Net Boolean Incorporated. * All rights reserved. diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index 74402e9990..4617aa5025 100644 --- a/clients/tools/ldapdelete.c +++ b/clients/tools/ldapdelete.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * All rights reserved. * diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index e0c230edbb..646f50d778 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 1998-2001 Net Boolean Incorporated. * Portions Copyright 2001-2003 IBM Corporation. diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index 75dc7a0019..827a372d25 100644 --- a/clients/tools/ldapmodrdn.c +++ b/clients/tools/ldapmodrdn.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 1998-2001 Net Boolean Incorporated. * Portions Copyright 2001-2003 IBM Corporation. diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c index e09d022fd3..145b87fde3 100644 --- a/clients/tools/ldappasswd.c +++ b/clients/tools/ldappasswd.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 1998-2001 Net Boolean Incorporated. * Portions Copyright 2001-2003 IBM Corporation. diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index a7df2dbd90..e2f9944959 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 1998-2001 Net Boolean Incorporated. * Portions Copyright 2001-2003 IBM Corporation. diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c index 1eba2b60a6..1aca040096 100644 --- a/clients/tools/ldapwhoami.c +++ b/clients/tools/ldapwhoami.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 1998-2001 Net Boolean Incorporated. * Portions Copyright 2001-2003 IBM Corporation. diff --git a/configure b/configure index 026811eda8..78fcb210e8 100755 --- a/configure +++ b/configure @@ -4,7 +4,7 @@ # This work is part of OpenLDAP Software . # -# Copyright 1998-2004 The OpenLDAP Foundation. +# Copyright 1998-2005 The OpenLDAP Foundation. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -15,7 +15,7 @@ # top-level directory of the distribution or, alternatively, at # . -echo "Copyright 1998-2004 The OpenLDAP Foundation. All rights reserved." +echo "Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved." echo " Restrictions apply, see COPYRIGHT and LICENSE files." # Guess values for system-dependent variables and create Makefiles. @@ -25282,60 +25282,6 @@ else PLAT=UNIX fi -if test -z "$SLAPD_STATIC_BACKENDS"; then - SLAPD_NO_STATIC='#' -else - SLAPD_NO_STATIC= -fi - -BACKEND_HEADER=servers/slapd/backend.h -cat > $BACKEND_HEADER << EOF -/* This work is part of OpenLDAP Software . - * - * Copyright 1998-2004 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 - * . - */ -/* This file is automatically generated by configure; please do not edit. - */ - -EOF - -for b in $SLAPD_STATIC_BACKENDS; do - bb=`echo "$b" | sed -e 's;back-;;'` - - cat >> $BACKEND_HEADER << EOF -extern BI_init ${bb}_back_initialize; -EOF -done - -cat >> $BACKEND_HEADER << EOF - -static BackendInfo binfo[] = { -EOF - -for b in $SLAPD_STATIC_BACKENDS; do - bb=`echo "$b" | sed -e 's;back-;;'` - - cat >> $BACKEND_HEADER << EOF - { "$bb", ${bb}_back_initialize }, -EOF -done - -cat >> $BACKEND_HEADER << EOF - { NULL, NULL } -}; - -/* end of generated file */ -EOF - @@ -25910,12 +25856,64 @@ fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF chmod +x tests/run date > stamp-h +BACKENDSC="servers/slapd/backends.c" +echo "Making $BACKENDSC" +rm -f $BACKENDSC +cat > $BACKENDSC << ENDX +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2005 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 + * . + */ +/* This file is automatically generated by configure; please do not edit. */ + +#include "portable.h" +#include "slap.h" + +ENDX +if test "${STATIC_BACKENDS}"; then + for b in ${STATIC_BACKENDS}; do + bb=`echo "${b}" | sed -e 's/back-//'` + cat >> $BACKENDSC << ENDX +extern BI_init ${bb}_back_initialize; +ENDX + done + + cat >> $BACKENDSC << ENDX + +BackendInfo slap_binfo[] = { +ENDX + + for b in ${STATIC_BACKENDS}; do + bb=`echo "${b}" | sed -e 's/back-//'` + echo " Add ${bb} ..." + cat >> $BACKENDSC << ENDX + { "${bb}", ${bb}_back_initialize }, +ENDX + done + + cat >> $BACKENDSC << ENDX + { NULL, NULL }, +}; + +/* end of generated file */ +ENDX +fi + echo Please run \"make depend\" to build dependencies exit 0 diff --git a/configure.in b/configure.in index 26e9108ef4..6bf73baa50 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl $OpenLDAP$ dnl This work is part of OpenLDAP Software . dnl -dnl Copyright 1998-2004 The OpenLDAP Foundation. +dnl Copyright 1998-2005 The OpenLDAP Foundation. dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ define([AC_INIT_BINSH], # This work is part of OpenLDAP Software . # -# Copyright 1998-2004 The OpenLDAP Foundation. +# Copyright 1998-2005 The OpenLDAP Foundation. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,7 +34,7 @@ define([AC_INIT_BINSH], # top-level directory of the distribution or, alternatively, at # . -echo "Copyright 1998-2004 The OpenLDAP Foundation. All rights reserved." +echo "Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved." echo " Restrictions apply, see COPYRIGHT and LICENSE files." ])dnl dnl ---------------------------------------------------------------- @@ -2924,62 +2924,6 @@ else PLAT=UNIX fi -if test -z "$SLAPD_STATIC_BACKENDS"; then - SLAPD_NO_STATIC='#' -else - SLAPD_NO_STATIC= -fi - -dnl Generate static backend header file -BACKEND_HEADER=servers/slapd/backend.h -cat > $BACKEND_HEADER << EOF -/* This work is part of OpenLDAP Software . - * - * Copyright 1998-2004 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 - * . - */ -/* This file is automatically generated by configure; please do not edit. - */ - -EOF - -for b in $SLAPD_STATIC_BACKENDS; do - bb=`echo "$b" | sed -e 's;back-;;'` - - cat >> $BACKEND_HEADER << EOF -extern BI_init ${bb}_back_initialize; -EOF -done - -cat >> $BACKEND_HEADER << EOF - -static BackendInfo binfo[[]] = { -EOF - -for b in $SLAPD_STATIC_BACKENDS; do - bb=`echo "$b" | sed -e 's;back-;;'` - - cat >> $BACKEND_HEADER << EOF - { "$bb", ${bb}_back_initialize }, -EOF -done - -cat >> $BACKEND_HEADER << EOF - { NULL, NULL } -}; - -/* end of generated file */ -EOF -dnl done generating static backend header file - AC_SUBST(LIBSRCS) AC_SUBST(PLAT) AC_SUBST(WITH_SASL) @@ -3108,5 +3052,57 @@ tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \ ,[ chmod +x tests/run date > stamp-h +BACKENDSC="servers/slapd/backends.c" +echo "Making $BACKENDSC" +rm -f $BACKENDSC +cat > $BACKENDSC << ENDX +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2005 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 + * . + */ +/* This file is automatically generated by configure; please do not edit. */ + +#include "portable.h" +#include "slap.h" + +ENDX +if test "${STATIC_BACKENDS}"; then + for b in ${STATIC_BACKENDS}; do + bb=`echo "${b}" | sed -e 's/back-//'` + cat >> $BACKENDSC << ENDX +extern BI_init ${bb}_back_initialize; +ENDX + done + + cat >> $BACKENDSC << ENDX + +BackendInfo slap_binfo[[]] = { +ENDX + + for b in ${STATIC_BACKENDS}; do + bb=`echo "${b}" | sed -e 's/back-//'` + echo " Add ${bb} ..." + cat >> $BACKENDSC << ENDX + { "${bb}", ${bb}_back_initialize }, +ENDX + done + + cat >> $BACKENDSC << ENDX + { NULL, NULL }, +}; + +/* end of generated file */ +ENDX +fi + echo Please run \"make depend\" to build dependencies -]) +],[STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS"]) diff --git a/contrib/ldapc++/COPYRIGHT b/contrib/ldapc++/COPYRIGHT index 63b3f1034d..9cbaaf46bd 100644 --- a/contrib/ldapc++/COPYRIGHT +++ b/contrib/ldapc++/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright 1998-2004 The OpenLDAP Foundation +Copyright 1998-2005 The OpenLDAP Foundation All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/contrib/ldapc++/src/ac/time.h b/contrib/ldapc++/src/ac/time.h index e8359633c5..6ad69e9539 100644 --- a/contrib/ldapc++/src/ac/time.h +++ b/contrib/ldapc++/src/ac/time.h @@ -1,7 +1,7 @@ /* Generic time.h */ /* $OpenLDAP$ */ /* - * Copyright 1998-2004 The OpenLDAP Foundation, Redwood City, California, USA + * Copyright 1998-2005 The OpenLDAP Foundation, Redwood City, California, USA * All rights reserved. * * Redistribution and use in source and binary forms are permitted only diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile index 0302666ea3..05801d8158 100644 --- a/contrib/slapd-modules/comp_match/Makefile +++ b/contrib/slapd-modules/comp_match/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ # This work is part of OpenLDAP Software . # -# Copyright 2003-2004 The OpenLDAP Foundation. +# Copyright 2003-2005 The OpenLDAP Foundation. # Portions Copyright 2004 by IBM Corporation. # All rights reserved. diff --git a/contrib/slapd-modules/dsaschema/README b/contrib/slapd-modules/dsaschema/README index 3db5f96d31..0dc3f36aad 100644 --- a/contrib/slapd-modules/dsaschema/README +++ b/contrib/slapd-modules/dsaschema/README @@ -1,4 +1,4 @@ -Copyright 2004 The OpenLDAP Foundation. All rights reserved. +Copyright 2004-2005 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 diff --git a/contrib/slapd-modules/dsaschema/dsaschema.c b/contrib/slapd-modules/dsaschema/dsaschema.c index 906cbee34c..50e1501ef9 100644 --- a/contrib/slapd-modules/dsaschema/dsaschema.c +++ b/contrib/slapd-modules/dsaschema/dsaschema.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 2004 The OpenLDAP Foundation. + * Copyright 2004-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/contrib/slapd-modules/passwd/README b/contrib/slapd-modules/passwd/README index 55198ff561..9731223e27 100644 --- a/contrib/slapd-modules/passwd/README +++ b/contrib/slapd-modules/passwd/README @@ -1,4 +1,4 @@ -Copyright 2004 The OpenLDAP Foundation. All rights reserved. +Copyright 2004-2005 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 diff --git a/contrib/slapd-modules/passwd/kerberos.c b/contrib/slapd-modules/passwd/kerberos.c index 0d0dbe1600..fed0aa2fbd 100644 --- a/contrib/slapd-modules/passwd/kerberos.c +++ b/contrib/slapd-modules/passwd/kerberos.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/contrib/slapd-modules/passwd/netscape.c b/contrib/slapd-modules/passwd/netscape.c index 9e309bab50..b880d520c5 100644 --- a/contrib/slapd-modules/passwd/netscape.c +++ b/contrib/slapd-modules/passwd/netscape.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/contrib/slapd-modules/smbk5pwd/README b/contrib/slapd-modules/smbk5pwd/README index 1e134ef91b..ec599bedbf 100644 --- a/contrib/slapd-modules/smbk5pwd/README +++ b/contrib/slapd-modules/smbk5pwd/README @@ -1,4 +1,4 @@ -Copyright 2004 Howard Chu, Symas Corp. All rights reserved. +Copyright 2004-2005 Howard Chu, Symas Corp. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted only as authorized by the OpenLDAP @@ -15,7 +15,12 @@ password hashes for an LDAP user. The Kerberos support is written for Heimdal using its hdb-ldap backend. If a PasswordModify is performed on an entry that has the krb5KDCEntry objectclass, then the krb5Key and krb5KeyVersionNumber will be updated -using the new password in the PasswordModify request. +using the new password in the PasswordModify request. Additionally, a +new "{K5KEY}" password hash mechanism is provided. krb5KDCEntries that +have this hash specifier in their userPassword attribute, Simple Binds +will be checked against the Kerberos keys of the Entry. No data is +needed after the "{K5KEY}" hash specifier in the userPassword, it is +looked up from the Entry directly. The Samba support is written using the Samba 3.0 LDAP schema. If a PasswordModify is performed on an entry that has the sambaSamAccount diff --git a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c index 1a51598009..e82a73e445 100644 --- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c +++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c @@ -1,7 +1,7 @@ /* smbk5pwd.c - Overlay for managing Samba and Heimdal passwords */ /* $OpenLDAP$ */ /* - * Copyright 2004 by Howard Chu, Symas Corp. + * Copyright 2004-2005 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,6 +25,11 @@ #include #ifdef DO_KRB5 +#include +#include +#include +#include + /* make ASN1_MALLOC_ENCODE use our allocator */ #define malloc ch_malloc @@ -155,7 +160,130 @@ static void nthash( } #endif /* DO_SAMBA */ -int smbk5pwd_exop_passwd( +#ifdef DO_KRB5 + +static int smbk5pwd_op_cleanup( + Operation *op, + SlapReply *rs ) +{ + slap_callback *cb; + + /* clear out the current key */ + ldap_pvt_thread_pool_setkey( op->o_threadctx, smbk5pwd_op_cleanup, + NULL, NULL ); + + /* free the callback */ + cb = op->o_callback; + op->o_callback = cb->sc_next; + op->o_tmpfree( cb, op->o_tmpmemctx ); + return 0; +} + +static int smbk5pwd_op_bind( + Operation *op, + SlapReply *rs ) +{ + /* If this is a simple Bind, stash the Op pointer so our chk + * function can find it. Set a cleanup callback to clear it + * out when the Bind completes. + */ + if ( op->oq_bind.rb_method == LDAP_AUTH_SIMPLE ) { + slap_callback *cb; + ldap_pvt_thread_pool_setkey( op->o_threadctx, smbk5pwd_op_cleanup, op, + NULL ); + cb = op->o_tmpcalloc( 1, sizeof(slap_callback), op->o_tmpmemctx ); + cb->sc_cleanup = smbk5pwd_op_cleanup; + cb->sc_next = op->o_callback; + op->o_callback = cb; + } + return SLAP_CB_CONTINUE; +} + +static LUTIL_PASSWD_CHK_FUNC chk_k5key; +static const struct berval scheme = BER_BVC("{K5KEY}"); + +/* This password scheme stores no data in the userPassword attribute + * other than the scheme name. It assumes the invoking entry is a + * krb5KDCentry and compares the passed-in credentials against the + * krb5Key attribute. The krb5Key may be multi-valued, but they are + * simply multiple keytypes generated from the same input string, so + * only the first value needs to be compared here. + * + * Since the lutil_passwd API doesn't pass the Entry object in, we + * have to fetch it ourselves in order to get access to the other + * attributes. We accomplish this with the help of the overlay's Bind + * function, which stores the current Operation pointer in thread-specific + * storage so we can retrieve it here. The Operation provides all + * the necessary context for us to get Entry from the database. + */ +static int chk_k5key( + const struct berval *sc, + const struct berval *passwd, + const struct berval *cred, + const char **text ) +{ + void *ctx; + Operation *op; + int rc; + Entry *e; + Attribute *a; + krb5_error_code ret; + krb5_keyblock key; + krb5_salt salt; + hdb_entry ent; + + /* Find our thread context, find our Operation */ + ctx = ldap_pvt_thread_pool_context(); + + if ( ldap_pvt_thread_pool_getkey( ctx, smbk5pwd_op_cleanup, (void **)&op, NULL ) || + !op ) + return LUTIL_PASSWD_ERR; + + rc = be_entry_get_rw( op, &op->o_req_ndn, NULL, NULL, 0, &e ); + if ( rc != LDAP_SUCCESS ) return LUTIL_PASSWD_ERR; + + rc = LUTIL_PASSWD_ERR; + do { + size_t l; + Key ekey = {0}; + + a = attr_find( e->e_attrs, ad_krb5PrincipalName ); + if (!a ) break; + + memset( &ent, 0, sizeof(ent) ); + ret = krb5_parse_name(context, a->a_vals[0].bv_val, &ent.principal); + if ( ret ) break; + krb5_get_pw_salt( context, ent.principal, &salt ); + krb5_free_principal( context, ent.principal ); + + a = attr_find( e->e_attrs, ad_krb5Key ); + if ( !a ) break; + + ent.keys.len = 1; + ent.keys.val = &ekey; + decode_Key((unsigned char *) a->a_vals[0].bv_val, + (size_t) a->a_vals[0].bv_len, &ent.keys.val[0], &l); + if ( db->master_key_set ) + hdb_unseal_keys( context, db, &ent ); + + krb5_string_to_key_salt( context, ekey.key.keytype, cred->bv_val, + salt, &key ); + + krb5_free_salt( context, salt ); + + if ( memcmp( ekey.key.keyvalue.data, key.keyvalue.data, + key.keyvalue.length ) == 0 ) rc = LUTIL_PASSWD_OK; + + krb5_free_keyblock_contents( context, &key ); + krb5_free_keyblock_contents( context, &ekey.key ); + + } while(0); + be_entry_release_r( op, e ); + return rc; +} +#endif /* DO_KRB5 */ + +static int smbk5pwd_exop_passwd( Operation *op, SlapReply *rs ) { @@ -220,6 +348,8 @@ int smbk5pwd_exop_passwd( keys[i].bv_val = NULL; keys[i].bv_len = 0; + _kadm5_free_keys(kadm_context, ent.keys.len, ent.keys.val); + if ( i != ent.keys.len ) { ber_bvarray_free( keys ); break; @@ -389,6 +519,12 @@ int smbk5pwd_init() { smbk5pwd.on_bi.bi_type = "smbk5pwd"; smbk5pwd.on_bi.bi_extended = smbk5pwd_exop_passwd; +#ifdef DO_KRB5 + smbk5pwd.on_bi.bi_op_bind = smbk5pwd_op_bind; + + lutil_passwd_add( (struct berval *)&scheme, chk_k5key, NULL ); +#endif + return overlay_register( &smbk5pwd ); } diff --git a/contrib/slapd-tools/README b/contrib/slapd-tools/README index c061f2e1b4..80bf61f7c9 100644 --- a/contrib/slapd-tools/README +++ b/contrib/slapd-tools/README @@ -1,4 +1,4 @@ -Copyright 2004 The OpenLDAP Foundation. All rights reserved. +Copyright 2004-2005 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 diff --git a/contrib/slapi-plugins/addrdnvalues/README b/contrib/slapi-plugins/addrdnvalues/README index 415b0ef9a5..970fad4c46 100644 --- a/contrib/slapi-plugins/addrdnvalues/README +++ b/contrib/slapi-plugins/addrdnvalues/README @@ -1,4 +1,4 @@ -Copyright 2003-2004 The OpenLDAP Foundation. All rights reserved. +Copyright 2003-2005 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 diff --git a/doc/Makefile.in b/doc/Makefile.in index 0aad380363..cc57b151a7 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,6 +1,6 @@ ## doc Makefile.in for OpenLDAP # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in index 649a94c0bc..cd8110b728 100644 --- a/doc/man/Makefile.in +++ b/doc/man/Makefile.in @@ -1,6 +1,6 @@ # man Makefile.in for OpenLDAP # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/doc/man/man1/Makefile.in b/doc/man/man1/Makefile.in index d0605db3c4..ec72d43eea 100644 --- a/doc/man/man1/Makefile.in +++ b/doc/man/man1/Makefile.in @@ -1,6 +1,6 @@ # man1 Makefile.in for OpenLDAP # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/doc/man/man1/ldapcompare.1 b/doc/man/man1/ldapcompare.1 index 409e267e4e..8ad047c5a4 100644 --- a/doc/man/man1/ldapcompare.1 +++ b/doc/man/man1/ldapcompare.1 @@ -1,6 +1,6 @@ .TH LDAPCOMPARE 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapcompare \- LDAP compare tool diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1 index 5c2187d5b0..d7063687ad 100644 --- a/doc/man/man1/ldapdelete.1 +++ b/doc/man/man1/ldapdelete.1 @@ -1,6 +1,6 @@ .TH LDAPDELETE 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapdelete \- LDAP delete entry tool diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1 index 2118feb288..5f36dbe79e 100644 --- a/doc/man/man1/ldapmodify.1 +++ b/doc/man/man1/ldapmodify.1 @@ -1,6 +1,6 @@ .TH LDAPMODIFY 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1 index 3ccf57c629..b00d6da60c 100644 --- a/doc/man/man1/ldapmodrdn.1 +++ b/doc/man/man1/ldapmodrdn.1 @@ -1,6 +1,6 @@ .TH LDAPMODRDN 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapmodrdn \- LDAP rename entry tool diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1 index dbcfbca104..c770a01cab 100644 --- a/doc/man/man1/ldappasswd.1 +++ b/doc/man/man1/ldappasswd.1 @@ -1,6 +1,6 @@ .TH LDAPPASSWD 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldappasswd \- change the password of an LDAP entry diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1 index 3f44bc3fdb..f6bcb26bd0 100644 --- a/doc/man/man1/ldapsearch.1 +++ b/doc/man/man1/ldapsearch.1 @@ -1,6 +1,6 @@ .TH LDAPSEARCH 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapsearch \- LDAP search tool diff --git a/doc/man/man1/ldapwhoami.1 b/doc/man/man1/ldapwhoami.1 index ec95cadd5c..89c3d9d412 100644 --- a/doc/man/man1/ldapwhoami.1 +++ b/doc/man/man1/ldapwhoami.1 @@ -1,6 +1,6 @@ .TH LDAPWHOAMI 1 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldapwhoami \- LDAP who am i? tool diff --git a/doc/man/man3/Makefile.in b/doc/man/man3/Makefile.in index 5214a91d78..af516dc0e2 100644 --- a/doc/man/man3/Makefile.in +++ b/doc/man/man3/Makefile.in @@ -1,6 +1,6 @@ # man3 Makefile.in for OpenLDAP # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/doc/man/man3/lber-decode.3 b/doc/man/man3/lber-decode.3 index f3f732929b..ada95df9e1 100644 --- a/doc/man/man3/lber-decode.3 +++ b/doc/man/man3/lber-decode.3 @@ -1,6 +1,6 @@ .TH LBER_DECODE 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ber_get_next, ber_skip_tag, ber_peek_tag, ber_scanf, ber_get_int, diff --git a/doc/man/man3/lber-encode.3 b/doc/man/man3/lber-encode.3 index d596c7f775..13ddc1b1d5 100644 --- a/doc/man/man3/lber-encode.3 +++ b/doc/man/man3/lber-encode.3 @@ -1,6 +1,6 @@ .TH LBER_ENCODE 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ber_alloc_t, ber_flush, ber_printf, ber_put_int, ber_put_enum, ber_put_ostring, ber_put_string, ber_put_null, ber_put_boolean, ber_put_bitstring, ber_start_seq, ber_start_set, ber_put_seq, ber_put_set \- LBER simplified Basic Encoding Rules library routines for encoding diff --git a/doc/man/man3/lber-memory.3 b/doc/man/man3/lber-memory.3 index b2fed65133..b6ec49e27a 100644 --- a/doc/man/man3/lber-memory.3 +++ b/doc/man/man3/lber-memory.3 @@ -1,6 +1,6 @@ .TH LBER_MEMORY 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ber_memalloc, ber_memcalloc, ber_memrealloc, ber_memfree, ber_memvfree \- LBER memory allocators diff --git a/doc/man/man3/lber-types.3 b/doc/man/man3/lber-types.3 index fbe566c262..7ea74dd9c7 100644 --- a/doc/man/man3/lber-types.3 +++ b/doc/man/man3/lber-types.3 @@ -1,6 +1,6 @@ .TH LBER_TYPES 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ber_int_t, ber_uint_t, ber_len_t, ber_slen_t, ber_tag_t, diff --git a/doc/man/man3/ldap.3 b/doc/man/man3/ldap.3 index 9c1bccdbb1..fae4ee2bf7 100644 --- a/doc/man/man3/ldap.3 +++ b/doc/man/man3/ldap.3 @@ -1,6 +1,6 @@ .TH LDAP 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap - OpenLDAP Lightweight Directory Access Protocol API diff --git a/doc/man/man3/ldap_abandon.3 b/doc/man/man3/ldap_abandon.3 index cbba63f439..10ed5c812e 100644 --- a/doc/man/man3/ldap_abandon.3 +++ b/doc/man/man3/ldap_abandon.3 @@ -1,6 +1,6 @@ .TH LDAP_ABANDON 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_abandon, ldap_abandon_ext \- Abandon an LDAP operation in progress diff --git a/doc/man/man3/ldap_add.3 b/doc/man/man3/ldap_add.3 index 94aa428c23..a0faad17ca 100644 --- a/doc/man/man3/ldap_add.3 +++ b/doc/man/man3/ldap_add.3 @@ -1,6 +1,6 @@ .TH LDAP_ADD 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_add, ldap_add_s, ldap_add_ext, ldap_add_ext_s \- Perform an LDAP add operation diff --git a/doc/man/man3/ldap_bind.3 b/doc/man/man3/ldap_bind.3 index a669e72cc9..7f8b94bc8a 100644 --- a/doc/man/man3/ldap_bind.3 +++ b/doc/man/man3/ldap_bind.3 @@ -1,6 +1,6 @@ .TH LDAP_BIND 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_bind, ldap_bind_s, ldap_simple_bind, ldap_simple_bind_s, ldap_kerberos_bind_s, ldap_kerberos_bind1, ldap_kerberos_bind1_s, ldap_kerberos_bind2, ldap_kerberos_bind2_s, ldap_sasl_bind, ldap_sasl_bind_s, ldap_sasl_interactive_bind_s, ldap_parse_sasl_bind_result, ldap_unbind, ldap_unbind_s \- LDAP bind routines diff --git a/doc/man/man3/ldap_compare.3 b/doc/man/man3/ldap_compare.3 index 3d1dbbb94e..224f863328 100644 --- a/doc/man/man3/ldap_compare.3 +++ b/doc/man/man3/ldap_compare.3 @@ -1,6 +1,6 @@ .TH LDAP_COMPARE 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_compare, ldap_compare_s \- Perform an LDAP compare operation diff --git a/doc/man/man3/ldap_delete.3 b/doc/man/man3/ldap_delete.3 index b7669ea485..754f8bbb7f 100644 --- a/doc/man/man3/ldap_delete.3 +++ b/doc/man/man3/ldap_delete.3 @@ -1,6 +1,6 @@ .TH LDAP_DELETE 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_delete, ldap_delete_s \- Perform an LDAP delete operation diff --git a/doc/man/man3/ldap_error.3 b/doc/man/man3/ldap_error.3 index 5b940d7b55..7a77fa1115 100644 --- a/doc/man/man3/ldap_error.3 +++ b/doc/man/man3/ldap_error.3 @@ -1,6 +1,6 @@ .TH LDAP_ERROR 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_perror, ld_errno, ldap_result2error, ldap_errlist, ldap_err2string \- LDAP protocol error handling routines diff --git a/doc/man/man3/ldap_first_attribute.3 b/doc/man/man3/ldap_first_attribute.3 index f8b9f2b938..ede0f79075 100644 --- a/doc/man/man3/ldap_first_attribute.3 +++ b/doc/man/man3/ldap_first_attribute.3 @@ -1,6 +1,6 @@ .TH LDAP_FIRST_ATTRIBUTE 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_first_attribute, ldap_next_attribute \- step through LDAP entry attributes diff --git a/doc/man/man3/ldap_first_entry.3 b/doc/man/man3/ldap_first_entry.3 index b1648c10c1..1e16ca5ae9 100644 --- a/doc/man/man3/ldap_first_entry.3 +++ b/doc/man/man3/ldap_first_entry.3 @@ -1,6 +1,6 @@ .TH LDAP_FIRST_ENTRY 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_first_entry, ldap_next_entry, ldap_count_entries \- LDAP result entry parsing and counting routines diff --git a/doc/man/man3/ldap_first_message.3 b/doc/man/man3/ldap_first_message.3 index c032dcea08..85e325338b 100644 --- a/doc/man/man3/ldap_first_message.3 +++ b/doc/man/man3/ldap_first_message.3 @@ -1,6 +1,6 @@ .TH LDAP_FIRST_MESSAGE 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_first_message, ldap_next_message, ldap_count_messages \- Stepping diff --git a/doc/man/man3/ldap_first_reference.3 b/doc/man/man3/ldap_first_reference.3 index a98e610a96..004c9638b1 100644 --- a/doc/man/man3/ldap_first_reference.3 +++ b/doc/man/man3/ldap_first_reference.3 @@ -1,6 +1,6 @@ .TH LDAP_FIRST_REFERENCE 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_first_reference, ldap_next_reference, ldap_count_references \- Stepping diff --git a/doc/man/man3/ldap_get_dn.3 b/doc/man/man3/ldap_get_dn.3 index b6394b71dd..c1757770de 100644 --- a/doc/man/man3/ldap_get_dn.3 +++ b/doc/man/man3/ldap_get_dn.3 @@ -1,6 +1,6 @@ .TH LDAP_GET_DN 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_get_dn, ldap_explode_dn, ldap_explode_rdn, ldap_dn2ufn \- LDAP DN handling routines diff --git a/doc/man/man3/ldap_get_values.3 b/doc/man/man3/ldap_get_values.3 index 580965da06..3cee384e47 100644 --- a/doc/man/man3/ldap_get_values.3 +++ b/doc/man/man3/ldap_get_values.3 @@ -1,6 +1,6 @@ .TH LDAP_GET_VALUES 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_get_values, ldap_get_values_len, ldap_count_values \- LDAP attribute value handling routines diff --git a/doc/man/man3/ldap_modify.3 b/doc/man/man3/ldap_modify.3 index 39da48bcce..64a0491348 100644 --- a/doc/man/man3/ldap_modify.3 +++ b/doc/man/man3/ldap_modify.3 @@ -1,6 +1,6 @@ .TH LDAP_MODIFY 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_modify, ldap_modify_s \- Perform an LDAP modify operation diff --git a/doc/man/man3/ldap_modrdn.3 b/doc/man/man3/ldap_modrdn.3 index 13945377e0..d45c5ea5ee 100644 --- a/doc/man/man3/ldap_modrdn.3 +++ b/doc/man/man3/ldap_modrdn.3 @@ -1,6 +1,6 @@ .TH LDAP_MODRDN 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_modrdn, ldap_modrdn_s, ldap_modrdn2, ldap_modrdn2_s \- Perform an LDAP modify RDN operation diff --git a/doc/man/man3/ldap_open.3 b/doc/man/man3/ldap_open.3 index 293fbbff7a..5e9d8fb49b 100644 --- a/doc/man/man3/ldap_open.3 +++ b/doc/man/man3/ldap_open.3 @@ -1,6 +1,6 @@ .TH LDAP_OPEN 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_init, ldap_open \- Initialize the LDAP library and open a connection to an LDAP server diff --git a/doc/man/man3/ldap_parse_reference.3 b/doc/man/man3/ldap_parse_reference.3 index 3a0a34d14e..a0991d7c7b 100644 --- a/doc/man/man3/ldap_parse_reference.3 +++ b/doc/man/man3/ldap_parse_reference.3 @@ -1,6 +1,6 @@ .TH LDAP_PARSE_REFERENCE 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_parse_reference \- Extract referrals and controls from a reference message diff --git a/doc/man/man3/ldap_parse_result.3 b/doc/man/man3/ldap_parse_result.3 index fa2374230a..e652256cbe 100644 --- a/doc/man/man3/ldap_parse_result.3 +++ b/doc/man/man3/ldap_parse_result.3 @@ -1,6 +1,6 @@ .TH LDAP_PARSE_RESULT 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_parse_result \- Parsing results diff --git a/doc/man/man3/ldap_result.3 b/doc/man/man3/ldap_result.3 index 6afee4973d..64552a55af 100644 --- a/doc/man/man3/ldap_result.3 +++ b/doc/man/man3/ldap_result.3 @@ -1,6 +1,6 @@ .TH LDAP_RESULT 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_result \- Wait for the result of an LDAP operation diff --git a/doc/man/man3/ldap_schema.3 b/doc/man/man3/ldap_schema.3 index 6e3ddc75e2..d72e308928 100644 --- a/doc/man/man3/ldap_schema.3 +++ b/doc/man/man3/ldap_schema.3 @@ -1,6 +1,6 @@ .TH LDAP_SCHEMA 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 2000-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 2000-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_str2syntax, ldap_syntax2str, ldap_syntax2name, ldap_syntax_free, diff --git a/doc/man/man3/ldap_search.3 b/doc/man/man3/ldap_search.3 index a0489a4835..dcdd07ad84 100644 --- a/doc/man/man3/ldap_search.3 +++ b/doc/man/man3/ldap_search.3 @@ -1,6 +1,6 @@ .TH LDAP_SEARCH 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_search, ldap_search_s, ldap_search_st \- Perform an LDAP search operation diff --git a/doc/man/man3/ldap_sort.3 b/doc/man/man3/ldap_sort.3 index 2f8b356b73..ebca400cf1 100644 --- a/doc/man/man3/ldap_sort.3 +++ b/doc/man/man3/ldap_sort.3 @@ -1,6 +1,6 @@ .TH LDAP_SORT 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_sort_entries, ldap_sort_values, ldap_sort_strcasecmp \- LDAP sorting routines diff --git a/doc/man/man3/ldap_url.3 b/doc/man/man3/ldap_url.3 index 24998f5759..5ed6ee9a9b 100644 --- a/doc/man/man3/ldap_url.3 +++ b/doc/man/man3/ldap_url.3 @@ -1,6 +1,6 @@ .TH LDAP_URL 3 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldap_is_ldap_url, diff --git a/doc/man/man5/Makefile.in b/doc/man/man5/Makefile.in index 81ed991ad4..f51c6a178b 100644 --- a/doc/man/man5/Makefile.in +++ b/doc/man/man5/Makefile.in @@ -1,6 +1,6 @@ # man5 Makefile.in for OpenLDAP # $OpenLDAP$ -## Copyright 1998-2004 The OpenLDAP Foundation. +## Copyright 1998-2005 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5 index 07148ae31c..a2a3141494 100644 --- a/doc/man/man5/ldap.conf.5 +++ b/doc/man/man5/ldap.conf.5 @@ -1,6 +1,6 @@ .TH LDAP.CONF 5 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .UC 6 .SH NAME diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5 index 2ba9484379..d5abe38c83 100644 --- a/doc/man/man5/ldif.5 +++ b/doc/man/man5/ldif.5 @@ -1,6 +1,6 @@ .TH LDIF 5 "RELEASEDATE" "OpenLDAP LDVERSION" .\" $OpenLDAP$ -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME ldif \- LDAP Data Interchange Format diff --git a/doc/man/man5/slapd-bdb.5 b/doc/man/man5/slapd-bdb.5 index a6206d2497..50716b7c7e 100644 --- a/doc/man/man5/slapd-bdb.5 +++ b/doc/man/man5/slapd-bdb.5 @@ -1,5 +1,5 @@ .TH SLAPD-BDB 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .\" $OpenLDAP$ .SH NAME @@ -92,7 +92,11 @@ Some attributes only support a subset of indexes. If only an is given, the indices specified for \fBdefault\fR are maintained. Note that setting a default does not imply that all attributes will be -indexed. +indexed. Also, for best performance, an +.B eq +index should always be configured for the +.B objectClass +attribute. A number of special index parameters may be specified. The index type diff --git a/doc/man/man5/slapd-dnssrv.5 b/doc/man/man5/slapd-dnssrv.5 index f2ea3f4798..c4afb85908 100644 --- a/doc/man/man5/slapd-dnssrv.5 +++ b/doc/man/man5/slapd-dnssrv.5 @@ -1,5 +1,5 @@ .TH SLAPD-DNSSRV 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .\" $OpenLDAP$ .SH NAME diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5 index 7380682d3d..e345281e53 100644 --- a/doc/man/man5/slapd-ldap.5 +++ b/doc/man/man5/slapd-ldap.5 @@ -1,5 +1,5 @@ .TH SLAPD-LDAP 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .\" $OpenLDAP$ .SH NAME diff --git a/doc/man/man5/slapd-ldbm.5 b/doc/man/man5/slapd-ldbm.5 index 9296443cb2..f62d2e6cdc 100644 --- a/doc/man/man5/slapd-ldbm.5 +++ b/doc/man/man5/slapd-ldbm.5 @@ -1,5 +1,5 @@ .TH SLAPD-LDBM 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .\" $OpenLDAP$ .SH NAME @@ -93,7 +93,11 @@ Some attributes only support a subset of indexes. If only an is given, the indices specified for \fBdefault\fR are maintained. Note that setting a default does not imply that all attributes will be -indexed. +indexed. Also, for best performance, an +.B eq +index should always be configured for the +.B objectClass +attribute. A number of special index parameters may be specified. The index type diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5 index f9ef4fc3c8..c063ab2247 100644 --- a/doc/man/man5/slapd-meta.5 +++ b/doc/man/man5/slapd-meta.5 @@ -1,5 +1,5 @@ .TH SLAPD-META 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation, All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation, All Rights Reserved. .\" Copying restrictions apply. See the COPYRIGHT file. .\" Copyright 2001, Pierangelo Masarati, All rights reserved. .\" $OpenLDAP$ diff --git a/doc/man/man5/slapd-monitor.5 b/doc/man/man5/slapd-monitor.5 index 80344166ed..7ecc06a282 100644 --- a/doc/man/man5/slapd-monitor.5 +++ b/doc/man/man5/slapd-monitor.5 @@ -1,5 +1,5 @@ .TH SLAPD-MONITOR 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .\" $OpenLDAP$ .SH NAME diff --git a/doc/man/man5/slapd-passwd.5 b/doc/man/man5/slapd-passwd.5 index 2bc28cd9e6..25eb2c9fae 100644 --- a/doc/man/man5/slapd-passwd.5 +++ b/doc/man/man5/slapd-passwd.5 @@ -1,5 +1,5 @@ .TH SLAPD-PASSWD 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .\" $OpenLDAP$ .SH NAME diff --git a/doc/man/man5/slapd-shell.5 b/doc/man/man5/slapd-shell.5 index 24d217b214..c265616dc2 100644 --- a/doc/man/man5/slapd-shell.5 +++ b/doc/man/man5/slapd-shell.5 @@ -1,5 +1,5 @@ .TH SLAPD-SHELL 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .\" $OpenLDAP$ .SH NAME diff --git a/doc/man/man5/slapd-sql.5 b/doc/man/man5/slapd-sql.5 index e49b7c75f9..03d31c381f 100644 --- a/doc/man/man5/slapd-sql.5 +++ b/doc/man/man5/slapd-sql.5 @@ -41,90 +41,185 @@ for SQL dialects RDBMSes may use, so it may be used for integration and distribution of data on different RDBMSes, OSes, hosts etc., in other words, in highly heterogeneous environment. .LP -This backend is experimental. +This backend is \fIexperimental\fP. .SH CONFIGURATION These .B slapd.conf -options apply to the SQL backend database. -That is, they must follow a "database sql" line and come before any +options apply to the SQL backend database, which means that +they must follow a "database sql" line and come before any subsequent "backend" or "database" lines. -Other database options are described in the +Other database options not specific to this backend are described +in the .BR slapd.conf (5) manual page. +.SH DATA SOURCE CONFIGURATION + .TP .B dbname The name of the ODBC datasource to use. .LP .B dbhost .br -.B dbuser -.br .B dbpasswd +.br +.B dbuser .RS -These three options are generally unneeded, because this information is already -taken from the datasource. -Use them if you need to override datasource settings. +The three above options are generally unneeded, because this information +is taken from the datasource specified by the +.B dbname +directive. +They allow to override datasource settings. Also, several RDBMS' drivers tend to require explicit passing of user/password, even if those are given in datasource (Note: .B dbhost is currently ignored). .RE +.SH SCOPING CONFIGURATION +These options specify SQL query templates for scoping searches. + .TP .B subtree_cond Specifies a where-clause template used to form a subtree search condition -(dn=".*"). +(dn="(.+,)?$"). It may differ from one SQL dialect to another (see samples). +By default, it is constructed based on the knowledge about +how to normalize DN values (e.g. +\fB"(ldap_entries.dn) LIKE CONCAT('%',?)"\fP); +see \fBupper_func\fP, \fBupper_needs_cast\fP, \fBconcat_pattern\fP +and \fBstrcast_func\fP in "HELPER CONFIGURATION" for details. + .TP .B children_cond Specifies a where-clause template used to form a children search condition -(dn="\.+,"). +(dn=".+,$"). It may differ from one SQL dialect to another (see samples). +By default, it is constructed based on the knowledge about +how to normalize DN values (e.g. +\fB"(ldap_entries.dn) LIKE CONCAT('%,',?)"\fP); +see \fBupper_func\fP, \fBupper_needs_cast\fP, \fBconcat_pattern\fP +and \fBstrcast_func\fP in "HELPER CONFIGURATION" for details. + +.TP +.B use_subtree_shortcut { NO | yes } +Do not use the subtree condition when the searchBase is the database +suffix, and the scope is subtree; rather collect all entries. + +.RE +.SH STAMEMENT CONFIGURATION +These options specify SQL query templates for loading schema mapping +metainformation, adding and deleting entries to ldap_entries, etc. +All these and subtree_cond should have the given default values. +For the current value it is recommended to look at the sources, +or in the log output when slapd starts with "-d 5" or greater. +Note that the parameter number and order must not be changed. + .TP .B oc_query +The query that is used to collect the objectClass mapping data +from table \fIldap_oc_mappings\fP; see "METAINFORMATION USED" for details. The default is -.B "SELECT id, name, keytbl, keycol, create_proc, delete_proc, expect_return FROM ldap_oc_mappings" +\fB"SELECT id, name, keytbl, keycol, create_proc, delete_proc, expect_return +FROM ldap_oc_mappings"\fP. + .TP .B at_query +The query that is used to collect the attributeType mapping data +from table \fIldap_attr_mappings\fP; see "METAINFORMATION USED" for details. The default is -.B "SELECT name, sel_expr, from_tbls, join_where, add_proc, delete_proc, param_order, expect_return FROM ldap_attr_mappings WHERE oc_map_id=?" +\fB"SELECT name, sel_expr, from_tbls, join_where, add_proc, delete_proc, +param_order, expect_return FROM ldap_attr_mappings WHERE oc_map_id=?"\fP. + .TP -.B insentry_query +.B id_query +The query that is used to map a DN to an entry +in table \fIldap_entries\fP; see "METAINFORMATION USED" for details. The default is -.B "INSERT INTO ldap_entries (dn, oc_map_id, parent, keyval) VALUES (?, ?, ?, ?)" +\fB"SELECT id,keyval,oc_map_id,dn FROM ldap_entries WHERE "\fP, +where \fB\fP is constructed based on the knowledge about +how to normalize DN values (e.g. \fB"dn=?"\fP if no means to uppercase +strings are available; typically, \fB"(dn)=?"\fP is used); +see \fBupper_func\fP, \fBupper_needs_cast\fP, \fBconcat_pattern\fP +and \fBstrcast_func\fP in "HELPER CONFIGURATION" for details. + .TP -.B delentry_query +.B insentry_stmt +The statement that is used to insert a new entry +in table \fIldap_entries\fP; see "METAINFORMATION USED" for details. The default is -.B "DELETE FROM ldap_entries WHERE id=?" +\fB"INSERT INTO ldap_entries (dn, oc_map_id, parent, keyval) VALUES +(?, ?, ?, ?)"\fP. + +.TP +.B delentry_stmt +The statement that is used to delete an existing entry +from table \fIldap_entries\fP; see "METAINFORMATION USED" for details. +The default is +\fB"DELETE FROM ldap_entries WHERE id=?"\fP. + +.TP +.B delobjclasses_stmt +The statement that is used to delete an existing entry's ID +from table \fIldap_objclasses\fP; see "METAINFORMATION USED" for details. +The default is +\fB""DELETE FROM ldap_entry_objclasses WHERE entry_id=?"\fP. + +.RE +.SH HELPER CONFIGURATION +These statements are used to modify the default behavior of the backend +according to issues of the dialect of the RDBMS. +The first options essentially refer to string and DN normalization +when building filters. +LDAP normalization is more than upper- (or lower-)casing everything; +however, as a reasonable trade-off, for case-sensitive RDBMSes the backend +can be instructed to uppercase strings and DNs by providing +the \fBupper_func\fP directive. +Some RDBMSes, to use functions on arbitrary data types, e.g. string +constants, requires a cast, which is triggered +by the \fBupper_needs_cast\fP directive. +If required, a string cast function can be provided as well, +by using the \fBstrcast_func\fP directive. +Finally, a custom string concatenation pattern may be required; +it is provided by the \fBconcat_pattern\fP directive. -These four options specify SQL query templates for loading schema mapping -metainformation, adding and deleting entries to ldap_entries, etc. -All these and subtree_cond should have the given default values. -For the current value it is recommended to look at the sources, -or in the log output when slapd starts with "-d 5" or greater. -Note that the parameter number and order must not be changed. .TP .B upper_func Specifies the name of a function that converts a given value to uppercase. -This is used for CIS matching when the RDBMS is case sensitive. +This is used for case insensitive matching when the RDBMS is case sensitive. +It may differ from one SQL dialect to another (e.g. \fBUCASE\fP, \fBUPPER\fP +or whatever; see samples). By default, none is used, i.e. strings are not +uppercased, so matches may be case sensitive. + .TP -.B upper_needs_cast { NO | yes} +.B upper_needs_cast { NO | yes } Set this directive to .B yes if .B upper_func -needs an explicit cast when applied to literal strings. The form +needs an explicit cast when applied to literal strings. +A cast in the form .B CAST ( AS VARCHAR()) is used, where .B -is builtin. -This is -.B experimental -and may change in future releases. +is builtin in back-sql; see macro +.B BACKSQL_MAX_DN_LEN +(currently 255; note that slapd's builtin limit, in macro +.BR SLAP_LDAPDN_MAXLEN , +is set to 8192). +This is \fIexperimental\fP and may change in future releases. + +.TP .TP +.B strcast_func +Specifies the name of a function that converts a given value to a string +for appropriate ordering. This is used in "SELECT DISTINCT" statements +for strongly typed RDBMSes with little implicit casting (like PostgreSQL), +when a literal string is specified. +This is \fIexperimental\fP and may change in future releases. + .B concat_pattern This statement defines the .B pattern -to be used to concatenate strings. The +that is used to concatenate strings. The .B pattern MUST contain two question marks, '?', that will be replaced by the two strings that must be concatenated. The default value is @@ -135,40 +230,26 @@ but an explicit cast may be required when operating on literal strings: .BR "CAST(?||? AS VARCHAR())". On some RDBMSes (IBM db2, MSSQL) the form .B "?+?" -is known to work. +is known to work as well. Carefully check the documentation of your RDBMS or stay with the examples for supported ones. -This is -.B experimental -and may change in future releases. -.TP -.B strcast_func -Specifies the name of a function that converts a given value to a string -for appropriate ordering. This is used in "SELECT DISTINCT" statements -for strongly typed RDBMSes with little implicit casting (like PostgreSQL), -when a literal string is specified. -This is -.B experimental -and may change in future releases. +This is \fIexperimental\fP and may change in future releases. + .TP .B has_ldapinfo_dn_ru { NO | yes } -Explicitly inform the backend whether the SQL schema has dn_ru column -(dn in reverse uppercased form) or not. -Overrides automatic check (required by PostgreSQL/unixODBC). -This is -.B experimental -and may change in future releases. +Explicitly inform the backend whether the dn_ru column +(DN in reverse uppercased form) is present in table \fIldap_entries\fP. +Overrides automatic check (this is required, ofr instance, +by PostgreSQL/unixODBC). +This is \fIexperimental\fP and may change in future releases. .TP .B fail_if_no_mapping { NO | yes } When set to .B yes -it forces -.I attribute -write operations to fail if no appropriate mapping between LDAP attributes -and SQL data is available. -The default behavior is to ignore those changes that cannot be mapped -correctly. +it forces \fIattribute\fP write operations to fail if no appropriate +mapping between LDAP attributes and SQL data is available. +The default behavior is to ignore those changes that cannot be mapped. It has no impact on objectClass mapping, i.e. if the .I structuralObjectClass of an entry cannot be mapped to SQL by looking up its name @@ -177,9 +258,7 @@ in ldap_oc_mappings, an operation will fail regardless of the .B fail_if_no_mapping switch; see section "METAINFORMATION USED" for details. -This is -.B experimental -and may change in future releases. +This is \fIexperimental\fP and may change in future releases. .TP .B allow_orphans { NO | yes } @@ -191,26 +270,53 @@ in conjunction with some special rule on the RDBMS side that dynamically creates the missing parent. .TP -.B baseObject [filename] +.B baseObject [ ] Instructs the database to create and manage an in-memory baseObject entry instead of looking for one in the RDBMS. If the (optional) -.B filename -argument is given, the entry is read from file -.B filename -in +.B +argument is given, the entry is read from that file in .BR LDIF (5) -form. -This is particularly useful when -.B ldap_entries +format; otherwise, an entry with objectClass \fBextensibleObject\fP +is created based on the contents of the RDN of the \fIbaseObject\fP. +This is particularly useful when \fIldap_entries\fP information is stored in a view rather than in a table, and .B union is not supported for views, so that the view can only specify one rule to compute the entry structure for one objectClass. This topic is discussed further in section "METAINFORMATION USED". -This is -.B experimental -and may change in future releases. +This is \fIexperimental\fP and may change in future releases. + +.TP +.B create_needs_select { NO | yes } +Instructs the database whether or not entry creation +in table \fIldap_entries\fP needs a subsequent select to collect +the automatically assigned ID, instead of being returned +by a stored procedure. + +.LP +.B fetch_attrs +.br +.B fetch_all_attrs { NO | yes } +.RS +The first statement allows to provide a list of attributes that +must always be fetched in addition to those requested by any specific +operation, because they are required for the proper usage of the +backend. For instance, all attributes used in ACLs should be listed +here. The second statement is a shortcut to require all attributes +to be always loaded. Note that the dynamically generated attributes, +e.g. \fIhasSubordinates\fP, \fIentryDN\fP and other implementation +dependent attributes are \fBNOT\fP generated at this point, for +consistency with the rest of slapd. This may change in the future. +.RE + +.TP +.B sqllayer [...] +Loads the layer \fB\fP onto a stack of helpers that are used +to map DNs from LDAP to SQL representation and vice-versa. +Subsequent args are passed to the layer configuration routine. +This is \fIhighly experimental\fP and should be used with extreme care. +The API of the layers is not frozen yet, so it is unpublished. .SH METAINFORMATION USED .LP @@ -280,7 +386,7 @@ for telephoneNumber we can use: .LP .nf SELECT phones.phone AS telephoneNumber FROM persons,phones - WHERE persons.id=phones.pers_id AND persons.id=? + WHERE persons.id=phones.pers_id AND persons.id=? .fi .LP If we wanted to service LDAP requests with filters like @@ -288,11 +394,15 @@ If we wanted to service LDAP requests with filters like .LP .nf SELECT ... FROM persons,phones - WHERE persons.id=phones.pers_id - AND persons.id=? - AND phones.phone like '123%' + WHERE persons.id=phones.pers_id + AND persons.id=? + AND phones.phone like '%1%2%3%' .fi .LP +(note how the telephoneNumber match is expanded in multiple wildcards +to account for interspersed ininfluential chars like spaces, dashes +and so; this occurs by design because telephoneNumber is defined after +a specially recognized syntax). So, if we had information about what tables contain values for each attribute, how to join these tables and arrange these values, we could try to automatically generate such statements, and translate search @@ -402,13 +512,15 @@ like this (by Robin Elfrink): CREATE VIEW ldap_entries (id, dn, oc_map_id, parent, keyval) AS SELECT 0, UPPER('o=MyCompany,c=NL'), - 3, 0, 'baseObject' FROM unixusers WHERE userid='root' UNION + 3, 0, 'baseObject' FROM unixusers WHERE userid='root' + UNION SELECT (1000000000+userid), - UPPER(CONCAT(CONCAT('cn=',gecos),',o=MyCompany,c=NL')), - 1, 0, userid FROM unixusers UNION + UPPER(CONCAT(CONCAT('cn=',gecos),',o=MyCompany,c=NL')), + 1, 0, userid FROM unixusers + UNION SELECT (2000000000+groupnummer), - UPPER(CONCAT(CONCAT('cn=',groupnaam),',o=MyCompany,c=NL')), - 2, 0, groupnummer FROM groups; + UPPER(CONCAT(CONCAT('cn=',groupnaam),',o=MyCompany,c=NL')), + 2, 0, groupnummer FROM groups; .fi .LP @@ -439,7 +551,7 @@ query generated (which loads candidate IDs) AND ldap_entries.objclass=? AND ldap_entries.parent=? AND phones.pers_id=persons.id - AND (phones.phone LIKE '123%') + AND (phones.phone LIKE '%1%2%3%') .fi .LP (for ONELEVEL search) @@ -465,24 +577,23 @@ ADD, DELETE, MODIFY and MODRDN operations are also performed on per-attribute metainformation (add_proc etc.). In those fields one can specify an SQL statement or stored procedure call which can add, or delete given values of a given attribute, using -the given entry keyval (see examples -- mostly ORACLE and MSSQL - since -there're no stored procs in mySQL). +the given entry keyval (see examples -- mostly PostgreSQL, ORACLE and MSSQL +- since as of this writing there are no stored procs in MySQL). .LP -We just add more columns to oc_mappings and attr_mappings, holding +We just add more columns to ldap_oc_mappings and ldap_attr_mappings, holding statements to execute (like create_proc, add_proc, del_proc etc.), and flags governing the order of parameters passed to those statements. Please see samples to find out what are the parameters passed, and other information on this matter - they are self-explanatory for those familiar -with concept expressed above. +with the concepts expressed above. .LP .SH Common techniques (referrals, multiclassing etc.) First of all, let's remember that among other major differences to the complete LDAP data model, the concept above does not directly support such things as multiple objectclasses per entry, and referrals. Fortunately, they are easy to adopt in this scheme. -The SQL backend suggests two more tables being added to the schema - -ldap_entry_objectclasses(entry_id,oc_name), and -ldap_referrals(entry_id,url). +The SQL backend suggests one more table being added to the schema: +ldap_entry_objectclasses(entry_id,oc_name). .LP The first contains any number of objectclass names that corresponding entries will be found by, in addition to that mentioned in @@ -492,29 +603,43 @@ attribute to each objectclass mapping that loads values from this table. So, you may, for instance, have a mapping for inetOrgPerson, and use it for queries for "person" objectclass... .LP -The second table contains any number of referrals associated with a given entry. -The SQL backend automatically adds attribute mapping for "ref" attribute -to each objectclass mapping that loads values from this table. -So, if you add objectclass "referral" to this entry, and make one or -more tuples in ldap_referrals for this entry (they will be seen as -values of "ref" attribute), you will have slapd return a referral, as -described in the Administrators Guide. +Referrals used to be implemented in a loose manner by adding an extra +table that allowed any entry to host a "ref" attribute, along with +a "referral" extra objectClass in table ldap_entry_objclasses. +In the current implementation, referrals are treated like any other +user-defined schema, since "referral" is a structural objectclass. +The suggested practice is to define a "referral" entry in ldap_oc_mappings, +holding a naming attribute, e.g. "ou" or "cn", a "ref" attribute, +containing the url; in case multiple referrals per entry are needed, +a separate table for urls can be created, where urls are mapped +to the respective entries. +The use of the naming attribute usually requires to add +an "extensibleObject" value to ldap_entry_objclasses. + .LP .SH Caveats As previously stated, this backend should not be considered a replacement of other data storage backends, but rather a gateway to existing RDBMS storages that need to be published in LDAP form. .LP -The hasSubordintes operational attribute is honored by back-sql +The \fBhasSubordintes\fP operational attribute is honored by back-sql in search results and in compare operations; it is partially honored -also in filtering. Owing to design limitations, a (braindead) filter +also in filtering. Owing to design limitations, a (braindead?) filter of the form \fB(!(hasSubordinates=TRUE))\fP -will give no results instead of returning all the leaf entries. +will give no results instead of returning all the leaf entries, because +it actually expands into \fB... AND NOT (1=1)\fP. If you need to find all the leaf entries, please use \fB(hasSubordinates=FALSE)\fP instead. .LP +A directoryString value of the form "__First___Last_" +(where underscores should be replaced by spaces) corresponds +to its prettified counterpart "First_Last"; this is not currently +honored by back-sql if non-prettified data is written via RDBMS; +when non-prettified data is written thru back-sql, the prettified +values are actually used instead. +.LP .SH PROXY CACHE OVERLAY The proxy cache overlay allows caching of LDAP search requests (queries) in a local database. @@ -525,6 +650,7 @@ for details. There are example SQL modules in the slapd/back-sql/rdbms_depend/ directory in the OpenLDAP source tree. .SH FILES + .TP ETCDIR/slapd.conf default slapd configuration file diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5 index 9fffff3ed7..be14cf19fb 100644 --- a/doc/man/man5/slapd.access.5 +++ b/doc/man/man5/slapd.access.5 @@ -1,5 +1,5 @@ .TH SLAPD.ACCESS 5 "RELEASEDATE" "OpenLDAP LDVERSION" -.\" Copyright 1998-2004 The OpenLDAP Foundation All Rights Reserved. +.\" Copyright 1998-2005 The OpenLDAP Foundation All Rights Reserved. .\" Copying restrictions apply. See COPYRIGHT/LICENSE. .SH NAME slapd.access \- access configuration for slapd, the stand-alone LDAP daemon @@ -190,20 +190,19 @@ form is given, is implied, i.e. all attributes are addressed. .LP Using the form -.B attrs= val[.