remove bdb2 cruft

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index a5963c654447fbed4fcec8e2dcfcf5899d639f7c..b57bd3684da0c0545259c9d088efddf689486553 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -27,9 +27,6 @@
 #ifdef SLAPD_LDBM
 #include "back-ldbm/external.h"
 #endif
-#ifdef SLAPD_BDB2
-#include "back-bdb2/external.h"
-#endif
 #ifdef SLAPD_PASSWD
 #include "back-passwd/external.h"
 #endif
@@ -59,9 +56,6 @@ static BackendInfo binfo[] = {
 #if defined(SLAPD_LDBM) && !defined(SLAPD_LDBM_DYNAMIC)
        {"ldbm",        ldbm_back_initialize},
 #endif
-#if defined(SLAPD_BDB2) && !defined(SLAPD_BDB2_DYNAMIC)
-       {"bdb2",        bdb2_back_initialize},
-#endif
 #if defined(SLAPD_PASSWD) && !defined(SLAPD_PASSWD_DYNAMIC)
        {"passwd",      passwd_back_initialize},
 #endif

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 415ad86979ca76cf1adf9255a5201e401701a77d..d0bbbe7e1d6e983ae3029bb5c6fffca0f3207b02 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -113,9 +113,6 @@ usage( char *name )
                "\t-r directory\n"
 #endif
                "\t-s level\tSyslog Level\n"
-#ifdef SLAPD_BDB2
-               "\t-t\t\tEnable BDB2 timing\n"
-#endif
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
                "\t-u user\tUser (id or name) to ran as\n"
 #endif
@@ -209,9 +206,6 @@ int main( int argc, char **argv )
 #ifdef LOG_LOCAL4
                             "l:"
 #endif
-#ifdef SLAPD_BDB2
-                            "t"
-#endif
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
                             "u:g:"
 #endif
@@ -248,12 +242,6 @@ int main( int argc, char **argv )
                        break;
 #endif
 
-#ifdef SLAPD_BDB2
-               case 't':  /* timed server */
-                       serverMode |= SLAP_TIMED_MODE;
-                       break;
-#endif
-
 #ifdef HAVE_CHROOT
                case 'r':
                        if( sandbox ) free(sandbox);