mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dynamic environment swapping

Browse Source
This commit is contained in:
Howard Chu 2005-04-22 21:35:45 +00:00
parent cfc73a837b
commit 8d0fba2d97
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
servers/slapd/back-bdb/back-bdb.h
View File

@ -193,6 +193,7 @@ struct bdb_info {
#define BDB_HAS_CONFIG 0x02 #define BDB_HAS_CONFIG 0x02
#define BDB_UPD_CONFIG 0x04 #define BDB_UPD_CONFIG 0x04
#define BDB_DEL_INDEX 0x08 #define BDB_DEL_INDEX 0x08
#define BDB_RE_OPEN 0x10
}; };
#define bi_id2entry bi_databases[BDB_ID2ENTRY] #define bi_id2entry bi_databases[BDB_ID2ENTRY]

25
servers/slapd/back-bdb/config.c
View File

@ -278,6 +278,7 @@ static int
bdb_cf_cleanup( ConfigArgs *c ) bdb_cf_cleanup( ConfigArgs *c )
{ {
struct bdb_info *bdb = c->be->be_private; struct bdb_info *bdb = c->be->be_private;
int rc = 0;
if ( bdb->bi_flags & BDB_UPD_CONFIG ) { if ( bdb->bi_flags & BDB_UPD_CONFIG ) {
if ( bdb->bi_db_config ) { if ( bdb->bi_db_config ) {
@ -299,7 +300,16 @@ bdb_cf_cleanup( ConfigArgs *c )
bdb->bi_flags ^= BDB_DEL_INDEX; bdb->bi_flags ^= BDB_DEL_INDEX;
} }
return 0; if ( bdb->bi_flags & BDB_RE_OPEN ) {
bdb->bi_flags ^= BDB_RE_OPEN;
rc = c->be->bd_info->bi_db_close( c->be );
if ( rc == 0 )
rc = c->be->bd_info->bi_db_open( c->be );
/* If this fails, we need to restart */
if ( rc )
slapd_shutdown = 1;
}
return rc;
} }
static int static int
@ -408,8 +418,13 @@ bdb_cf_gen(ConfigArgs *c)
c->cleanup = bdb_cf_cleanup; c->cleanup = bdb_cf_cleanup;
break; break;
case BDB_DIRECTORY: case BDB_DIRECTORY:
rc = 1; bdb->bi_flags |= BDB_RE_OPEN;
/* FIXME: what does this mean? */ bdb->bi_flags ^= BDB_HAS_CONFIG;
ch_free( bdb->bi_dbenv_home );
bdb->bi_dbenv_home = NULL;
ch_free( bdb->bi_db_config_path );
bdb->bi_db_config_path = NULL;
c->cleanup = bdb_cf_cleanup;
break; break;
case BDB_NOSYNC: case BDB_NOSYNC:
bdb->bi_dbenv->set_flags( bdb->bi_dbenv, DB_TXN_NOSYNC, 0 ); bdb->bi_dbenv->set_flags( bdb->bi_dbenv, DB_TXN_NOSYNC, 0 );
@ -491,9 +506,13 @@ bdb_cf_gen(ConfigArgs *c)
FILE *f; FILE *f;
char *ptr; char *ptr;
if ( bdb->bi_dbenv_home )
ch_free( bdb->bi_dbenv_home );
bdb->bi_dbenv_home = c->value_string; bdb->bi_dbenv_home = c->value_string;
/* See if a DB_CONFIG file already exists here */ /* See if a DB_CONFIG file already exists here */
if ( bdb->bi_db_config_path )
ch_free( bdb->bi_db_config_path );
bdb->bi_db_config_path = ch_malloc( strlen( bdb->bi_dbenv_home ) + bdb->bi_db_config_path = ch_malloc( strlen( bdb->bi_dbenv_home ) +
STRLENOF(LDAP_DIRSEP) + STRLENOF("DB_CONFIG") + 1 ); STRLENOF(LDAP_DIRSEP) + STRLENOF("DB_CONFIG") + 1 );
ptr = lutil_strcopy( bdb->bi_db_config_path, bdb->bi_dbenv_home ); ptr = lutil_strcopy( bdb->bi_db_config_path, bdb->bi_dbenv_home );