mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#4324 don't auto-recover in slapcat. Don't trigger a recovery if

Browse Source 
DB_CONFIG has same mtime as DB environment.
This commit is contained in:
Howard Chu 2006-01-11 15:38:30 +00:00
parent 7038044c91
commit 34cefbe0ad
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
servers/slapd/back-bdb/init.c
View File

@ -161,7 +161,7 @@ bdb_db_open( BackendDB *be )
*ptr++ = LDAP_DIRSEP[0];
strcpy( ptr, "__db.001" );
if( stat( path, &stat2 ) == 0 ) {
if( stat2.st_mtime <= stat1.st_mtime ) {
if( stat2.st_mtime < stat1.st_mtime ) {
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: DB_CONFIG for suffix %s has changed.\n"
"Performing database recovery to activate new settings.\n",
@ -366,8 +366,16 @@ bdb_db_open( BackendDB *be )
if ( !( slapMode & SLAP_TOOL_QUICK ))
flags |= BDB_TXN_FLAGS;
if ( do_recover )
flags |= DB_RECOVER;
if ( do_recover ) {
if ( slapMode & SLAP_TOOL_READONLY ) {
Debug( LDAP_DEBUG_ANY,
"bdb_db_open: Recovery skipped in read-only mode. "
"Run manual recovery if errors are encountered.\n",
0, 0, 0 );
} else {
flags |= DB_RECOVER;
}
}
/* If a key was set, use shared memory for the BDB environment */
if ( bdb->bi_shm_key ) {