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

diff --git a/servers/slapd/back-asyncmeta/config.c b/servers/slapd/back-asyncmeta/config.c
index fbc9681418495cf15cccd57b09e2e6655343dc7d..aae054ab0a318462555fbebaa950e8180edb111b 100644 (file)
--- a/servers/slapd/back-asyncmeta/config.c
+++ b/servers/slapd/back-asyncmeta/config.c
@@ -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>\"",

diff --git a/servers/slapd/back-asyncmeta/init.c b/servers/slapd/back-asyncmeta/init.c
index 5c8016fb2bd0f64c5ad1323b2d1999c50af1a6ae..45fccf03eca3958f0479dad27745ad3f42849af9 100644 (file)
--- a/servers/slapd/back-asyncmeta/init.c
+++ b/servers/slapd/back-asyncmeta/init.c
@@ -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 );