From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 18 Aug 2000 04:24:08 +0000 (+0000)
Subject: remove bdb2 cruft
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2230
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5425a5e4c8a0563ae3d868bc33fbfd5ea0e4e5ed;p=openldap

remove bdb2 cruft
---

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index a5963c6544..b57bd3684d 100644
--- 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 415ad86979..d0bbbe7e1d 100644
--- 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);