diff --git a/CHANGES b/CHANGES
index 544a0189e9c4c3b5e9b751b9eb4ac2f771069da9..8c96c2916dbac5873de2384be576e9810faa9359 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ OpenLDAP 2.4.20 Engineering
 	Fixed slapd asserts in minimal environment (ITS#6361)
 	Fixed slapd configArgs initialization (ITS#6363)
 	Fixed slapd debug handling of LDAP_DEBUG_ANY (ITS#6324)
+	Fixed slapd db_open with connection_fake_init (ITS#6381)
 	Fixed slapd with embedded \0 in bervals (ITS#6378,ITS#6379)
 	Fixed slapd inclusion of ac/unistd.h (ITS#6342)
 	Fixed slapd invalid dn log message (ITS#6309)
diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index dc6975ab344d79eff3401ed9ef8346a0ae7b56c4..dc127e61c6c16cfcc64fef486b69e0d2b8efb902 100644
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -841,7 +841,7 @@ monitor_search2ndn(
 	}
 
 	thrctx = ldap_pvt_thread_pool_context();
-	connection_fake_init( &conn, &opbuf, thrctx );
+	connection_fake_init2( &conn, &opbuf, thrctx, 0 );
 	op = &opbuf.ob_op;
 
 	op->o_tag = LDAP_REQ_SEARCH;
diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index 5aaa0011f1b47af8f9ae89747bdfcfd3c52f4ffb..c4f332296555ebf74c6c02ab81abf48bb813a26d 100644
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -548,7 +548,7 @@ backsql_db_open(
 	}
 
 	/* This should just be to force schema loading */
-	connection_fake_init( &conn, &opbuf, thrctx );
+	connection_fake_init2( &conn, &opbuf, thrctx, 0 );
 	op = &opbuf.ob_op;
 	op->o_bd = bd;
 	if ( backsql_get_db_conn( op, &dbh ) != LDAP_SUCCESS ) {
diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index a6c8db976d08b27a45c34c41c2b971308b60254c..f4347209338c23eb5df55d9391d4eb7541fca400 100644
--- a/servers/slapd/overlays/dds.c
+++ b/servers/slapd/overlays/dds.c
@@ -137,7 +137,7 @@ dds_expire( void *ctx, dds_info_t *di )
 	int		rc;
 	char		*extra = "";
 
-	connection_fake_init( &conn, &opbuf, ctx );
+	connection_fake_init2( &conn, &opbuf, ctx, 0 );
 	op = &opbuf.ob_op;
 
 	op->o_tag = LDAP_REQ_SEARCH;
@@ -1627,7 +1627,7 @@ dds_count( void *ctx, BackendDB *be )
 	int		rc;
 	char		*extra = "";
 
-	connection_fake_init( &conn, &opbuf, ctx );
+	connection_fake_init2( &conn, &opbuf, ctx, 0 );
 	op = &opbuf.ob_op;
 
 	op->o_tag = LDAP_REQ_SEARCH;
diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index bfd1cd30db6fbe9a863756cb9e9eadfa907cdce9..488079a01c7aeed3fac9a4bc43adff5702934291 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -4490,7 +4490,7 @@ pcache_db_open2(
 			AttributeAssertion	ava = ATTRIBUTEASSERTION_INIT;
 			AttributeName	attrs[ 2 ] = {{{ 0 }}};
 
-			connection_fake_init( &conn, &opbuf, thrctx );
+			connection_fake_init2( &conn, &opbuf, thrctx, 0 );
 			op = &opbuf.ob_op;
 
 			op->o_bd = &cm->db;
@@ -4676,7 +4676,7 @@ pcache_db_close(
 
 		thrctx = ldap_pvt_thread_pool_context();
 
-		connection_fake_init( &conn, &opbuf, thrctx );
+		connection_fake_init2( &conn, &opbuf, thrctx, 0 );
 		op = &opbuf.ob_op;
 
 		if ( qm->templates != NULL ) {
diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index f67ed9d5506a9a8bbee2185768411492e3affa9b..15395c304352dceeea5634ea0e510d98303af4a9 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -2893,7 +2893,7 @@ syncprov_db_open(
 	}
 
 	thrctx = ldap_pvt_thread_pool_context();
-	connection_fake_init( &conn, &opbuf, thrctx );
+	connection_fake_init2( &conn, &opbuf, thrctx, 0 );
 	op = &opbuf.ob_op;
 	op->o_bd = be;
 	op->o_dn = be->be_rootdn;
@@ -2978,7 +2978,7 @@ syncprov_db_close(
 		void *thrctx;
 
 		thrctx = ldap_pvt_thread_pool_context();
-		connection_fake_init( &conn, &opbuf, thrctx );
+		connection_fake_init2( &conn, &opbuf, thrctx, 0 );
 		op = &opbuf.ob_op;
 		op->o_bd = be;
 		op->o_dn = be->be_rootdn;