From 2ced451dee20002e437e35553fab19a1cfabb5a0 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 18 Nov 2009 02:25:49 +0000
Subject: [PATCH] ITS#6381
---
CHANGES | 1 +
servers/slapd/back-monitor/init.c | 2 +-
servers/slapd/back-sql/init.c | 2 +-
servers/slapd/overlays/dds.c | 4 ++--
servers/slapd/overlays/pcache.c | 4 ++--
servers/slapd/overlays/syncprov.c | 4 ++--
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/CHANGES b/CHANGES
index 544a0189e9..8c96c2916d 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 dc6975ab34..dc127e61c6 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 5aaa0011f1..c4f3322965 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 a6c8db976d..f434720933 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 bfd1cd30db..488079a01c 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 f67ed9d550..15395c3043 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;
--
GitLab