diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h
index fac176726e3264b73ee854cba14f0003343a32d9..2b699eba9f54e4e4e81f8e12f6fa23e6ca6dba51 100644
--- a/servers/slapd/back-ldbm/back-ldbm.h
+++ b/servers/slapd/back-ldbm/back-ldbm.h
@@ -159,8 +159,6 @@ struct ldbminfo {
 #endif
 };
 
-extern int ldbm_ignore_nextid_file;
-
 LDAP_END_DECL
 
 #include "proto-back-ldbm.h"
diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index c0b62d890255d88666f74dfa59b8a31f8196d090..8df6e46fa1ce8af82043dd9e08908399adb91095 100644
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -14,8 +14,6 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
-int ldbm_ignore_nextid_file = 0;
-
 
 int
 ldbm_back_db_config(
diff --git a/servers/slapd/back-ldbm/nextid.c b/servers/slapd/back-ldbm/nextid.c
index 3e5b16ffbef2278389ab0b3409d3897fee8a68ac..0e45fced41691d42fe1ac8e822475b65827346d5 100644
--- a/servers/slapd/back-ldbm/nextid.c
+++ b/servers/slapd/back-ldbm/nextid.c
@@ -17,13 +17,13 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
-/* All functions except put_nextid() obey ldbm_ignore_nextid_file. */
+/* All functions except put_nextid() obey slapMode == SLAP_TOOL_MODE. */
 
 static ID  next_id_read( Backend *be );
 static ID  next_id_get_save( Backend *be, int do_save );
 
 #define    next_id_write( be, id ) \
-	(ldbm_ignore_nextid_file ? (be, id, 0) : put_nextid( be, id ))
+	(slapMode == SLAP_TOOL_MODE ? (be, id, 0) : put_nextid( be, id ))
 
 static ID
 next_id_read( Backend *be )
@@ -34,7 +34,7 @@ next_id_read( Backend *be )
 	char*	file = li->li_nextid_file; 
 	FILE*	fp;
 
-	if ( ldbm_ignore_nextid_file )
+	if ( slapMode == SLAP_TOOL_MODE )
 		return NOID;
 
 	if ( (fp = fopen( file, "r" )) == NULL ) {
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index ea9234ddd0dde82f776722934701a25c752efb3f..f11af8f24aa21c614e94c7448ea1acee8c14d02c 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -83,14 +83,14 @@ slap_init( int mode, char *name )
 
 		case SLAP_SERVER_MODE:
 		case SLAP_TOOL_MODE:
-#ifdef SLAPD_BDB2
+#ifdef SLAP_TIMEDSERVER_MODE
 		case SLAP_TIMEDSERVER_MODE:
-		case SLAP_TOOLID_MODE:
 #endif
+		case SLAP_TOOLID_MODE:
 
 			Debug( LDAP_DEBUG_TRACE,
 				"%s init: initiated %s.\n",
-				name, mode == SLAP_TOOL_MODE ? "tool" : "server", 0 );
+				name, (mode == SLAP_TOOL_MODE || mode == SLAP_TOOLID_MODE) ? "tool" : "server", 0 );
 
 			slap_name = name;
 	
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 4792c0bb418109924d9008c5c2d23ff52f77ddd4..a9a21d14673e52f413a5a70760d41ffc3c219698 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -396,8 +396,8 @@ extern int			slapMode;
 #define SLAP_TOOL_MODE		2
 #ifdef SLAPD_BDB2
 #  define SLAP_TIMEDSERVER_MODE  3
-#  define SLAP_TOOLID_MODE       4
 #endif
+#define SLAP_TOOLID_MODE    4
 
 /* temporary aliases */
 typedef BackendDB Backend;
diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c
index cb60859c32906d8b663314c91849f1c4bc7d6012..37d8190cf52a7874a4df083fb9f4383c86a79dff 100644
--- a/servers/slapd/tools/ldif2id2children.c
+++ b/servers/slapd/tools/ldif2id2children.c
@@ -33,8 +33,6 @@ main( int argc, char **argv )
 	struct berval	bv;
 	struct berval	*vals[2];
 
-	ldbm_ignore_nextid_file = 1;
-
 	slap_ldif_init( argc, argv, LDIF2ID2CHILDREN, "ldbm", SLAP_TOOL_MODE );
 
 	slap_startup(dbnum);
diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c
index ea7fde6d38001d89a38f16d3906626a7499af88a..9d279bda3f4fe697d00965ef02fc382b91e09658 100644
--- a/servers/slapd/tools/ldif2id2entry.c
+++ b/servers/slapd/tools/ldif2id2entry.c
@@ -30,9 +30,7 @@ main( int argc, char **argv )
 	struct berval	bv;
 	struct berval	*vals[2];
 
-	ldbm_ignore_nextid_file = 1;
-
-	slap_ldif_init( argc, argv, LDIF2ID2ENTRY, "ldbm", SLAP_TOOL_MODE );
+	slap_ldif_init( argc, argv, LDIF2ID2ENTRY, "ldbm", SLAP_TOOLID_MODE );
 
 	slap_startup(dbnum);
 
@@ -75,7 +73,7 @@ main( int argc, char **argv )
 	}
 
 	maxid++;
-	put_nextid( be, maxid );        /* override ldbm_ignore_nextid_file */
+	put_nextid( be, maxid );
 
 #ifdef SLAP_CLEANUP
 	ldbm_cache_close( be, db );
diff --git a/servers/slapd/tools/ldif2index.c b/servers/slapd/tools/ldif2index.c
index d69cf8a1ba6de351f15d8319b1c681ac9f5db969..d6a38ed582f3e002f99ee79dd7ff26a0e1ebca03 100644
--- a/servers/slapd/tools/ldif2index.c
+++ b/servers/slapd/tools/ldif2index.c
@@ -30,8 +30,6 @@ main( int argc, char **argv )
 	struct berval	bv;
 	struct berval	*vals[2];
 
-	ldbm_ignore_nextid_file = 1;
-
 	slap_ldif_init( argc, argv, LDIF2INDEX, "ldbm", SLAP_TOOL_MODE );
 	attr = attr_normalize( argv[argc - 1] );
 
diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index f54eb8c6db2fa0b33e3930191365253d4415898b..cc8984021feca69ffe4db28e11d5b1ae74fbc910 100644
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -50,8 +50,6 @@ main( int argc, char **argv )
 	struct berval	*vals[2];
 	Avlnode		*avltypes = NULL;
 
-	ldbm_ignore_nextid_file = 1;
-
 	slap_ldif_init( argc, argv, LDIF2LDBM, "ldbm", SLAP_TOOL_MODE );
 
 	slap_startup(dbnum);