From 28af130e896c5cba119366937a41f2a459c9a246 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 13 Apr 2005 04:08:43 +0000 Subject: [PATCH] unifdef BDB_SUBDIRS, was never used --- servers/slapd/back-bdb/back-bdb.h | 6 ---- servers/slapd/back-bdb/init.c | 57 ------------------------------- 2 files changed, 63 deletions(-) diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h index 27a261d1e1..6e7b35dca6 100644 --- a/servers/slapd/back-bdb/back-bdb.h +++ b/servers/slapd/back-bdb/back-bdb.h @@ -42,12 +42,6 @@ LDAP_BEGIN_DECL #define BDB_MAX_ADD_LOOP 30 -#ifdef BDB_SUBDIRS -#define BDB_TMP_SUBDIR "tmp" -#define BDB_LG_SUBDIR "log" -#define BDB_DATA_SUBDIR "data" -#endif - #define BDB_SUFFIX ".bdb" #define BDB_ID2ENTRY 0 #define BDB_DN2ID 1 diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index ed7b84dab2..e9ef03be63 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -171,63 +171,6 @@ bdb_db_open( BackendDB *be ) bdb->bi_idl_cache_size = 0; } -#ifdef BDB_SUBDIRS - { - char dir[MAXPATHLEN], *ptr; - - if (bdb->bi_dbenv_home[0] == '.') { - /* If home is a relative path, relative subdirs - * are just concat'd by BDB. We don't want the - * path to be concat'd twice, e.g. - * ./test-db/./test-db/tmp - */ - ptr = dir; - } else { - ptr = lutil_strcopy( dir, bdb->bi_dbenv_home ); - *ptr++ = LDAP_DIRSEP[0]; -#ifdef HAVE_EBCDIC - __atoe( dir ); -#endif - } - - strcpy( ptr, BDB_TMP_SUBDIR ); -#ifdef HAVE_EBCDIC - __atoe( ptr ); -#endif - rc = bdb->bi_dbenv->set_tmp_dir( bdb->bi_dbenv, dir ); - if( rc != 0 ) { - Debug( LDAP_DEBUG_ANY, - "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n", - dir, db_strerror(rc), rc ); - return rc; - } - - strcpy( ptr, BDB_LG_SUBDIR ); -#ifdef HAVE_EBCDIC - __atoe( ptr ); -#endif - rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir ); - if( rc != 0 ) { - Debug( LDAP_DEBUG_ANY, - "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n", - dir, db_strerror(rc), rc ); - return rc; - } - - strcpy( ptr, BDB_DATA_SUBDIR ); -#ifdef HAVE_EBCDIC - __atoe( ptr ); -#endif - rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir ); - if( rc != 0 ) { - Debug( LDAP_DEBUG_ANY, - "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n", - dir, db_strerror(rc), rc ); - return rc; - } - } -#endif - if( bdb->bi_dbenv_xflags != 0 ) { rc = bdb->bi_dbenv->set_flags( bdb->bi_dbenv, bdb->bi_dbenv_xflags, 1); -- 2.39.5