From 532b2e60da60c749a73683ac6bc7b69606c3aaaf Mon Sep 17 00:00:00 2001 From: Nadezhda Ivanova Date: Thu, 23 May 2024 16:09:26 +0300 Subject: [PATCH] ITS#10219 Modify of olcDisabled by removing and adding a value invokes db_open twice Do not invoke db_open if the database is not actually disabled --- servers/slapd/bconfig.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index 572bcc4b2d..45e2eb5e3f 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -1638,14 +1638,16 @@ config_generic(ConfigArgs *c) { case CFG_DISABLED: if ( c->bi ) { - c->bi->bi_flags &= ~SLAP_DBFLAG_DISABLED; - if ( c->bi->bi_db_open ) { - BackendInfo *bi_orig = c->be->bd_info; - c->be->bd_info = c->bi; - rc = c->bi->bi_db_open( c->be, &c->reply ); - c->be->bd_info = bi_orig; + if ( c->bi->bi_flags & SLAP_DBFLAG_DISABLED ) { + c->bi->bi_flags &= ~SLAP_DBFLAG_DISABLED; + if ( c->bi->bi_db_open ) { + BackendInfo *bi_orig = c->be->bd_info; + c->be->bd_info = c->bi; + rc = c->bi->bi_db_open( c->be, &c->reply ); + c->be->bd_info = bi_orig; + } } - } else { + } else if ( c->be->be_flags & SLAP_DBFLAG_DISABLED ){ c->be->be_flags &= ~SLAP_DBFLAG_DISABLED; rc = backend_startup_one( c->be, &c->reply ); }