upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 18:18:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#10193 Asyncmeta starts more than one timeout loop per database and slaptest crashes

Browse source
This commit is contained in:
Nadezhda Ivanova 2024-04-02 13:34:07 +03:00 committed by Quanah Gibson-Mount
parent 305bbd4bce
commit e9c93fac09
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
servers/slapd/back-asyncmeta/config.c
View file

@ -497,7 +497,8 @@ asyncmeta_cfadd( Operation *op, SlapReply *rs, Entry *p, ConfigArgs *c )
static int
asyncmeta_back_new_target(
a_metatarget_t **mtp,
a_metainfo_t *mi )
a_metainfo_t *mi,
BackendDB *db )
{
a_metatarget_t *mt;
@ -516,7 +517,9 @@ asyncmeta_back_new_target(
mt->mt_idassert_flags = LDAP_BACK_AUTH_PRESCRIPTIVE;
*mtp = mt;
if ( !SLAP_DBOPEN(db) || !(slapMode & SLAP_SERVER_MODE)) {
return 0;
}
for ( i = 0; i < mi->mi_num_conns; i++ ) {
a_metaconn_t *mc = &mi->mi_conns[i];
mc->mc_conns = ch_realloc( mc->mc_conns, sizeof( a_metasingleconn_t ) * mi->mi_ntargets);
@ -1907,7 +1910,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
return 1;
}
if ( asyncmeta_back_new_target( &mi->mi_targets[ i ], mi ) != 0 ) {
if ( asyncmeta_back_new_target( &mi->mi_targets[ i ], mi, c->be ) != 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unable to init server"
" in \"%s <protocol>://<server>[:port]/<naming context>\"",

2
servers/slapd/back-asyncmeta/init.c
View file

@ -275,7 +275,7 @@ asyncmeta_back_db_open(
ber_dupbv ( &mi->mi_suffix, &be->be_suffix[0] );
if ( mi->mi_ntargets > 0 ) {
if ( ( slapMode & SLAP_SERVER_MODE ) && mi->mi_ntargets > 0 ) {
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
mi->mi_task = ldap_pvt_runqueue_insert( &slapd_rq, 1,
asyncmeta_timeout_loop, mi, "asyncmeta_timeout_loop", mi->mi_suffix.bv_val );