Commit ec2cb12e authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#9010 - Delete back-bdb/back-hdb

This commits deletes all references and code for back-bdb and back-hdb.
There is some follow up work still necessary to flush out the admin
guide for back-mdb.
parent ebf0ef5c
...@@ -152,33 +152,6 @@ libraries/librewrite/rewrite ...@@ -152,33 +152,6 @@ libraries/librewrite/rewrite
libraries/librewrite/version.c libraries/librewrite/version.c
servers/slapd/.backend servers/slapd/.backend
servers/slapd/all-cffiles servers/slapd/all-cffiles
servers/slapd/back-hdb/add.c
servers/slapd/back-hdb/attr.c
servers/slapd/back-hdb/bind.c
servers/slapd/back-hdb/cache.c
servers/slapd/back-hdb/compare.c
servers/slapd/back-hdb/config.c
servers/slapd/back-hdb/dbcache.c
servers/slapd/back-hdb/delete.c
servers/slapd/back-hdb/dn2entry.c
servers/slapd/back-hdb/dn2id.c
servers/slapd/back-hdb/error.c
servers/slapd/back-hdb/extended.c
servers/slapd/back-hdb/filterindex.c
servers/slapd/back-hdb/id2entry.c
servers/slapd/back-hdb/idl.c
servers/slapd/back-hdb/index.c
servers/slapd/back-hdb/init.c
servers/slapd/back-hdb/key.c
servers/slapd/back-hdb/modify.c
servers/slapd/back-hdb/modrdn.c
servers/slapd/back-hdb/monitor.c
servers/slapd/back-hdb/nextid.c
servers/slapd/back-hdb/operational.c
servers/slapd/back-hdb/referral.c
servers/slapd/back-hdb/search.c
servers/slapd/back-hdb/tools.c
servers/slapd/back-hdb/trans.c
servers/slapd/backends.c servers/slapd/backends.c
servers/slapd/overlays/statover.c servers/slapd/overlays/statover.c
servers/slapd/slapacl servers/slapd/slapacl
......
...@@ -73,9 +73,6 @@ Making and Installing the OpenLDAP Distribution ...@@ -73,9 +73,6 @@ Making and Installing the OpenLDAP Distribution
6. Test the standalone system: 6. Test the standalone system:
This step requires the standalone LDAP server, slapd(8), with HDB
and/or BDB support.
% make test % make test
If all goes well, the system has been built as configured. If If all goes well, the system has been built as configured. If
......
...@@ -270,298 +270,6 @@ if test $ac_cv_header_unicode_utypes_h = yes ; then ...@@ -270,298 +270,6 @@ if test $ac_cv_header_unicode_utypes_h = yes ; then
fi fi
fi fi
]) ])
dnl
dnl ====================================================================
dnl Berkeley DB macros
dnl
dnl --------------------------------------------------------------------
dnl Try to link
AC_DEFUN([OL_BERKELEY_DB_TRY],
[if test $ol_cv_lib_db = no ; then
AC_CACHE_CHECK([for Berkeley DB link (]ifelse($2,,default,$2)[)],[$1],
[
ol_DB_LIB=ifelse($2,,,$2)
ol_LIBS=$LIBS
LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_DB_185_H
# include <db_185.h>
#else
# include <db.h>
#endif
#ifndef DB_VERSION_MAJOR
# define DB_VERSION_MAJOR 1
#endif
#ifndef NULL
#define NULL ((void*)0)
#endif
]], [[
#if DB_VERSION_MAJOR > 2
db_env_create( NULL, 0 );
#elif DB_VERSION_MAJOR > 1
db_appexit( NULL );
#else
(void) dbopen( NULL, 0, 0, 0, NULL);
#endif
]])],[$1=yes],[$1=no])
LIBS="$ol_LIBS"
])
if test $$1 = yes ; then
ol_cv_lib_db=ifelse($2,,yes,$2)
fi
fi
])
dnl
dnl --------------------------------------------------------------------
dnl Get major and minor version from <db.h>
AC_DEFUN([OL_BDB_HEADER_VERSION],
[AC_CACHE_CHECK([for Berkeley DB major version in db.h], [ol_cv_bdb_major],[
AC_LANG_CONFTEST([AC_LANG_SOURCE([
#include <db.h>
#ifndef DB_VERSION_MAJOR
# define DB_VERSION_MAJOR 1
#endif
__db_version DB_VERSION_MAJOR
])])
set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
ol_cv_bdb_major=${3}
])
case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
AC_MSG_ERROR([Unknown Berkeley DB major version in db.h]) ;;
esac
dnl Determine minor version
AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
AC_LANG_CONFTEST([AC_LANG_SOURCE([
#include <db.h>
#ifndef DB_VERSION_MINOR
# define DB_VERSION_MINOR 0
#endif
__db_version DB_VERSION_MINOR
])])
set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
ol_cv_bdb_minor=${3}
])
case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
AC_MSG_ERROR([Unknown Berkeley DB minor version in db.h]) ;;
esac
])
dnl
dnl --------------------------------------------------------------------
dnl Try to locate appropriate library
AC_DEFUN([OL_BERKELEY_DB_LINK],
[ol_cv_lib_db=no
if test $ol_cv_bdb_major = 5 ; then
OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor])
OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor])
OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])
OL_BERKELEY_DB_TRY(ol_cv_db_db_5_m,[-ldb-5-$ol_cv_bdb_minor])
OL_BERKELEY_DB_TRY(ol_cv_db_db_5,[-ldb-5])
OL_BERKELEY_DB_TRY(ol_cv_db_db5,[-ldb5])
elif test $ol_cv_bdb_major = 4 ; then
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_m,[-ldb-4.$ol_cv_bdb_minor])
OL_BERKELEY_DB_TRY(ol_cv_db_db4m,[-ldb4$ol_cv_bdb_minor])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4m,[-ldb-4$ol_cv_bdb_minor])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4_m,[-ldb-4-$ol_cv_bdb_minor])
OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4])
OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
fi
OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb])
OL_BERKELEY_DB_TRY(ol_cv_db_none)
])
dnl
dnl --------------------------------------------------------------------
dnl Check if Berkeley DB version
AC_DEFUN([OL_BERKELEY_DB_VERSION],
[AC_CACHE_CHECK([for Berkeley DB library and header version match], [ol_cv_berkeley_db_version], [
ol_LIBS="$LIBS"
LIBS="$LTHREAD_LIBS $LIBS"
if test $ol_cv_lib_db != yes ; then
LIBS="$ol_cv_lib_db $LIBS"
fi
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#ifdef HAVE_DB_185_H
choke me;
#else
#include <db.h>
#endif
#ifndef DB_VERSION_MAJOR
# define DB_VERSION_MAJOR 1
#endif
#ifndef NULL
#define NULL ((void *)0)
#endif
main()
{
#if DB_VERSION_MAJOR > 1
char *version;
int major, minor, patch;
version = db_version( &major, &minor, &patch );
if( major != DB_VERSION_MAJOR ||
minor != DB_VERSION_MINOR ||
patch != DB_VERSION_PATCH )
{
printf("Berkeley DB version mismatch\n"
"\theader: %s\n\tlibrary: %s\n",
DB_VERSION_STRING, version);
return 1;
}
#endif
return 0;
}]])],[ol_cv_berkeley_db_version=yes],[ol_cv_berkeley_db_version=no],[ol_cv_berkeley_db_version=cross])
LIBS="$ol_LIBS"
])
if test $ol_cv_berkeley_db_version = no ; then
AC_MSG_ERROR([Berkeley DB version mismatch])
fi
])dnl
dnl
dnl --------------------------------------------------------------------
dnl Check if Berkeley DB supports DB_THREAD
AC_DEFUN([OL_BERKELEY_DB_THREAD],
[AC_CACHE_CHECK([for Berkeley DB thread support], [ol_cv_berkeley_db_thread], [
ol_LIBS="$LIBS"
LIBS="$LTHREAD_LIBS $LIBS"
if test $ol_cv_lib_db != yes ; then
LIBS="$ol_cv_lib_db $LIBS"
fi
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#ifdef HAVE_DB_185_H
choke me;
#else
#include <db.h>
#endif
#ifndef NULL
#define NULL ((void *)0)
#endif
main()
{
int rc;
u_int32_t flags = DB_CREATE |
#ifdef DB_PRIVATE
DB_PRIVATE |
#endif
DB_THREAD;
#if DB_VERSION_MAJOR > 2
DB_ENV *env = NULL;
rc = db_env_create( &env, 0 );
flags |= DB_INIT_MPOOL;
#ifdef DB_MPOOL_PRIVATE
flags |= DB_MPOOL_PRIVATE;
#endif
if( rc ) {
printf("BerkeleyDB: %s\n", db_strerror(rc) );
return rc;
}
#if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1)
rc = (env->open)( env, NULL, flags, 0 );
#else
rc = (env->open)( env, NULL, NULL, flags, 0 );
#endif
if ( rc == 0 ) {
rc = env->close( env, 0 );
}
if( rc ) {
printf("BerkeleyDB: %s\n", db_strerror(rc) );
return rc;
}
#else
DB_ENV env;
memset( &env, '\0', sizeof(env) );
rc = db_appinit( NULL, NULL, &env, flags );
if( rc == 0 ) {
db_appexit( &env );
}
unlink("__db_mpool.share");
unlink("__db_lock.share");
#endif
return rc;
}]])],[ol_cv_berkeley_db_thread=yes],[ol_cv_berkeley_db_thread=no],[ol_cv_berkeley_db_thread=cross])
LIBS="$ol_LIBS"
])
if test $ol_cv_berkeley_db_thread != no ; then
AC_DEFINE(HAVE_BERKELEY_DB_THREAD, 1,
[define if Berkeley DB has DB_THREAD support])
fi
])dnl
dnl
dnl --------------------------------------------------------------------
dnl Find any DB
AC_DEFUN([OL_BERKELEY_DB],
[ol_cv_berkeley_db=no
AC_CHECK_HEADERS(db.h)
if test $ac_cv_header_db_h = yes; then
OL_BDB_HEADER_VERSION
OL_BDB_COMPAT
if test $ol_cv_bdb_compat != yes ; then
AC_MSG_ERROR([BerkeleyDB version incompatible with BDB/HDB backends])
fi
OL_BERKELEY_DB_LINK
if test "$ol_cv_lib_db" != no ; then
ol_cv_berkeley_db=yes
OL_BERKELEY_DB_VERSION
OL_BERKELEY_DB_THREAD
fi
fi
])
dnl --------------------------------------------------------------------
dnl Check for version compatibility with back-bdb
AC_DEFUN([OL_BDB_COMPAT],
[AC_CACHE_CHECK([if Berkeley DB version supported by BDB/HDB backends], [ol_cv_bdb_compat],[
AC_EGREP_CPP(__db_version_compat,[
#include <db.h>
/* this check could be improved */
#ifndef DB_VERSION_MAJOR
# define DB_VERSION_MAJOR 1
#endif
#ifndef DB_VERSION_MINOR
# define DB_VERSION_MINOR 0
#endif
#ifndef DB_VERSION_PATCH
# define DB_VERSION_PATCH 0
#endif
#define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
/* require 4.4 or later, but less than 6.0.20 */
#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
__db_version_compat
#endif
#if DB_VERSION_FULL >= 0x060014
#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
#endif
], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
])
dnl dnl
dnl ==================================================================== dnl ====================================================================
......
...@@ -163,7 +163,6 @@ CLIENT_LIBS = @CLIENT_LIBS@ ...@@ -163,7 +163,6 @@ CLIENT_LIBS = @CLIENT_LIBS@
LUTIL_LIBS = @LUTIL_LIBS@ LUTIL_LIBS = @LUTIL_LIBS@
LTHREAD_LIBS = @LTHREAD_LIBS@ LTHREAD_LIBS = @LTHREAD_LIBS@
BDB_LIBS = @BDB_LIBS@
SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@
WT_LIBS = @WT_LIBS@ WT_LIBS = @WT_LIBS@
......
...@@ -300,9 +300,7 @@ OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no) ...@@ -300,9 +300,7 @@ OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl SLAPD Backend Options dnl SLAPD Backend Options
Backends="bdb \ Backends="dnssrv \
dnssrv \
hdb \
ldap \ ldap \
mdb \ mdb \
meta \ meta \
...@@ -323,12 +321,8 @@ SLAPD Backend Options:]) ...@@ -323,12 +321,8 @@ SLAPD Backend Options:])
OL_ARG_ENABLE(backends,[ --enable-backends enable all available backends], OL_ARG_ENABLE(backends,[ --enable-backends enable all available backends],
--, [no yes mod])dnl --, [no yes mod])dnl
OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend],
no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend],
no, [no yes mod], ol_enable_backends)dnl no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(hdb,[ --enable-hdb enable Hierarchical DB backend],
no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend],
no, [no yes mod], ol_enable_backends)dnl no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(mdb,[ --enable-mdb enable mdb database backend], OL_ARG_ENABLE(mdb,[ --enable-mdb enable mdb database backend],
...@@ -498,9 +492,7 @@ if test $ol_enable_slapd = no ; then ...@@ -498,9 +492,7 @@ if test $ol_enable_slapd = no ; then
ol_enable_rewrite=no ol_enable_rewrite=no
elif test $ol_enable_modules != yes && elif test $ol_enable_modules != yes &&
test $ol_enable_bdb = no &&
test $ol_enable_dnssrv = no && test $ol_enable_dnssrv = no &&
test $ol_enable_hdb = no &&
test $ol_enable_ldap = no && test $ol_enable_ldap = no &&
test $ol_enable_mdb = no && test $ol_enable_mdb = no &&
test $ol_enable_meta = no && test $ol_enable_meta = no &&
...@@ -566,7 +558,6 @@ dnl ---------------------------------------------------------------- ...@@ -566,7 +558,6 @@ dnl ----------------------------------------------------------------
dnl Initialize vars dnl Initialize vars
LDAP_LIBS= LDAP_LIBS=
BDB_LIBS=
SLAPD_NDB_LIBS= SLAPD_NDB_LIBS=
SLAPD_NDB_INCS= SLAPD_NDB_INCS=
LTHREAD_LIBS= LTHREAD_LIBS=
...@@ -583,9 +574,7 @@ BUILD_THREAD=no ...@@ -583,9 +574,7 @@ BUILD_THREAD=no
BUILD_SLAPI=no BUILD_SLAPI=no
SLAPD_SLAPI_DEPEND= SLAPD_SLAPI_DEPEND=
BUILD_BDB=no
BUILD_DNSSRV=no BUILD_DNSSRV=no
BUILD_HDB=no
BUILD_LDAP=no BUILD_LDAP=no
BUILD_MDB=no BUILD_MDB=no
BUILD_META=no BUILD_META=no
...@@ -1883,36 +1872,6 @@ else ...@@ -1883,36 +1872,6 @@ else
ol_cv_func_gethostbyaddr_r_nargs=0 ol_cv_func_gethostbyaddr_r_nargs=0
fi fi
dnl ----------------------------------------------------------------
ol_link_bdb=no
if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
OL_BERKELEY_DB
if test $ol_cv_berkeley_db = no ; then
AC_MSG_ERROR(BDB/HDB: BerkeleyDB not available)
fi
AC_DEFINE(HAVE_BERKELEY_DB,1,
[define this if Berkeley DB is available])
dnl $ol_cv_lib_db should be yes or -ldb
dnl (it could be no, but that would be an error
if test $ol_cv_lib_db != yes ; then
BDB_LIBS="$BDB_LIBS $ol_cv_lib_db"
fi
dnl link BDB library to slapd when there is a
dnl static BDB based backend in use
if test $ol_enable_bdb/$ol_enable_hdb != mod/mod ; then
if test $ol_enable_bdb = yes -o $ol_enable_hdb = yes ; then
SLAPD_LIBS="$SLAPD_LIBS \$(BDB_LIBS)"
fi
fi
ol_link_bdb=yes
fi
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then
...@@ -2667,19 +2626,6 @@ if test "$ol_enable_monitor" != no ; then ...@@ -2667,19 +2626,6 @@ if test "$ol_enable_monitor" != no ; then
AC_DEFINE_UNQUOTED(SLAPD_MONITOR,$MFLAG,[define to support cn=Monitor backend]) AC_DEFINE_UNQUOTED(SLAPD_MONITOR,$MFLAG,[define to support cn=Monitor backend])
fi fi
if test "$ol_enable_bdb" != no ; then
BUILD_SLAPD=yes
BUILD_BDB=$ol_enable_bdb
if test "$ol_enable_bdb" = mod ; then
SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
MFLAG=SLAPD_MOD_DYNAMIC
else
SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb"
MFLAG=SLAPD_MOD_STATIC
fi
AC_DEFINE_UNQUOTED(SLAPD_BDB,$MFLAG,[define to support BDB backend])
fi
if test "$ol_enable_dnssrv" != no ; then if test "$ol_enable_dnssrv" != no ; then
BUILD_SLAPD=yes BUILD_SLAPD=yes
BUILD_DNSSRV=$ol_enable_dnssrv BUILD_DNSSRV=$ol_enable_dnssrv
...@@ -2693,19 +2639,6 @@ if test "$ol_enable_dnssrv" != no ; then ...@@ -2693,19 +2639,6 @@ if test "$ol_enable_dnssrv" != no ; then
AC_DEFINE_UNQUOTED(SLAPD_DNSSRV,$MFLAG,[define to support DNS SRV backend]) AC_DEFINE_UNQUOTED(SLAPD_DNSSRV,$MFLAG,[define to support DNS SRV backend])
fi fi
if test "$ol_enable_hdb" != no ; then
BUILD_SLAPD=yes
BUILD_HDB=$ol_enable_hdb
if test "$ol_enable_hdb" = mod ; then
SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb"
MFLAG=SLAPD_MOD_DYNAMIC
else
SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-hdb"
MFLAG=SLAPD_MOD_STATIC
fi
AC_DEFINE_UNQUOTED(SLAPD_HDB,$MFLAG,[define to support HDB backend])
fi
if test "$ol_enable_ldap" != no ; then if test "$ol_enable_ldap" != no ; then
BUILD_SLAPD=yes BUILD_SLAPD=yes
BUILD_LDAP=$ol_enable_ldap BUILD_LDAP=$ol_enable_ldap
...@@ -3172,9 +3105,7 @@ dnl slapi ...@@ -3172,9 +3105,7 @@ dnl slapi
AC_SUBST(BUILD_SLAPI) AC_SUBST(BUILD_SLAPI)
AC_SUBST(SLAPD_SLAPI_DEPEND) AC_SUBST(SLAPD_SLAPI_DEPEND)
dnl backends dnl backends
AC_SUBST(BUILD_BDB)
AC_SUBST(BUILD_DNSSRV) AC_SUBST(BUILD_DNSSRV)
AC_SUBST(BUILD_HDB)
AC_SUBST(BUILD_LDAP) AC_SUBST(BUILD_LDAP)
AC_SUBST(BUILD_MDB) AC_SUBST(BUILD_MDB)
AC_SUBST(BUILD_META) AC_SUBST(BUILD_META)
...@@ -3217,7 +3148,6 @@ dnl overlays ...@@ -3217,7 +3148,6 @@ dnl overlays
AC_SUBST(LDAP_LIBS) AC_SUBST(LDAP_LIBS)
AC_SUBST(CLIENT_LIBS) AC_SUBST(CLIENT_LIBS)
AC_SUBST(SLAPD_LIBS) AC_SUBST(SLAPD_LIBS)
AC_SUBST(BDB_LIBS)
AC_SUBST(SLAPD_NDB_LIBS) AC_SUBST(SLAPD_NDB_LIBS)
AC_SUBST(SLAPD_NDB_INCS) AC_SUBST(SLAPD_NDB_INCS)
AC_SUBST(LTHREAD_LIBS) AC_SUBST(LTHREAD_LIBS)
...@@ -3286,9 +3216,7 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk] ...@@ -3286,9 +3216,7 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk]
[libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk] [libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk]
[servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk] [servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk]
[servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk] [servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk]
[servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk]
[servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk] [servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk]
[servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk]
[servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk] [servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk]
[servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk] [servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk]
[servers/slapd/back-mdb/Makefile:build/top.mk:servers/slapd/back-mdb/Makefile.in:build/mod.mk] [servers/slapd/back-mdb/Makefile:build/top.mk:servers/slapd/back-mdb/Makefile.in:build/mod.mk]
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* Caveats: * Caveats:
* - right now, the overlay assumes that all values of the objectClass * - right now, the overlay assumes that all values of the objectClass
* attribute will be returned in rs->sr_entry; this may not be true * attribute will be returned in rs->sr_entry; this may not be true
* in general, but it usually is for back-bdb/back-hdb. To generalize, * in general, but it usually is for back-mdb. To generalize,
* the search request should be analyzed, and if allowedAttributes or * the search request should be analyzed, and if allowedAttributes or
* allowedAttributesEffective are requested, add objectClass to the * allowedAttributesEffective are requested, add objectClass to the
* requested attributes * requested attributes
......
...@@ -21,7 +21,7 @@ To use the overlay, add: ...@@ -21,7 +21,7 @@ To use the overlay, add:
moduleload <path to>nssov.so moduleload <path to>nssov.so
... ...
database hdb database mdb
... ...
overlay nssov overlay nssov
...@@ -65,7 +65,7 @@ See the nss-ldapd/README for the original attribute names used in this code. ...@@ -65,7 +65,7 @@ See the nss-ldapd/README for the original attribute names used in this code.
The overlay also supports dynamic configuration in cn=config. The layout The overlay also supports dynamic configuration in cn=config. The layout
of the config entry is of the config entry is
dn: olcOverlay={0}nssov,ocDatabase={1}hdb,cn=config dn: olcOverlay={0}nssov,ocDatabase={1}mdb,cn=config
objectClass: olcOverlayConfig objectClass: olcOverlayConfig
objectClass: olcNssOvConfig objectClass: olcNssOvConfig
olcOverlay: {0}nssov olcOverlay: {0}nssov
......
...@@ -278,7 +278,7 @@ of the config entry is ...@@ -278,7 +278,7 @@ of the config entry is
.LP .LP
.RS .RS
.nf .nf
dn: olcOverlay={0}nssov,ocDatabase={1}hdb,cn=config dn: olcOverlay={0}nssov,ocDatabase={1}mdb,cn=config
objectClass: olcOverlayConfig objectClass: olcOverlayConfig
objectClass: olcNssOvConfig objectClass: olcNssOvConfig
olcOverlay: {0}nssov olcOverlay: {0}nssov
......
...@@ -147,11 +147,6 @@ search over 500 thousand entries per second. The search was on an unindexed ...@@ -147,11 +147,6 @@ search over 500 thousand entries per second. The search was on an unindexed
attribute using a filter that would not match any entry, forcing slapd to examine attribute using a filter that would not match any entry, forcing slapd to examine
every entry in the DB, testing the filter for a match. every entry in the DB, testing the filter for a match.
Essentially the slapd entry cache in back-bdb/back-hdb is so efficient the search
processing time is almost invisible; the runtime is limited only by the memory
bandwidth of the machine. (The search data rate corresponds to about 3.5GB/sec;
the memory bandwidth on the machine is only about 4GB/sec due to ECC and register latency.)
H3: New overlays H3: New overlays
* slapo-constraint (Attribute value constraints) * slapo-constraint (Attribute value constraints)
...@@ -199,21 +194,13 @@ H3: New build options ...@@ -199,21 +194,13 @@ H3: New build options
* Support for building against GnuTLS * Support for building against GnuTLS