Commit 4bee4dd5 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5956

parent 1eb30b0c
...@@ -4,6 +4,7 @@ OpenLDAP 2.4.15 Engineering ...@@ -4,6 +4,7 @@ OpenLDAP 2.4.15 Engineering
Fixed libldap GnuTLS compilation (ITS#5955) Fixed libldap GnuTLS compilation (ITS#5955)
Fixed slapd corrupt contextCSN (ITS#5947) Fixed slapd corrupt contextCSN (ITS#5947)
Fixed slapd syncrepl order to match on add/delete (ITS#5954) Fixed slapd syncrepl order to match on add/delete (ITS#5954)
Fixed slapd-bdb/hdb behavior with unallocatable shm (ITS#5956)
Fixed slapo-rwm objectClass preservation (ITS#5760) Fixed slapo-rwm objectClass preservation (ITS#5760)
Build Environment Build Environment
Fixed tester library linking for windows (ITS#5740) Fixed tester library linking for windows (ITS#5740)
......
...@@ -111,6 +111,7 @@ bdb_db_open( BackendDB *be, ConfigReply *cr ) ...@@ -111,6 +111,7 @@ bdb_db_open( BackendDB *be, ConfigReply *cr )
Entry *e = NULL; Entry *e = NULL;
int do_recover = 0, do_alock_recover = 0; int do_recover = 0, do_alock_recover = 0;
int alockt, quick = 0; int alockt, quick = 0;
int do_retry = 1;
if ( be->be_suffix == NULL ) { if ( be->be_suffix == NULL ) {
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
...@@ -335,11 +336,12 @@ shm_retry: ...@@ -335,11 +336,12 @@ shm_retry:
if ( !do_recover && bdb->bi_shm_key ) { if ( !do_recover && bdb->bi_shm_key ) {
bdb->bi_dbenv->close( bdb->bi_dbenv, 0 ); bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
rc = db_env_create( &bdb->bi_dbenv, 0 ); rc = db_env_create( &bdb->bi_dbenv, 0 );
if( rc == 0 ) { if( rc == 0 && do_retry ) {
Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_db_open) Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_db_open)
": database \"%s\": " ": database \"%s\": "
"shared memory env open failed, assuming stale env.\n", "shared memory env open failed, assuming stale env.\n",
be->be_suffix[0].bv_val, 0, 0 ); be->be_suffix[0].bv_val, 0, 0 );
do_retry = 0;
goto shm_retry; goto shm_retry;
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment