]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-meta/conn.c
refine fix to ITS#4315; apply it to back-meta as well
[openldap] / servers / slapd / back-meta / conn.c
index d71a36be3fb43d4f15b3f37fafc11c67a4cf1147..08fcbea92c0f71447d372c62bda9d01a9079e112 100644 (file)
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 
+#include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
 int
 meta_back_conn_cmp(
        const void *c1,
-       const void *c2
-       )
+       const void *c2 )
 {
-       struct metaconn *lc1 = ( struct metaconn * )c1;
-        struct metaconn *lc2 = ( struct metaconn * )c2;
+       metaconn_t      *mc1 = ( metaconn_t * )c1;
+        metaconn_t     *mc2 = ( metaconn_t * )c2;
+       int             rc;
        
-       return SLAP_PTRCMP( lc1->mc_conn, lc2->mc_conn );
+       /* If local DNs don't match, it is definitely not a match */
+       rc = ber_bvcmp( &mc1->mc_local_ndn, &mc2->mc_local_ndn );
+       if ( rc ) {
+               return rc;
+       }
+
+       /* For shared sessions, conn is NULL. Only explicitly
+        * bound sessions will have non-NULL conn.
+        */
+       return SLAP_PTRCMP( mc1->mc_conn, mc2->mc_conn );
 }
 
 /*
@@ -65,13 +75,19 @@ meta_back_conn_cmp(
 int
 meta_back_conn_dup(
        void *c1,
-       void *c2
-       )
+       void *c2 )
 {
-       struct metaconn *lc1 = ( struct metaconn * )c1;
-       struct metaconn *lc2 = ( struct metaconn * )c2;
+       metaconn_t      *mc1 = ( metaconn_t * )c1;
+       metaconn_t      *mc2 = ( metaconn_t * )c2;
 
-       return( ( lc1->mc_conn == lc2->mc_conn ) ? -1 : 0 );
+       /* Cannot have more than one shared session with same DN */
+       if ( dn_match( &mc1->mc_local_ndn, &mc2->mc_local_ndn ) &&
+                               mc1->mc_conn == mc2->mc_conn )
+       {
+               return -1;
+       }
+               
+       return 0;
 }
 
 /*
@@ -81,7 +97,8 @@ meta_back_conn_dup(
 static void
 ravl_print( Avlnode *root, int depth )
 {
-       int     i;
+       int             i;
+       metaconn_t      *mc = (metaconn_t *)root->avl_data;
        
        if ( root == 0 ) {
                return;
@@ -93,7 +110,11 @@ ravl_print( Avlnode *root, int depth )
                printf( "    " );
        }
 
-       printf( "c(%d) %d\n", ( ( struct metaconn * )root->avl_data )->mc_conn->c_connid, root->avl_bf );
+       printf( "c(%d%s%s) %d\n",
+               LDAP_BACK_PCONN_ID( mc->mc_conn ),
+               BER_BVISNULL( &mc->mc_local_ndn ) ? "" : ": ",
+               BER_BVISNULL( &mc->mc_local_ndn ) ? "" : mc->mc_local_ndn.bv_val,
+               root->avl_bf );
        
        ravl_print( root->avl_left, depth + 1 );
 }
@@ -121,84 +142,104 @@ myprint( Avlnode *root )
  * 
  * Allocates a connection structure, making room for all the referenced targets
  */
-static struct metaconn *
-metaconn_alloc( int ntargets )
+static metaconn_t *
+metaconn_alloc(
+               Operation               *op )
 {
-       struct metaconn *lc;
+       metainfo_t      *mi = ( metainfo_t * )op->o_bd->be_private;
+       metaconn_t      *mc;
+       int             i, ntargets = mi->mi_ntargets;
 
        assert( ntargets > 0 );
 
-       /* malloc once only; leave an extra one for one-past-end */
-       lc = ch_malloc( sizeof( struct metaconn )
-                       + sizeof( struct metasingleconn ) * ( ntargets + 1 ) );
-       if ( lc == NULL ) {
+       /* malloc all in one */
+       mc = ( metaconn_t * )ch_malloc( sizeof( metaconn_t )
+                       + sizeof( metasingleconn_t ) * ntargets );
+       if ( mc == NULL ) {
                return NULL;
        }
 
-       lc->mc_conns = (struct metasingleconn *)&lc[ 1 ];
-
-       /* FIXME: needed by META_LAST() */
-       lc->mc_conns[ ntargets ].msc_candidate = META_LAST_CONN;
-
-       for ( ; ntargets-- > 0; ) {
-               lc->mc_conns[ ntargets ].msc_ld = NULL;
-               BER_BVZERO( &lc->mc_conns[ ntargets ].msc_bound_ndn );
-               BER_BVZERO( &lc->mc_conns[ ntargets ].msc_cred );
-               lc->mc_conns[ ntargets ].msc_bound = META_UNBOUND;
+       for ( i = 0; i < ntargets; i++ ) {
+               mc->mc_conns[ i ].msc_ld = NULL;
+               BER_BVZERO( &mc->mc_conns[ i ].msc_bound_ndn );
+               BER_BVZERO( &mc->mc_conns[ i ].msc_cred );
+               LDAP_BACK_CONN_ISBOUND_CLEAR( &mc->mc_conns[ i ] );
+               mc->mc_conns[ i ].msc_info = mi;
        }
 
-       lc->mc_bound_target = META_BOUND_NONE;
+       BER_BVZERO( &mc->mc_local_ndn );
+       mc->msc_mscflags = 0;
+       mc->mc_authz_target = META_BOUND_NONE;
+       ldap_pvt_thread_mutex_init( &mc->mc_mutex );
+       mc->mc_refcnt = 1;
+       mc->mc_tainted = 0;
 
-       return lc;
+       return mc;
 }
 
-/*
- * metaconn_free
- *
- * clears a metaconn
- */
 static void
-metaconn_free(
-               struct metaconn *lc
-)
+meta_back_freeconn(
+       Operation       *op,
+       metaconn_t      *mc )
 {
-       if ( !lc ) {
-               return;
+       metainfo_t      *mi = ( metainfo_t * )op->o_bd->be_private;
+
+       assert( mc != NULL );
+
+       ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+
+       if ( --mc->mc_refcnt == 0 ) {
+               meta_back_conn_free( mc );
        }
-       
-       free( lc );
+
+       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
 }
 
 /*
- * init_one_conn
+ * meta_back_init_one_conn
  * 
  * Initializes one connection
  */
-static int
-init_one_conn(
-               Operation               *op,
-               SlapReply               *rs,
-               struct metatarget       *lt, 
-               struct metasingleconn   *lsc,
-               char                    *candidate,
-               ldap_back_send_t        sendok )
+int
+meta_back_init_one_conn(
+       Operation               *op,
+       SlapReply               *rs,
+       metatarget_t            *mt, 
+       metaconn_t              *mc,
+       int                     candidate,
+       int                     ispriv,
+       ldap_back_send_t        sendok )
 {
-       struct metainfo *li = ( struct metainfo * )op->o_bd->be_private;
-       int             vers;
-       dncookie        dc;
+       metainfo_t              *mi = ( metainfo_t * )op->o_bd->be_private;
+       metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
+       int                     vers;
+       dncookie                dc;
+       int                     isauthz = ( candidate == mc->mc_authz_target );
 
        /*
         * Already init'ed
         */
-       if ( lsc->msc_ld != NULL ) {
-               rs->sr_err = LDAP_SUCCESS;
-               goto error_return;
+       if ( msc->msc_ld != NULL ) {
+               if ( mt->mt_idle_timeout == 0 ) {
+                       return rs->sr_err = LDAP_SUCCESS;
+               }
+
+               if ( op->o_time > msc->msc_time + mt->mt_idle_timeout ) {
+                       Debug( LDAP_DEBUG_TRACE,
+                               "%s meta_back_init_one_conn[%d]: idle timeout.\n",
+                               op->o_log_prefix, candidate, 0 );
+                       if ( meta_back_retry( op, rs, mc, candidate, sendok ) ) {
+                               return rs->sr_err;
+                       }
+               }
+
+               msc->msc_time = op->o_time;
        }
        
        /*
         * Attempts to initialize the connection to the target ds
         */
-       rs->sr_err = ldap_initialize( &lsc->msc_ld, lt->mt_uri );
+       rs->sr_err = ldap_initialize( &msc->msc_ld, mt->mt_uri );
        if ( rs->sr_err != LDAP_SUCCESS ) {
                goto error_return;
        }
@@ -208,41 +249,44 @@ init_one_conn(
         * bound with a particular version, then so can we.
         */
        vers = op->o_conn->c_protocol;
-       ldap_set_option( lsc->msc_ld, LDAP_OPT_PROTOCOL_VERSION, &vers );
+       ldap_set_option( msc->msc_ld, LDAP_OPT_PROTOCOL_VERSION, &vers );
 
        /* automatically chase referrals ("chase-referrals"/"dont-chase-referrals" statement) */
-       if ( LDAP_BACK_CHASE_REFERRALS( li ) ) {
-               ldap_set_option( lsc->msc_ld, LDAP_OPT_REFERRALS, LDAP_OPT_ON );
+       if ( LDAP_BACK_CHASE_REFERRALS( mi ) ) {
+               ldap_set_option( msc->msc_ld, LDAP_OPT_REFERRALS, LDAP_OPT_ON );
        }
 
 #ifdef HAVE_TLS
-       /* start TLS ("start-tls"/"try-start-tls" statements) */
-       if ( ( LDAP_BACK_USE_TLS( li ) || ( op->o_conn->c_is_tls && LDAP_BACK_PROPAGATE_TLS( li ) ) )
-                       && !ldap_is_ldaps_url( lt->mt_uri ) )
+       /* start TLS ("tls [try-]{start|propagate}" statement) */
+       if ( ( LDAP_BACK_USE_TLS( mi ) || ( op->o_conn->c_is_tls && LDAP_BACK_PROPAGATE_TLS( mi ) ) )
+                       && !ldap_is_ldaps_url( mt->mt_uri ) )
        {
 #ifdef SLAP_STARTTLS_ASYNCHRONOUS
                /*
-                * use asynchronous StartTLS
-                * in case, chase referral (not implemented yet)
+                * use asynchronous StartTLS; in case, chase referral
+                * FIXME: OpenLDAP does not return referral on StartTLS yet
                 */
                int             msgid;
 
-               rs->sr_err = ldap_start_tls( lsc->msc_ld, NULL, NULL, &msgid );
+               rs->sr_err = ldap_start_tls( msc->msc_ld, NULL, NULL, &msgid );
                if ( rs->sr_err == LDAP_SUCCESS ) {
                        LDAPMessage     *res = NULL;
-                       int             rc, retries = 1;
-                       struct timeval  tv = { 0, 0 };
+                       int             rc, nretries = mt->mt_nretries;
+                       struct timeval  tv;
+
+                       LDAP_BACK_TV_SET( &tv );
 
 retry:;
-                       rc = ldap_result( lsc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res );
+                       rc = ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res );
                        if ( rc < 0 ) {
                                rs->sr_err = LDAP_OTHER;
 
                        } else if ( rc == 0 ) {
-                               if ( retries ) {
-                                       retries--;
-                                       tv.tv_sec = 0;
-                                       tv.tv_usec = 100000;
+                               if ( nretries != 0 ) {
+                                       if ( nretries > 0 ) {
+                                               nretries--;
+                                       }
+                                       LDAP_BACK_TV_SET( &tv );
                                        goto retry;
                                }
                                rs->sr_err = LDAP_OTHER;
@@ -250,18 +294,25 @@ retry:;
                        } else if ( rc == LDAP_RES_EXTENDED ) {
                                struct berval   *data = NULL;
 
-                               rs->sr_err = ldap_parse_extended_result( lsc->msc_ld, res,
+                               rs->sr_err = ldap_parse_extended_result( msc->msc_ld, res,
                                                NULL, &data, 0 );
                                if ( rs->sr_err == LDAP_SUCCESS ) {
-                                       rs->sr_err = ldap_result2error( lsc->msc_ld, res, 1 );
+                                       int             err;
+
+                                       rs->sr_err = ldap_parse_result( msc->msc_ld, res,
+                                               &err, NULL, NULL, NULL, NULL, 1 );
                                        res = NULL;
+
+                                       if ( rs->sr_err == LDAP_SUCCESS ) {
+                                               rs->sr_err = err;
+                                       }
                                        
                                        /* FIXME: in case a referral 
                                         * is returned, should we try
                                         * using it instead of the 
                                         * configured URI? */
                                        if ( rs->sr_err == LDAP_SUCCESS ) {
-                                               ldap_install_tls( lsc->msc_ld );
+                                               ldap_install_tls( msc->msc_ld );
 
                                        } else if ( rs->sr_err == LDAP_REFERRAL ) {
                                                rs->sr_err = LDAP_OTHER;
@@ -288,7 +339,7 @@ retry:;
                /*
                 * use synchronous StartTLS
                 */
-               rs->sr_err = ldap_start_tls_s( lsc->msc_ld, NULL, NULL );
+               rs->sr_err = ldap_start_tls_s( msc->msc_ld, NULL, NULL );
 #endif /* ! SLAP_STARTTLS_ASYNCHRONOUS */
 
                /* if StartTLS is requested, only attempt it if the URL
@@ -296,9 +347,9 @@ retry:;
                 * of misconfiguration, but also when used in the chain 
                 * overlay, where the "uri" can be parsed out of a referral */
                if ( rs->sr_err == LDAP_SERVER_DOWN
-                               || ( rs->sr_err != LDAP_SUCCESS && LDAP_BACK_TLS_CRITICAL( li ) ) )
+                               || ( rs->sr_err != LDAP_SUCCESS && LDAP_BACK_TLS_CRITICAL( mi ) ) )
                {
-                       ldap_unbind_ext_s( lsc->msc_ld, NULL, NULL );
+                       ldap_unbind_ext_s( msc->msc_ld, NULL, NULL );
                        goto error_return;
                }
        }
@@ -307,69 +358,156 @@ retry:;
        /*
         * Set the network timeout if set
         */
-       if ( li->mi_network_timeout != 0 ) {
+       if ( mt->mt_network_timeout != 0 ) {
                struct timeval  network_timeout;
 
                network_timeout.tv_usec = 0;
-               network_timeout.tv_sec = li->mi_network_timeout;
+               network_timeout.tv_sec = mt->mt_network_timeout;
 
-               ldap_set_option( lsc->msc_ld, LDAP_OPT_NETWORK_TIMEOUT,
+               ldap_set_option( msc->msc_ld, LDAP_OPT_NETWORK_TIMEOUT,
                                (void *)&network_timeout );
        }
 
-       /*
-        * Sets a cookie for the rewrite session
-        */
-       ( void )rewrite_session_init( lt->mt_rwmap.rwm_rw, op->o_conn );
-
        /*
         * If the connection DN is not null, an attempt to rewrite it is made
         */
-       if ( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
-               dc.rwmap = &lt->mt_rwmap;
-               dc.conn = op->o_conn;
-               dc.rs = rs;
-               dc.ctx = "bindDN";
-               
-               /*
-                * Rewrite the bind dn if needed
-                */
-               if ( ldap_back_dn_massage( &dc, &op->o_conn->c_dn,
-                                       &lsc->msc_bound_ndn ) )
-               {
-                       goto error_return;
-               }
 
-               /* copy the DN idf needed */
-               if ( lsc->msc_bound_ndn.bv_val == op->o_conn->c_dn.bv_val ) {
-                       ber_dupbv( &lsc->msc_bound_ndn, &op->o_conn->c_dn );
+       if ( ispriv ) {
+               if ( !BER_BVISNULL( &mt->mt_pseudorootdn ) ) {
+                       ber_dupbv( &msc->msc_bound_ndn, &mt->mt_pseudorootdn );
+                       if ( !BER_BVISNULL( &mt->mt_pseudorootpw ) ) {
+                               ber_dupbv( &msc->msc_cred, &mt->mt_pseudorootpw );
+                       }
+
+               } else {
+                       ber_str2bv( "", 0, 1, &msc->msc_bound_ndn );
                }
 
-               assert( !BER_BVISNULL( &lsc->msc_bound_ndn ) );
+               LDAP_BACK_CONN_ISPRIV_SET( msc );
 
        } else {
-               ber_str2bv( "", 0, 1, &lsc->msc_bound_ndn );
+               BER_BVZERO( &msc->msc_cred );
+               BER_BVZERO( &msc->msc_bound_ndn );
+               if ( !BER_BVISEMPTY( &op->o_ndn )
+                       && SLAP_IS_AUTHZ_BACKEND( op )
+                       && isauthz )
+               {
+                       dc.target = mt;
+                       dc.conn = op->o_conn;
+                       dc.rs = rs;
+                       dc.ctx = "bindDN";
+               
+                       /*
+                        * Rewrite the bind dn if needed
+                        */
+                       if ( ldap_back_dn_massage( &dc, &op->o_conn->c_dn,
+                                               &msc->msc_bound_ndn ) )
+                       {
+                               ldap_unbind_ext_s( msc->msc_ld, NULL, NULL );
+                               goto error_return;
+                       }
+                       
+                       /* copy the DN idf needed */
+                       if ( msc->msc_bound_ndn.bv_val == op->o_conn->c_dn.bv_val ) {
+                               ber_dupbv( &msc->msc_bound_ndn, &op->o_conn->c_dn );
+                       }
+
+               } else {
+                       ber_str2bv( "", 0, 1, &msc->msc_bound_ndn );
+               }
        }
 
-       lsc->msc_bound = META_UNBOUND;
+       assert( !BER_BVISNULL( &msc->msc_bound_ndn ) );
+
+       LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
 
 error_return:;
-       if ( rs->sr_err != LDAP_SUCCESS ) {
+       if ( rs->sr_err == LDAP_SUCCESS ) {
+               /*
+                * Sets a cookie for the rewrite session
+                */
+               ( void )rewrite_session_init( mt->mt_rwmap.rwm_rw, op->o_conn );
+
+               if ( mt->mt_idle_timeout ) {
+                       msc->msc_time = op->o_time;
+               }
+
+       } else {
                rs->sr_err = slap_map_api2result( rs );
                if ( sendok & LDAP_BACK_SENDERR ) {
                        send_ldap_result( op, rs );
                        rs->sr_text = NULL;
                }
+       }
 
-       } else {
+       return rs->sr_err;
+}
 
-               /*
-                * The candidate is activated
-                */
-               *candidate = META_CANDIDATE;
+/*
+ * meta_back_retry
+ * 
+ * Retries one connection
+ */
+int
+meta_back_retry(
+       Operation               *op,
+       SlapReply               *rs,
+       metaconn_t              *mc,
+       int                     candidate,
+       ldap_back_send_t        sendok )
+{
+       metainfo_t              *mi = ( metainfo_t * )op->o_bd->be_private;
+       metatarget_t            *mt = &mi->mi_targets[ candidate ];
+       int                     rc = LDAP_UNAVAILABLE;
+       metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
+
+retry_lock:;
+       ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+
+       assert( mc->mc_refcnt > 0 );
+
+       if ( mc->mc_refcnt == 1 ) {
+               char    buf[ SLAP_TEXT_BUFLEN ];
+
+               while ( ldap_pvt_thread_mutex_trylock( &mc->mc_mutex ) ) {
+                       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+                       ldap_pvt_thread_yield();
+                       goto retry_lock;
+               }
+
+               snprintf( buf, sizeof( buf ),
+                       "retrying URI=\"%s\" DN=\"%s\"",
+                       mt->mt_uri,
+                       BER_BVISNULL( &msc->msc_bound_ndn ) ?
+                               "" : msc->msc_bound_ndn.bv_val );
+               Debug( LDAP_DEBUG_ANY,
+                       "%s meta_back_retry[%d]: %s.\n",
+                       op->o_log_prefix, candidate, buf );
+
+               meta_clear_one_candidate( msc );
+               LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+
+               ( void )rewrite_session_delete( mt->mt_rwmap.rwm_rw, op->o_conn );
+
+               /* mc here must be the regular mc, reset and ready for init */
+               rc = meta_back_init_one_conn( op, rs, mt, mc, candidate,
+                       LDAP_BACK_CONN_ISPRIV( mc ), sendok );
+
+               if ( rc == LDAP_SUCCESS ) {
+                       rc = meta_back_single_dobind( op, rs, mc, candidate,
+                                       sendok, mt->mt_nretries, 0 );
+               }
+
+               ldap_pvt_thread_mutex_unlock( &mc->mc_mutex );
        }
 
-       return rs->sr_err;
+       if ( rc != LDAP_SUCCESS ) {
+               mc->mc_tainted = 1;
+       }
+
+       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+
+       return rc == LDAP_SUCCESS ? 1 : 0;
 }
 
 /*
@@ -382,7 +520,7 @@ meta_back_conn_cb( Operation *op, SlapReply *rs )
 
        switch ( rs->sr_type ) {
        case REP_SEARCH:
-               ((int *)op->o_callback->sc_private)[0] = (int)op->o_private;
+               ((long *)op->o_callback->sc_private)[0] = (long)op->o_private;
                break;
 
        case REP_SEARCHREF:
@@ -403,14 +541,14 @@ meta_back_get_candidate(
        SlapReply       *rs,
        struct berval   *ndn )
 {
-       struct metainfo *li = ( struct metainfo * )op->o_bd->be_private;
-       int             candidate;
+       metainfo_t      *mi = ( metainfo_t * )op->o_bd->be_private;
+       long            candidate;
 
        /*
         * tries to get a unique candidate
         * (takes care of default target)
         */
-       candidate = meta_back_select_unique_candidate( li, ndn );
+       candidate = meta_back_select_unique_candidate( mi, ndn );
 
        /*
         * if any is found, inits the connection
@@ -460,10 +598,12 @@ meta_back_get_candidate(
                        /* if multiple candidates can serve the operation,
                         * and a default target is defined, and it is
                         * a candidate, try using it (FIXME: YMMV) */
-                       if ( li->mi_defaulttarget != META_DEFAULT_TARGET_NONE
-                               && meta_back_is_candidate( &li->mi_targets[ li->mi_defaulttarget ]->mt_nsuffix, ndn ) )
+                       if ( mi->mi_defaulttarget != META_DEFAULT_TARGET_NONE
+                               && meta_back_is_candidate( &mi->mi_targets[ mi->mi_defaulttarget ].mt_nsuffix,
+                                               mi->mi_targets[ mi->mi_defaulttarget ].mt_scope,
+                                               ndn, op->o_tag == LDAP_REQ_SEARCH ? op->ors_scope : LDAP_SCOPE_BASE ) )
                        {
-                               candidate = li->mi_defaulttarget;
+                               candidate = mi->mi_defaulttarget;
                                rs->sr_err = LDAP_SUCCESS;
                                rs->sr_text = NULL;
 
@@ -473,43 +613,69 @@ meta_back_get_candidate(
                        }
                        break;
                }
+
+       } else {
+               rs->sr_err = LDAP_SUCCESS;
        }
 
        return candidate;
 }
 
+static void    *meta_back_candidates_dummy;
+
 static void
-meta_back_candidate_keyfree( void *key, void *data )
+meta_back_candidates_keyfree(
+       void            *key,
+       void            *data )
 {
+       metacandidates_t        *mc = (metacandidates_t *)data;
+
+       ber_memfree_x( mc->mc_candidates, NULL );
        ber_memfree_x( data, NULL );
 }
 
-char *
+SlapReply *
 meta_back_candidates_get( Operation *op )
 {
-       struct metainfo *li = ( struct metainfo * )op->o_bd->be_private;
-       void            *data = NULL;
+       metainfo_t              *mi = ( metainfo_t * )op->o_bd->be_private;
+       metacandidates_t        *mc;
 
        if ( op->o_threadctx ) {
+               void            *data = NULL;
+
                ldap_pvt_thread_pool_getkey( op->o_threadctx,
-                               meta_back_candidate_keyfree, &data, NULL );
+                               &meta_back_candidates_dummy, &data, NULL );
+               mc = (metacandidates_t *)data;
+
        } else {
-               data = (void *)li->mi_candidates;
+               mc = mi->mi_candidates;
        }
 
-       if ( data == NULL ) {
-               data = ber_memalloc_x( sizeof( char ) * li->mi_ntargets, NULL );
+       if ( mc == NULL ) {
+               mc = ch_calloc( sizeof( metacandidates_t ), 1 );
+               mc->mc_ntargets = mi->mi_ntargets;
+               mc->mc_candidates = ch_calloc( sizeof( SlapReply ), mc->mc_ntargets );
                if ( op->o_threadctx ) {
+                       void            *data = NULL;
+
+                       data = (void *)mc;
                        ldap_pvt_thread_pool_setkey( op->o_threadctx,
-                                       meta_back_candidate_keyfree, data,
-                                       meta_back_candidate_keyfree );
+                                       &meta_back_candidates_dummy, data,
+                                       meta_back_candidates_keyfree );
 
                } else {
-                       li->mi_candidates = (char *)data;
+                       mi->mi_candidates = mc;
                }
+
+       } else if ( mc->mc_ntargets < mi->mi_ntargets ) {
+               /* NOTE: in the future, may want to allow back-config
+                * to add/remove targets from back-meta... */
+               mc->mc_ntargets = mi->mi_ntargets;
+               mc->mc_candidates = ch_realloc( mc->mc_candidates,
+                               sizeof( SlapReply ) * mc->mc_ntargets );
        }
 
-       return (char *)data;
+       return mc->mc_candidates;
 }
 
 /*
@@ -545,40 +711,82 @@ meta_back_candidates_get( Operation *op )
  *   that exactly none (noSuchObject) or one (TRUE/FALSE/UNDEFINED) is
  *   returned.
  */
-struct metaconn *
+metaconn_t *
 meta_back_getconn(
-               Operation               *op,
-               SlapReply               *rs,
-               int                     *candidate,
-               ldap_back_send_t        sendok )
+               Operation               *op,
+       SlapReply               *rs,
+       int                     *candidate,
+       ldap_back_send_t        sendok )
 {
-       struct metainfo *li = ( struct metainfo * )op->o_bd->be_private;
-       struct metaconn *lc, lc_curr;
+       metainfo_t      *mi = ( metainfo_t * )op->o_bd->be_private;
+       metaconn_t      *mc = NULL,
+                       mc_curr = { 0 };
        int             cached = META_TARGET_NONE,
                        i = META_TARGET_NONE,
                        err = LDAP_SUCCESS,
-                       new_conn = 0;
+                       new_conn = 0,
+                       ncandidates = 0;
+
 
        meta_op_type    op_type = META_OP_REQUIRE_SINGLE;
        int             parent = 0,
                        newparent = 0;
-       struct berval   ndn = op->o_req_ndn;
+       struct berval   ndn = op->o_req_ndn,
+                       pndn;
+
+       SlapReply       *candidates = meta_back_candidates_get( op );
 
-       char            *candidates = meta_back_candidates_get( op );
+       /* Internal searches are privileged and shared. So is root. */
+       /* FIXME: there seem to be concurrency issues */
+       if ( op->o_do_not_cache || be_isroot( op ) ) {
+               mc_curr.mc_local_ndn = op->o_bd->be_rootndn;
+               LDAP_BACK_CONN_ISPRIV_SET( &mc_curr );
+               mc_curr.mc_conn = LDAP_BACK_PCONN_SET( op );
 
-       /* Searches for a metaconn in the avl tree */
-       lc_curr.mc_conn = op->o_conn;
-       ldap_pvt_thread_mutex_lock( &li->mi_conn_mutex );
-       lc = (struct metaconn *)avl_find( li->mi_conntree, 
-               (caddr_t)&lc_curr, meta_back_conn_cmp );
-       ldap_pvt_thread_mutex_unlock( &li->mi_conn_mutex );
+       } else {
+               mc_curr.mc_local_ndn = op->o_ndn;
+
+               /* Explicit binds must not be shared */
+               if ( op->o_tag == LDAP_REQ_BIND || SLAP_IS_AUTHZ_BACKEND( op ) ) {
+                       mc_curr.mc_conn = op->o_conn;
+       
+               } else {
+                       mc_curr.mc_conn = LDAP_BACK_PCONN_SET( op );
+               }
+       }
+
+       /* Explicit Bind requests always get their own conn */
+       if ( !( sendok & LDAP_BACK_BINDING ) ) {
+               /* Searches for a metaconn in the avl tree */
+retry_lock:
+               ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+               mc = (metaconn_t *)avl_find( mi->mi_conninfo.lai_tree, 
+                       (caddr_t)&mc_curr, meta_back_conn_cmp );
+               if ( mc ) {
+                       if ( mc->mc_tainted ) {
+                               rs->sr_err = LDAP_UNAVAILABLE;
+                               rs->sr_text = "remote server unavailable";
+                               ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+                               return NULL;
+                       }
+                       
+                       /* Don't reuse connections while they're still binding */
+                       if ( LDAP_BACK_CONN_BINDING( mc ) ) {
+                               ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+                               ldap_pvt_thread_yield();
+                               goto retry_lock;
+                       }
+                       mc->mc_refcnt++;
+               }
+               ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+       }
 
        switch ( op->o_tag ) {
        case LDAP_REQ_ADD:
                /* if we go to selection, the entry must not exist,
                 * and we must be able to resolve the parent */
                parent = 1;
-               dnParent( &ndn, &ndn );
+               dnParent( &ndn, &pndn );
                break;
 
        case LDAP_REQ_MODRDN:
@@ -619,49 +827,85 @@ meta_back_getconn(
        if ( op_type == META_OP_REQUIRE_ALL ) {
 
                /* Looks like we didn't get a bind. Open a new session... */
-               if ( !lc ) {
-                       lc = metaconn_alloc( li->mi_ntargets );
-                       lc->mc_conn = op->o_conn;
+               if ( mc == NULL ) {
+                       mc = metaconn_alloc( op );
+                       mc->mc_conn = mc_curr.mc_conn;
+                       ber_dupbv( &mc->mc_local_ndn, &mc_curr.mc_local_ndn );
                        new_conn = 1;
+                       if ( sendok & LDAP_BACK_BINDING ) {
+                               LDAP_BACK_CONN_BINDING_SET( mc );
+                       }
                }
 
-               for ( i = 0; i < li->mi_ntargets; i++ ) {
+               for ( i = 0; i < mi->mi_ntargets; i++ ) {
+                       metatarget_t            *mt = &mi->mi_targets[ i ];
 
                        /*
                         * The target is activated; if needed, it is
                         * also init'd
                         */
-                       int lerr = init_one_conn( op, rs, li->mi_targets[ i ],
-                                       &lc->mc_conns[ i ], &candidates[ i ],
-                                       sendok );
-                       if ( lerr != LDAP_SUCCESS ) {
+                       candidates[ i ].sr_err = meta_back_init_one_conn( op,
+                               rs, mt, mc, i,
+                               LDAP_BACK_CONN_ISPRIV( &mc_curr ), sendok );
+                       if ( candidates[ i ].sr_err == LDAP_SUCCESS ) {
+                               candidates[ i ].sr_tag = META_CANDIDATE;
+                               ncandidates++;
+       
+                       } else {
                                
                                /*
                                 * FIXME: in case one target cannot
                                 * be init'd, should the other ones
                                 * be tried?
                                 */
-                               candidates[ i ] = META_NOT_CANDIDATE;
-#if 0
-                               ( void )meta_clear_one_candidate( &lc->mc_conns[ i ] );
-#endif
-                               err = lerr;
+                               candidates[ i ].sr_tag = META_NOT_CANDIDATE;
+                               err = candidates[ i ].sr_err;
                                continue;
                        }
                }
+
+               if ( ncandidates == 0 ) {
+                       if ( new_conn ) {
+                               meta_back_freeconn( op, mc );
+
+                       } else {
+                               meta_back_release_conn( op, mc );
+                       }
+
+                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
+                       rs->sr_text = "Unable to select valid candidates";
+
+                       if ( sendok & LDAP_BACK_SENDERR ) {
+                               if ( rs->sr_err == LDAP_NO_SUCH_OBJECT ) {
+                                       rs->sr_matched = op->o_bd->be_suffix[ 0 ].bv_val;
+                               }
+                               send_ldap_result( op, rs );
+                               rs->sr_text = NULL;
+                               rs->sr_matched = NULL;
+                       }
+
+                       return NULL;
+               }
+
                goto done;
        }
        
        /*
         * looks in cache, if any
         */
-       if ( li->mi_cache.ttl != META_DNCACHE_DISABLED ) {
-               cached = i = meta_dncache_get_target( &li->mi_cache, &op->o_req_ndn );
+       if ( mi->mi_cache.ttl != META_DNCACHE_DISABLED ) {
+               cached = i = meta_dncache_get_target( &mi->mi_cache, &op->o_req_ndn );
        }
 
        if ( op_type == META_OP_REQUIRE_SINGLE ) {
+               metatarget_t            *mt = NULL;
+               metasingleconn_t        *msc = NULL;
+
+               int                     j;
 
-               memset( candidates, META_NOT_CANDIDATE, sizeof( char ) * li->mi_ntargets );
+               for ( j = 0; j < mi->mi_ntargets; j++ ) {
+                       candidates[ j ].sr_tag = META_NOT_CANDIDATE;
+               }
 
                /*
                 * tries to get a unique candidate
@@ -670,72 +914,110 @@ meta_back_getconn(
                if ( i == META_TARGET_NONE ) {
                        i = meta_back_get_candidate( op, rs, &ndn );
 
+                       if ( rs->sr_err == LDAP_NO_SUCH_OBJECT && parent ) {
+                               i = meta_back_get_candidate( op, rs, &pndn );
+                       }
+       
                        if ( rs->sr_err != LDAP_SUCCESS ) {
+                               if ( mc != NULL ) {
+                                       meta_back_release_conn( op, mc );
+                               }
+
                                if ( sendok & LDAP_BACK_SENDERR ) {
+                                       if ( rs->sr_err == LDAP_NO_SUCH_OBJECT ) {
+                                               rs->sr_matched = op->o_bd->be_suffix[ 0 ].bv_val;
+                                       }
                                        send_ldap_result( op, rs );
                                        rs->sr_text = NULL;
+                                       rs->sr_matched = NULL;
                                }
+                       
                                return NULL;
                        }
                }
 
                if ( newparent && meta_back_get_candidate( op, rs, op->orr_nnewSup ) != i )
                {
+                       if ( mc != NULL ) {
+                               meta_back_release_conn( op, mc );
+                       }
+
                        rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
                        rs->sr_text = "cross-target rename not supported";
                        if ( sendok & LDAP_BACK_SENDERR ) {
                                send_ldap_result( op, rs );
                                rs->sr_text = NULL;
                        }
+
                        return NULL;
                }
 
-               Debug( LDAP_DEBUG_CACHE,
-       "==>meta_back_getconn: got target %d for ndn=\"%s\" from cache\n",
+               Debug( LDAP_DEBUG_TRACE,
+       "==>meta_back_getconn: got target=%d for ndn=\"%s\" from cache\n",
                                i, op->o_req_ndn.bv_val, 0 );
 
-               /* Retries searching for a metaconn in the avl tree */
-               lc_curr.mc_conn = op->o_conn;
-               ldap_pvt_thread_mutex_lock( &li->mi_conn_mutex );
-               lc = (struct metaconn *)avl_find( li->mi_conntree, 
-                       (caddr_t)&lc_curr, meta_back_conn_cmp );
-               ldap_pvt_thread_mutex_unlock( &li->mi_conn_mutex );
+               if ( mc == NULL ) {
+                       /* Retries searching for a metaconn in the avl tree
+                        * the reason is that the connection might have been
+                        * created by meta_back_get_candidate() */
+                       if ( !( sendok & LDAP_BACK_BINDING ) ) {
+                               ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+                               mc = (metaconn_t *)avl_find( mi->mi_conninfo.lai_tree, 
+                                       (caddr_t)&mc_curr, meta_back_conn_cmp );
+                               if ( mc != NULL ) {
+                                       mc->mc_refcnt++;
+                               }
+                               ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+                       }
 
-               /* Looks like we didn't get a bind. Open a new session... */
-               if ( !lc ) {
-                       lc = metaconn_alloc( li->mi_ntargets );
-                       lc->mc_conn = op->o_conn;
-                       new_conn = 1;
+                       /* Looks like we didn't get a bind. Open a new session... */
+                       if ( mc == NULL ) {
+                               mc = metaconn_alloc( op );
+                               mc->mc_conn = mc_curr.mc_conn;
+                               ber_dupbv( &mc->mc_local_ndn, &mc_curr.mc_local_ndn );
+                               new_conn = 1;
+                               if ( sendok & LDAP_BACK_BINDING ) {
+                                       LDAP_BACK_CONN_BINDING_SET( mc );
+                               }
+                       }
                }
 
                /*
                 * Clear all other candidates
                 */
-               ( void )meta_clear_unused_candidates( op, lc, i );
+               ( void )meta_clear_unused_candidates( op, i );
+
+               mt = &mi->mi_targets[ i ];
+               msc = &mc->mc_conns[ i ];
 
                /*
                 * The target is activated; if needed, it is
-                * also init'd. In case of error, init_one_conn
+                * also init'd. In case of error, meta_back_init_one_conn
                 * sends the appropriate result.
                 */
-               err = init_one_conn( op, rs, li->mi_targets[ i ],
-                               &lc->mc_conns[ i ], &candidates[ i ],
-                               sendok );
+               err = meta_back_init_one_conn( op, rs, mt, mc, i,
+                       LDAP_BACK_CONN_ISPRIV( &mc_curr ), sendok );
                if ( err != LDAP_SUCCESS ) {
-               
                        /*
                         * FIXME: in case one target cannot
                         * be init'd, should the other ones
                         * be tried?
                         */
-                       candidates[ i ] = META_NOT_CANDIDATE;
+                       candidates[ i ].sr_tag = META_NOT_CANDIDATE;
                        if ( new_conn ) {
-                               ( void )meta_clear_one_candidate( &lc->mc_conns[ i ] );
-                               metaconn_free( lc );
+                               (void)meta_clear_one_candidate( msc );
+                               meta_back_freeconn( op, mc );
+
+                       } else {
+                               meta_back_release_conn( op, mc );
                        }
                        return NULL;
                }
 
+               candidates[ i ].sr_err = LDAP_SUCCESS;
+               candidates[ i ].sr_tag = META_CANDIDATE;
+               ncandidates++;
+
                if ( candidate ) {
                        *candidate = i;
                }
@@ -746,50 +1028,97 @@ meta_back_getconn(
        } else {
 
                /* Looks like we didn't get a bind. Open a new session... */
-               if ( !lc ) {
-                       lc = metaconn_alloc( li->mi_ntargets );
-                       lc->mc_conn = op->o_conn;
+               if ( mc == NULL ) {
+                       mc = metaconn_alloc( op );
+                       mc->mc_conn = mc_curr.mc_conn;
+                       ber_dupbv( &mc->mc_local_ndn, &mc_curr.mc_local_ndn );
                        new_conn = 1;
+                       if ( sendok & LDAP_BACK_BINDING ) {
+                               LDAP_BACK_CONN_BINDING_SET( mc );
+                       }
                }
 
-               for ( i = 0; i < li->mi_ntargets; i++ ) {
+               for ( i = 0; i < mi->mi_ntargets; i++ ) {
+                       metatarget_t            *mt = &mi->mi_targets[ i ];
+                       metasingleconn_t        *msc = &mc->mc_conns[ i ];
+
                        if ( i == cached 
-                               || meta_back_is_candidate( &li->mi_targets[ i ]->mt_nsuffix,
-                                               &op->o_req_ndn ) )
+                               || meta_back_is_candidate( &mt->mt_nsuffix,
+                                               mt->mt_scope,
+                                               &op->o_req_ndn,
+                                               LDAP_SCOPE_SUBTREE ) )
                        {
 
                                /*
                                 * The target is activated; if needed, it is
                                 * also init'd
                                 */
-                               int lerr = init_one_conn( op, rs,
-                                               li->mi_targets[ i ],
-                                               &lc->mc_conns[ i ],
-                                               &candidates[ i ],
+                               int lerr = meta_back_init_one_conn( op, rs,
+                                               mt, mc, i,
+                                               LDAP_BACK_CONN_ISPRIV( &mc_curr ),
                                                sendok );
-                               if ( lerr != LDAP_SUCCESS ) {
+                               if ( lerr == LDAP_SUCCESS ) {
+                                       candidates[ i ].sr_tag = META_CANDIDATE;
+                                       candidates[ i ].sr_err = LDAP_SUCCESS;
+                                       ncandidates++;
+
+                                       Debug( LDAP_DEBUG_TRACE, "%s: meta_back_getconn[%d]\n",
+                                               op->o_log_prefix, i, 0 );
+
+                               } else {
                                
                                        /*
                                         * FIXME: in case one target cannot
                                         * be init'd, should the other ones
                                         * be tried?
                                         */
-                                       candidates[ i ] = META_NOT_CANDIDATE;
-#if 0
-                                       ( void )meta_clear_one_candidate( &lc->mc_conns[ i ] );
-#endif
+                                       if ( new_conn ) {
+                                               ( void )meta_clear_one_candidate( msc );
+                                       }
+                                       /* leave the target candidate, but record the error for later use */
+                                       candidates[ i ].sr_err = lerr;
                                        err = lerr;
+
+                                       Debug( LDAP_DEBUG_ANY, "%s: meta_back_getconn[%d] failed: %d\n",
+                                               op->o_log_prefix, i, lerr );
+
                                        continue;
                                }
 
                        } else {
-                               candidates[ i ] = META_NOT_CANDIDATE;
+                               if ( new_conn ) {
+                                       ( void )meta_clear_one_candidate( msc );
+                               }
+                               candidates[ i ].sr_tag = META_NOT_CANDIDATE;
                        }
                }
+
+               if ( ncandidates == 0 ) {
+                       if ( new_conn ) {
+                               meta_back_freeconn( op, mc );
+
+                       } else {
+                               meta_back_release_conn( op, mc );
+                       }
+
+                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
+                       rs->sr_text = "Unable to select valid candidates";
+
+                       if ( sendok & LDAP_BACK_SENDERR ) {
+                               if ( rs->sr_err == LDAP_NO_SUCH_OBJECT ) {
+                                       rs->sr_matched = op->o_bd->be_suffix[ 0 ].bv_val;
+                               }
+                               send_ldap_result( op, rs );
+                               rs->sr_text = NULL;
+                               rs->sr_matched = NULL;
+                       }
+
+                       return NULL;
+               }
        }
 
 done:;
-       /* clear out init_one_conn non-fatal errors */
+       /* clear out meta_back_init_one_conn non-fatal errors */
        rs->sr_err = LDAP_SUCCESS;
        rs->sr_text = NULL;
 
@@ -798,27 +1127,31 @@ done:;
                /*
                 * Inserts the newly created metaconn in the avl tree
                 */
-               ldap_pvt_thread_mutex_lock( &li->mi_conn_mutex );
-               err = avl_insert( &li->mi_conntree, ( caddr_t )lc,
+               ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+               err = avl_insert( &mi->mi_conninfo.lai_tree, ( caddr_t )mc,
                                meta_back_conn_cmp, meta_back_conn_dup );
 
 #if PRINT_CONNTREE > 0
-               myprint( li->mi_conntree );
+               myprint( mi->mi_conninfo.lai_tree );
 #endif /* PRINT_CONNTREE */
                
-               ldap_pvt_thread_mutex_unlock( &li->mi_conn_mutex );
+               ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
 
-               Debug( LDAP_DEBUG_TRACE,
-                       "=>meta_back_getconn: conn %ld inserted\n",
-                       lc->mc_conn->c_connid, 0, 0 );
-               
                /*
                 * Err could be -1 in case a duplicate metaconn is inserted
+                *
+                * FIXME: what if the same client issues more than one
+                * asynchronous operations?
                 */
                if ( err != 0 ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "%s meta_back_getconn: candidates=%d conn=%ld insert failed\n",
+                               op->o_log_prefix, ncandidates,
+                               LDAP_BACK_PCONN_ID( mc->mc_conn ) );
+               
                        rs->sr_err = LDAP_OTHER;
                        rs->sr_text = "Internal server error";
-                       metaconn_free( lc );
+                       meta_back_freeconn( op, mc );
                        if ( sendok & LDAP_BACK_SENDERR ) {
                                send_ldap_result( op, rs );
                                rs->sr_text = NULL;
@@ -826,12 +1159,38 @@ done:;
                        return NULL;
                }
 
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s meta_back_getconn: candidates=%d conn=%ld inserted\n",
+                       op->o_log_prefix, ncandidates,
+                       LDAP_BACK_PCONN_ID( mc->mc_conn ) );
+
        } else {
                Debug( LDAP_DEBUG_TRACE,
-                       "=>meta_back_getconn: conn %ld fetched\n",
-                       lc->mc_conn->c_connid, 0, 0 );
+                       "%s meta_back_getconn: candidates=%d conn=%ld fetched\n",
+                       op->o_log_prefix, ncandidates,
+                       LDAP_BACK_PCONN_ID( mc->mc_conn ) );
        }
        
-       return lc;
+       return mc;
 }
 
+void
+meta_back_release_conn(
+               Operation               *op,
+       metaconn_t              *mc )
+{
+       metainfo_t      *mi = ( metainfo_t * )op->o_bd->be_private;
+
+       assert( mc != NULL );
+
+       ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+       assert( mc->mc_refcnt > 0 );
+       mc->mc_refcnt--;
+       LDAP_BACK_CONN_BINDING_CLEAR( mc );
+       if ( mc->mc_refcnt == 0 && mc->mc_tainted ) {
+               (void)avl_delete( &mi->mi_conninfo.lai_tree, ( caddr_t )mc,
+                               meta_back_conn_cmp );
+               meta_back_conn_free( mc );
+       }
+       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+}