]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-meta/bind.c
Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
[openldap] / servers / slapd / back-meta / bind.c
index b5df2a52fd8976c5fc11880af76550db9070e6d6..acfc69577cecd577ba97c1279eae8e2f31d6dccb 100644 (file)
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 
+#include "lutil_ldap.h"
+
+static int
+meta_back_proxy_authz_bind(
+       metaconn_t              *mc,
+       int                     candidate,
+       Operation               *op,
+       SlapReply               *rs,
+       ldap_back_send_t        sendok,
+       int                     dolock );
+
+static int
+meta_back_single_bind(
+       Operation               *op,
+       SlapReply               *rs,
+       metaconn_t              *mc,
+       int                     candidate );
+
 int
 meta_back_bind( Operation *op, SlapReply *rs )
 {
@@ -45,7 +63,7 @@ meta_back_bind( Operation *op, SlapReply *rs )
                        gotit = 0,
                        isroot = 0;
 
-       SlapReply       *candidates = meta_back_candidates_get( op );
+       SlapReply       *candidates;
 
        rs->sr_err = LDAP_SUCCESS;
 
@@ -53,24 +71,22 @@ meta_back_bind( Operation *op, SlapReply *rs )
                op->o_log_prefix, op->o_req_dn.bv_val, 0 );
 
        /* the test on the bind method should be superfluous */
-       if ( op->orb_method == LDAP_AUTH_SIMPLE
-               && be_isroot_dn( op->o_bd, &op->o_req_ndn ) )
-       {
-               if ( !be_isroot_pw( op ) ) {
-                       rs->sr_err = LDAP_INVALID_CREDENTIALS;
-                       rs->sr_text = NULL;
-                       send_ldap_result( op, rs );
-                       return rs->sr_err;
-               }
-
+       switch ( be_rootdn_bind( op, rs ) ) {
+       case LDAP_SUCCESS:
                if ( META_BACK_DEFER_ROOTDN_BIND( mi ) ) {
-                       rs->sr_err = LDAP_SUCCESS;
-                       rs->sr_text = NULL;
                        /* frontend will return success */
                        return rs->sr_err;
                }
 
                isroot = 1;
+               /* fallthru */
+
+       case SLAP_CB_CONTINUE:
+               break;
+
+       default:
+               /* be_rootdn_bind() sent result */
+               return rs->sr_err;
        }
 
        /* we need meta_back_getconn() not send result even on error,
@@ -105,6 +121,8 @@ meta_back_bind( Operation *op, SlapReply *rs )
                return rs->sr_err;
        }
 
+       candidates = meta_back_candidates_get( op );
+
        /*
         * Each target is scanned ...
         */
@@ -112,8 +130,6 @@ meta_back_bind( Operation *op, SlapReply *rs )
        for ( i = 0; i < mi->mi_ntargets; i++ ) {
                metatarget_t    *mt = mi->mi_targets[ i ];
                int             lerr;
-               Operation       op2 = *op;
-               int             massage = 1;
 
                /*
                 * Skip non-candidates
@@ -128,7 +144,7 @@ meta_back_bind( Operation *op, SlapReply *rs )
                        rc = LDAP_SUCCESS;
                        gotit = 1;
 
-               } else if ( isroot == 0 ) {
+               } else if ( !isroot ) {
                        /*
                         * A bind operation is expected to have
                         * ONE CANDIDATE ONLY!
@@ -140,7 +156,8 @@ meta_back_bind( Operation *op, SlapReply *rs )
                }
 
                if ( isroot ) {
-                       if ( BER_BVISNULL( &mt->mt_pseudorootdn ) )
+                       if ( mt->mt_idassert_authmethod == LDAP_AUTH_NONE
+                               || BER_BVISNULL( &mt->mt_idassert_authcDN ) )
                        {
                                metasingleconn_t        *msc = &mc->mc_conns[ i ];
 
@@ -150,9 +167,7 @@ meta_back_bind( Operation *op, SlapReply *rs )
                                        BER_BVZERO( &msc->msc_bound_ndn );
                                }
 
-                               if ( LDAP_BACK_SAVECRED( mi ) &&
-                                       !BER_BVISNULL( &msc->msc_cred ) )
-                               {
+                               if ( !BER_BVISNULL( &msc->msc_cred ) ) {
                                        /* destroy sensitive data */
                                        memset( msc->msc_cred.bv_val, 0,
                                                msc->msc_cred.bv_len );
@@ -163,18 +178,17 @@ meta_back_bind( Operation *op, SlapReply *rs )
                                continue;
                        }
 
-                       op2.o_req_dn = mt->mt_pseudorootdn;
-                       op2.o_req_ndn = mt->mt_pseudorootdn;
-                       op2.orb_cred = mt->mt_pseudorootpw;
-                       op2.orb_method = LDAP_AUTH_SIMPLE;
+                       
+                       (void)meta_back_proxy_authz_bind( mc, i, op, rs, LDAP_BACK_DONTSEND, 1 );
+                       lerr = rs->sr_err;
 
-                       massage = 0;
+               } else {
+                       lerr = meta_back_single_bind( op, rs, mc, i );
                }
-               
-               lerr = meta_back_single_bind( &op2, rs, mc, i, massage );
 
                if ( lerr != LDAP_SUCCESS ) {
                        rc = rs->sr_err = lerr;
+
                        /* FIXME: in some cases (e.g. unavailable)
                         * do not assume it's not candidate; rather
                         * mark this as an error to be eventually
@@ -188,34 +202,30 @@ meta_back_bind( Operation *op, SlapReply *rs )
        if ( rc == LDAP_SUCCESS ) {
                if ( isroot ) {
                        mc->mc_authz_target = META_BOUND_ALL;
-                       ber_dupbv( &op->orb_edn, be_root_dn( op->o_bd ) );
                }
 
-               if ( !dn_match( &op->o_req_ndn, &mc->mc_local_ndn ) ) {
-                       metaconn_t      *tmpmc;
+               if ( !LDAP_BACK_PCONN_ISPRIV( mc )
+                       && !dn_match( &op->o_req_ndn, &mc->mc_local_ndn ) )
+               {
                        int             lerr;
 
                        /* wait for all other ops to release the connection */
-retry_lock:;
                        ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
-                       if ( mc->mc_refcnt > 1 ) {
-                               ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
-                               ldap_pvt_thread_yield();
-                               goto retry_lock;
-                       }
-
                        assert( mc->mc_refcnt == 1 );
-                       tmpmc = avl_delete( &mi->mi_conninfo.lai_tree, (caddr_t)mc,
-                               meta_back_conndn_cmp );
-                       assert( tmpmc == mc );
+#if META_BACK_PRINT_CONNTREE > 0
+                       meta_back_print_conntree( mi, ">>> meta_back_bind" );
+#endif /* META_BACK_PRINT_CONNTREE */
 
                        /* delete all cached connections with the current connection */
                        if ( LDAP_BACK_SINGLECONN( mi ) ) {
+                               metaconn_t      *tmpmc;
+
                                while ( ( tmpmc = avl_delete( &mi->mi_conninfo.lai_tree, (caddr_t)mc, meta_back_conn_cmp ) ) != NULL )
                                {
+                                       assert( !LDAP_BACK_PCONN_ISPRIV( mc ) );
                                        Debug( LDAP_DEBUG_TRACE,
-                                               "=>meta_back_bind: destroying conn %ld (refcnt=%u)\n",
-                                               LDAP_BACK_PCONN_ID( mc->mc_conn ), mc->mc_refcnt, 0 );
+                                               "=>meta_back_bind: destroying conn %lu (refcnt=%u)\n",
+                                               mc->mc_conn->c_connid, mc->mc_refcnt, 0 );
 
                                        if ( tmpmc->mc_refcnt != 0 ) {
                                                /* taint it */
@@ -233,25 +243,32 @@ retry_lock:;
                        }
 
                        ber_bvreplace( &mc->mc_local_ndn, &op->o_req_ndn );
-                       if ( be_isroot_dn( op->o_bd, &op->o_req_ndn ) ) {
-                               mc->mc_conn = LDAP_BACK_PCONN_SET( op );
-                       }
                        lerr = avl_insert( &mi->mi_conninfo.lai_tree, (caddr_t)mc,
                                meta_back_conndn_cmp, meta_back_conndn_dup );
-                       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
-                       if ( lerr == -1 ) {
-                               meta_clear_candidates( op, mc );
+#if META_BACK_PRINT_CONNTREE > 0
+                       meta_back_print_conntree( mi, "<<< meta_back_bind" );
+#endif /* META_BACK_PRINT_CONNTREE */
+                       if ( lerr == 0 ) {
+#if 0
+                               /* NOTE: a connection cannot be privileged
+                                * and be in the avl tree at the same time
+                                */
+                               if ( isroot ) {
+                                       LDAP_BACK_CONN_ISPRIV_SET( mc );
+                                       LDAP_BACK_PCONN_SET( mc, op );
+                               }
+#endif
+                               LDAP_BACK_CONN_CACHED_SET( mc );
 
-                               /* we can do this because mc_refcnt == 1 */
-                               mc->mc_refcnt = 0;
-                               meta_back_conn_free( mc );
-                               mc = NULL;
+                       } else {
+                               LDAP_BACK_CONN_CACHED_CLEAR( mc );
                        }
+                       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
                }
        }
 
        if ( mc != NULL ) {
-               meta_back_release_conn( op, mc );
+               meta_back_release_conn( mi, mc );
        }
 
        /*
@@ -289,7 +306,8 @@ meta_back_bind_op_result(
        metaconn_t              *mc,
        int                     candidate,
        int                     msgid,
-       ldap_back_send_t        sendok )
+       ldap_back_send_t        sendok,
+       int                     dolock )
 {
        metainfo_t              *mi = ( metainfo_t * )op->o_bd->be_private;
        metatarget_t            *mt = mi->mi_targets[ candidate ];
@@ -300,20 +318,63 @@ meta_back_bind_op_result(
        int                     nretries = mt->mt_nretries;
        char                    buf[ SLAP_TEXT_BUFLEN ];
 
+       Debug( LDAP_DEBUG_TRACE,
+               ">>> %s meta_back_bind_op_result[%d]\n",
+               op->o_log_prefix, candidate, 0 );
+
+       /* make sure this is clean */
+       assert( rs->sr_ctrls == NULL );
+
        if ( rs->sr_err == LDAP_SUCCESS ) {
+               time_t          stoptime = (time_t)(-1),
+                               timeout;
+               int             timeout_err = op->o_protocol >= LDAP_VERSION3 ?
+                               LDAP_ADMINLIMIT_EXCEEDED : LDAP_OTHER;
+               const char      *timeout_text = "Operation timed out";
+               slap_op_t       opidx = slap_req2op( op->o_tag );
+
+               /* since timeout is not specified, compute and use
+                * the one specific to the ongoing operation */
+               if ( opidx == LDAP_REQ_SEARCH ) {
+                       if ( op->ors_tlimit <= 0 ) {
+                               timeout = 0;
+
+                       } else {
+                               timeout = op->ors_tlimit;
+                               timeout_err = LDAP_TIMELIMIT_EXCEEDED;
+                               timeout_text = NULL;
+                       }
+
+               } else {
+                       timeout = mt->mt_timeout[ opidx ];
+               }
+
+               /* better than nothing :) */
+               if ( timeout == 0 ) {
+                       if ( mi->mi_idle_timeout ) {
+                               timeout = mi->mi_idle_timeout;
+
+                       } else if ( mi->mi_conn_ttl ) {
+                               timeout = mi->mi_conn_ttl;
+                       }
+               }
+
+               if ( timeout ) {
+                       stoptime = op->o_time + timeout;
+               }
+
                LDAP_BACK_TV_SET( &tv );
 
                /*
                 * handle response!!!
                 */
 retry:;
-               switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
+               rc = ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res );
+               switch ( rc ) {
                case 0:
-                       Debug( LDAP_DEBUG_ANY,
-                               "%s meta_back_single_bind[%d]: ldap_result=0 nretries=%d.\n",
-                               op->o_log_prefix, candidate, nretries );
-
-                       if ( nretries != META_RETRY_NEVER ) {
+                       if ( nretries != META_RETRY_NEVER 
+                               || ( timeout && slap_get_time() <= stoptime ) )
+                       {
                                ldap_pvt_thread_yield();
                                if ( nretries > 0 ) {
                                        nretries--;
@@ -322,8 +383,26 @@ retry:;
                                goto retry;
                        }
 
-                       rs->sr_err = LDAP_BUSY;
-                       (void)meta_back_cancel( mc, op, rs, msgid, candidate, sendok );
+                       /* don't let anyone else use this handler,
+                        * because there's a pending bind that will not
+                        * be acknowledged */
+                       if ( dolock) {
+                               ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+                       }
+                       assert( LDAP_BACK_CONN_BINDING( msc ) );
+
+#ifdef DEBUG_205
+                       Debug( LDAP_DEBUG_ANY, "### %s meta_back_bind_op_result ldap_unbind_ext[%d] ld=%p\n",
+                               op->o_log_prefix, candidate, (void *)msc->msc_ld );
+#endif /* DEBUG_205 */
+
+                       meta_clear_one_candidate( op, mc, candidate );
+                       if ( dolock ) {
+                               ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+                       }
+
+                       rs->sr_err = timeout_err;
+                       rs->sr_text = timeout_text;
                        break;
 
                case -1:
@@ -334,21 +413,34 @@ retry:;
                                "err=%d (%s) nretries=%d",
                                rs->sr_err, ldap_err2string( rs->sr_err ), nretries );
                        Debug( LDAP_DEBUG_ANY,
-                               "### %s meta_back_single_bind[%d]: %s.\n",
+                               "### %s meta_back_bind_op_result[%d]: %s.\n",
                                op->o_log_prefix, candidate, buf );
                        break;
 
                default:
+                       /* only touch when activity actually took place... */
+                       if ( mi->mi_idle_timeout != 0 && msc->msc_time < op->o_time ) {
+                               msc->msc_time = op->o_time;
+                       }
+
+                       /* FIXME: matched? referrals? response controls? */
                        rc = ldap_parse_result( msc->msc_ld, res, &rs->sr_err,
                                        NULL, NULL, NULL, NULL, 1 );
                        if ( rc != LDAP_SUCCESS ) {
                                rs->sr_err = rc;
                        }
+                       rs->sr_err = slap_map_api2result( rs );
                        break;
                }
        }
 
-       return rs->sr_err = slap_map_api2result( rs );
+       rs->sr_err = slap_map_api2result( rs );
+
+       Debug( LDAP_DEBUG_TRACE,
+               "<<< %s meta_back_bind_op_result[%d] err=%d\n",
+               op->o_log_prefix, candidate, rs->sr_err );
+
+       return rs->sr_err;
 }
 
 /*
@@ -356,26 +448,29 @@ retry:;
  *
  * attempts to perform a bind with creds
  */
-int
+static int
 meta_back_single_bind(
        Operation               *op,
        SlapReply               *rs,
        metaconn_t              *mc,
-       int                     candidate,
-       int                     massage )
+       int                     candidate )
 {
        metainfo_t              *mi = ( metainfo_t * )op->o_bd->be_private;
        metatarget_t            *mt = mi->mi_targets[ candidate ];
        struct berval           mdn = BER_BVNULL;
        metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
        int                     msgid;
+       dncookie                dc;
+       struct berval           save_o_dn;
+       int                     save_o_do_not_cache;
+       LDAPControl             **ctrls = NULL;
        
        if ( !BER_BVISNULL( &msc->msc_bound_ndn ) ) {
                ch_free( msc->msc_bound_ndn.bv_val );
                BER_BVZERO( &msc->msc_bound_ndn );
        }
 
-       if ( LDAP_BACK_SAVECRED( mi ) && !BER_BVISNULL( &msc->msc_cred ) ) {
+       if ( !BER_BVISNULL( &msc->msc_cred ) ) {
                /* destroy sensitive data */
                memset( msc->msc_cred.bv_val, 0, msc->msc_cred.bv_len );
                ch_free( msc->msc_cred.bv_val );
@@ -385,22 +480,29 @@ meta_back_single_bind(
        /*
         * Rewrite the bind dn if needed
         */
-       if ( massage ) {
-               dncookie                dc;
-
-               dc.target = mt;
-               dc.conn = op->o_conn;
-               dc.rs = rs;
-               dc.ctx = "bindDN";
+       dc.target = mt;
+       dc.conn = op->o_conn;
+       dc.rs = rs;
+       dc.ctx = "bindDN";
+
+       if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+               rs->sr_text = "DN rewrite error";
+               rs->sr_err = LDAP_OTHER;
+               return rs->sr_err;
+       }
 
-               if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
-                       rs->sr_text = "DN rewrite error";
-                       rs->sr_err = LDAP_OTHER;
-                       return rs->sr_err;
-               }
+       /* don't add proxyAuthz; set the bindDN */
+       save_o_dn = op->o_dn;
+       save_o_do_not_cache = op->o_do_not_cache;
+       op->o_do_not_cache = 1;
+       op->o_dn = op->o_req_dn;
 
-       } else {
-               mdn = op->o_req_dn;
+       ctrls = op->o_ctrls;
+       rs->sr_err = meta_back_controls_add( op, rs, mc, candidate, &ctrls );
+       op->o_dn = save_o_dn;
+       op->o_do_not_cache = save_o_do_not_cache;
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               goto return_results;
        }
 
        /* FIXME: this fixes the bind problem right now; we need
@@ -408,19 +510,45 @@ meta_back_single_bind(
         * and more in case of failure ... */
        /* FIXME: should we check if at least some of the op->o_ctrls
         * can/should be passed? */
-       rs->sr_err = ldap_sasl_bind( msc->msc_ld, mdn.bv_val,
+       for (;;) {
+               rs->sr_err = ldap_sasl_bind( msc->msc_ld, mdn.bv_val,
                        LDAP_SASL_SIMPLE, &op->orb_cred,
-                       op->o_ctrls, NULL, &msgid );
-       meta_back_bind_op_result( op, rs, mc, candidate, msgid, LDAP_BACK_DONTSEND );
+                       ctrls, NULL, &msgid );
+               if ( rs->sr_err != LDAP_X_CONNECTING ) {
+                       break;
+               }
+               ldap_pvt_thread_yield();
+       }
+
+       mi->mi_ldap_extra->controls_free( op, rs, &ctrls );
+
+       meta_back_bind_op_result( op, rs, mc, candidate, msgid, LDAP_BACK_DONTSEND, 1 );
        if ( rs->sr_err != LDAP_SUCCESS ) {
                goto return_results;
        }
 
-       ber_bvreplace( &msc->msc_bound_ndn, &op->o_req_dn );
+       /* If defined, proxyAuthz will be used also when
+        * back-ldap is the authorizing backend; for this
+        * purpose, a successful bind is followed by a
+        * bind with the configured identity assertion */
+       /* NOTE: use with care */
+       if ( mt->mt_idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) {
+               meta_back_proxy_authz_bind( mc, candidate, op, rs, LDAP_BACK_SENDERR, 1 );
+               if ( !LDAP_BACK_CONN_ISBOUND( msc ) ) {
+                       goto return_results;
+               }
+               goto cache_refresh;
+       }
+
+       ber_bvreplace( &msc->msc_bound_ndn, &op->o_req_ndn );
        LDAP_BACK_CONN_ISBOUND_SET( msc );
        mc->mc_authz_target = candidate;
 
-       if ( LDAP_BACK_SAVECRED( mi ) ) {
+       if ( META_BACK_TGT_SAVECRED( mt ) ) {
+               if ( !BER_BVISNULL( &msc->msc_cred ) ) {
+                       memset( msc->msc_cred.bv_val, 0,
+                               msc->msc_cred.bv_len );
+               }
                ber_bvreplace( &msc->msc_cred, &op->orb_cred );
                ldap_set_rebind_proc( msc->msc_ld, mt->mt_rebind_f, msc );
        }
@@ -462,79 +590,81 @@ meta_back_single_dobind(
        metatarget_t            *mt = mi->mi_targets[ candidate ];
        metaconn_t              *mc = *mcp;
        metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
-       int                     rc;
-       static struct berval    cred = BER_BVC( "" );
        int                     msgid;
 
        assert( !LDAP_BACK_CONN_ISBOUND( msc ) );
 
-       /*
-        * meta_back_single_dobind() calls meta_back_single_bind()
-        * if required.
-        */
-       if ( be_isroot( op ) && !BER_BVISNULL( &mt->mt_pseudorootdn ) )
+       /* NOTE: this obsoletes pseudorootdn */
+       if ( op->o_conn != NULL &&
+               !op->o_do_not_cache &&
+               ( BER_BVISNULL( &msc->msc_bound_ndn ) ||
+                       BER_BVISEMPTY( &msc->msc_bound_ndn ) ||
+                       ( LDAP_BACK_CONN_ISPRIV( mc ) && dn_match( &msc->msc_bound_ndn, &mt->mt_idassert_authcDN ) ) ||
+                       ( mt->mt_idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) ) )
        {
-               Operation       op2 = *op;
+               (void)meta_back_proxy_authz_bind( mc, candidate, op, rs, sendok, dolock );
 
-               op2.o_tag = LDAP_REQ_BIND;
-               op2.o_req_dn = mt->mt_pseudorootdn;
-               op2.o_req_ndn = mt->mt_pseudorootdn;
-               op2.orb_cred = mt->mt_pseudorootpw;
-               op2.orb_method = LDAP_AUTH_SIMPLE;
+       } else {
+               char *binddn = "";
+               struct berval cred = BER_BVC( "" );
+
+               /* use credentials if available */
+               if ( !BER_BVISNULL( &msc->msc_bound_ndn )
+                       && !BER_BVISNULL( &msc->msc_cred ) )
+               {
+                       binddn = msc->msc_bound_ndn.bv_val;
+                       cred = msc->msc_cred;
+               }
 
-               rc = meta_back_single_bind( &op2, rs, *mcp, candidate, 0 );
-               goto done;
-       }
+               /* FIXME: should we check if at least some of the op->o_ctrls
+                * can/should be passed? */
+               for (;;) {
+                       rs->sr_err = ldap_sasl_bind( msc->msc_ld,
+                               binddn, LDAP_SASL_SIMPLE, &cred,
+                               NULL, NULL, &msgid );
+                       if ( rs->sr_err != LDAP_X_CONNECTING ) {
+                               break;
+                       }
+                       ldap_pvt_thread_yield();
+               }
 
-       /*
-        * Otherwise an anonymous bind is performed
-        * (note: if the target was already bound, the anonymous
-        * bind clears the previous bind).
-        */
-       if ( !BER_BVISNULL( &msc->msc_bound_ndn ) ) {
-               ber_memfree( msc->msc_bound_ndn.bv_val );
-               BER_BVZERO( &msc->msc_bound_ndn );
-       }
-               
-       if ( LDAP_BACK_SAVECRED( mi ) && !BER_BVISNULL( &msc->msc_cred ) ) {
-               /* destroy sensitive data */
-               memset( msc->msc_cred.bv_val, 0, msc->msc_cred.bv_len );
-               ber_memfree( msc->msc_cred.bv_val );
-               BER_BVZERO( &msc->msc_cred );
-       }
+               rs->sr_err = meta_back_bind_op_result( op, rs, mc, candidate, msgid, sendok, dolock );
 
-       /* FIXME: should we check if at least some of the op->o_ctrls
-        * can/should be passed? */
-       rs->sr_err = ldap_sasl_bind( msc->msc_ld, "", LDAP_SASL_SIMPLE, &cred,
-                       NULL, NULL, &msgid );
-       rc = meta_back_bind_op_result( op, rs, mc, candidate, msgid, sendok );
+               /* if bind succeeded, but anonymous, clear msc_bound_ndn */
+               if ( rs->sr_err != LDAP_SUCCESS || binddn[0] == '\0' ) {
+                       if ( !BER_BVISNULL( &msc->msc_bound_ndn ) ) {
+                               ber_memfree( msc->msc_bound_ndn.bv_val );
+                               BER_BVZERO( &msc->msc_bound_ndn );
+                       }
 
-done:;
-       rs->sr_err = rc;
-       if ( rc != LDAP_SUCCESS ) {
+                       if ( !BER_BVISNULL( &msc->msc_cred ) ) {
+                               memset( msc->msc_cred.bv_val, 0, msc->msc_cred.bv_len );
+                               ber_memfree( msc->msc_cred.bv_val );
+                               BER_BVZERO( &msc->msc_cred );
+                       }
+               }
+       }
+
+       if ( rs->sr_err != LDAP_SUCCESS ) {
                if ( dolock ) {
                        ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
                }
-               LDAP_BACK_CONN_BINDING_CLEAR( msc );
+               LDAP_BACK_CONN_BINDING_CLEAR( msc );
                if ( META_BACK_ONERR_STOP( mi ) ) {
-                       LDAP_BACK_CONN_TAINTED_SET( mc );
-                       meta_back_release_conn_lock( op, mc, 0 );
+                       LDAP_BACK_CONN_TAINTED_SET( mc );
+                       meta_back_release_conn_lock( mi, mc, 0 );
                        *mcp = NULL;
                }
                if ( dolock ) {
                        ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
                }
-
-               if ( META_BACK_ONERR_STOP( mi ) && ( sendok & LDAP_BACK_SENDERR ) ) {
-                       send_ldap_result( op, rs );
-               }
        }
 
        if ( META_BACK_TGT_QUARANTINE( mt ) ) {
                meta_back_quarantine( op, rs, candidate );
        }
 
-       return rc;
+       return rs->sr_err;
 }
 
 /*
@@ -553,17 +683,21 @@ meta_back_dobind(
                                i,
                                isroot = 0;
 
-       SlapReply               *candidates = meta_back_candidates_get( op );
+       SlapReply               *candidates;
 
        if ( be_isroot( op ) ) {
                isroot = 1;
        }
 
-       Debug( LDAP_DEBUG_TRACE,
-               "%s meta_back_dobind: conn=%ld%s\n",
-               op->o_log_prefix,
-               LDAP_BACK_PCONN_ID( mc->mc_conn ),
-               isroot ? " (isroot)" : "" );
+       if ( LogTest( LDAP_DEBUG_TRACE ) ) {
+               char buf[STRLENOF("4294967295U") + 1] = { 0 };
+               mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) );
+
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s meta_back_dobind: conn=%s%s\n",
+                       op->o_log_prefix, buf,
+                       isroot ? " (isroot)" : "" );
+       }
 
        /*
         * all the targets are bound as pseudoroot
@@ -573,10 +707,12 @@ meta_back_dobind(
                goto done;
        }
 
+       candidates = meta_back_candidates_get( op );
+
        for ( i = 0; i < mi->mi_ntargets; i++ ) {
                metatarget_t            *mt = mi->mi_targets[ i ];
                metasingleconn_t        *msc = &mc->mc_conns[ i ];
-               int                     rc, do_retry = 1;
+               int                     rc;
 
                /*
                 * Not a candidate
@@ -593,12 +729,16 @@ meta_back_dobind(
 
 retry_binding:;
                ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
-               if ( LDAP_BACK_CONN_ISBOUND( msc ) || LDAP_BACK_CONN_ISANON( msc ) ) {
+               if ( LDAP_BACK_CONN_ISBOUND( msc )
+                       || ( LDAP_BACK_CONN_ISANON( msc )
+                               && mt->mt_idassert_authmethod == LDAP_AUTH_NONE ) )
+               {
                        ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
                        ++bound;
                        continue;
 
-               } else if ( LDAP_BACK_CONN_BINDING( msc ) ) {
+               } else if ( META_BACK_CONN_CREATING( msc ) || LDAP_BACK_CONN_BINDING( msc ) )
+               {
                        ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
                        ldap_pvt_thread_yield();
                        goto retry_binding;
@@ -608,7 +748,6 @@ retry_binding:;
                LDAP_BACK_CONN_BINDING_SET( msc );
                ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
 
-retry:;
                rc = meta_back_single_dobind( op, rs, &mc, i,
                        LDAP_BACK_DONTSEND, mt->mt_nretries, 1 );
                /*
@@ -625,15 +764,17 @@ retry:;
                        }
 
 
-                       if ( rc == LDAP_UNAVAILABLE && do_retry ) {
-                               do_retry = 0;
+                       if ( rc == LDAP_UNAVAILABLE ) {
+                               /* FIXME: meta_back_retry() already re-calls
+                                * meta_back_single_dobind() */
                                if ( meta_back_retry( op, rs, &mc, i, sendok ) ) {
-                                       goto retry;
+                                       goto retry_ok;
                                }
 
                                if ( mc != NULL ) {
                                        ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
                                        LDAP_BACK_CONN_BINDING_CLEAR( msc );
+                                       meta_back_release_conn_lock( mi, mc, 0 );
                                        ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
                                }
 
@@ -668,7 +809,8 @@ retry:;
 
                        continue;
                } /* else */
-               
+
+retry_ok:;
                Debug( LDAP_DEBUG_TRACE,
                        "%s meta_back_dobind[%d]: "
                        "(%s)\n",
@@ -687,12 +829,17 @@ retry:;
        }
 
 done:;
-       Debug( LDAP_DEBUG_TRACE,
-               "%s meta_back_dobind: conn=%ld bound=%d\n",
-               op->o_log_prefix, LDAP_BACK_PCONN_ID( mc->mc_conn ), bound );
+       if ( LogTest( LDAP_DEBUG_TRACE ) ) {
+               char buf[STRLENOF("4294967295U") + 1] = { 0 };
+               mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) );
+
+               Debug( LDAP_DEBUG_TRACE,
+                       "%s meta_back_dobind: conn=%s bound=%d\n",
+                       op->o_log_prefix, buf, bound );
+       }
 
        if ( bound == 0 ) {
-               meta_back_release_conn( op, mc );
+               meta_back_release_conn( mi, mc );
 
 send_err:;
                if ( sendok & LDAP_BACK_SENDERR ) {
@@ -780,23 +927,29 @@ meta_back_cancel(
        metatarget_t            *mt = mi->mi_targets[ candidate ];
        metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
 
+       int                     rc = LDAP_OTHER;
+
+       Debug( LDAP_DEBUG_TRACE, ">>> %s meta_back_cancel[%d] msgid=%d\n",
+               op->o_log_prefix, candidate, msgid );
+
        /* default behavior */
        if ( META_BACK_TGT_ABANDON( mt ) ) {
-               return ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
-       }
+               rc = ldap_abandon_ext( msc->msc_ld, msgid, NULL, NULL );
 
-       if ( META_BACK_TGT_IGNORE( mt ) ) {
-               return LDAP_SUCCESS;
-       }
+       } else if ( META_BACK_TGT_IGNORE( mt ) ) {
+               rc = ldap_pvt_discard( msc->msc_ld, msgid );
+
+       } else if ( META_BACK_TGT_CANCEL( mt ) ) {
+               rc = ldap_cancel_s( msc->msc_ld, msgid, NULL, NULL );
 
-       if ( META_BACK_TGT_CANCEL( mt ) ) {
-               /* FIXME: asynchronous? */
-               return ldap_cancel_s( msc->msc_ld, msgid, NULL, NULL );
+       } else {
+               assert( 0 );
        }
 
-       assert( 0 );
+       Debug( LDAP_DEBUG_TRACE, "<<< %s meta_back_cancel[%d] err=%d\n",
+               op->o_log_prefix, candidate, rc );
 
-       return LDAP_OTHER;
+       return rc;
 }
 
 
@@ -806,79 +959,205 @@ meta_back_cancel(
  */
 int
 meta_back_op_result(
-       metaconn_t      *mc,
-       Operation       *op,
-       SlapReply       *rs,
-       int             candidate )
+       metaconn_t              *mc,
+       Operation               *op,
+       SlapReply               *rs,
+       int                     candidate,
+       ber_int_t               msgid,
+       time_t                  timeout,
+       ldap_back_send_t        sendok )
 {
-       metainfo_t              *mi = ( metainfo_t * )op->o_bd->be_private;
+       metainfo_t      *mi = ( metainfo_t * )op->o_bd->be_private;
 
-       int                     i,
-                               rerr = LDAP_SUCCESS;
-       char                    *rmsg = NULL,
-                               *rmatch = NULL;
-       const char              *save_rmsg = NULL,
-                               *save_rmatch = NULL;
-       void                    *rmatch_ctx = NULL;
+       const char      *save_text = rs->sr_text,
+                       *save_matched = rs->sr_matched;
+       BerVarray       save_ref = rs->sr_ref;
+       LDAPControl     **save_ctrls = rs->sr_ctrls;
+       void            *matched_ctx = NULL;
+
+       char            *matched = NULL;
+       char            *text = NULL;
+       char            **refs = NULL;
+       LDAPControl     **ctrls = NULL;
 
        assert( mc != NULL );
 
+       rs->sr_text = NULL;
+       rs->sr_matched = NULL;
+       rs->sr_ref = NULL;
+       rs->sr_ctrls = NULL;
+
        if ( candidate != META_TARGET_NONE ) {
+               metatarget_t            *mt = mi->mi_targets[ candidate ];
                metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
 
-               rs->sr_err = LDAP_SUCCESS;
+               if ( LDAP_ERR_OK( rs->sr_err ) ) {
+                       int             rc;
+                       struct timeval  tv;
+                       LDAPMessage     *res = NULL;
+                       time_t          stoptime = (time_t)(-1);
+                       int             timeout_err = op->o_protocol >= LDAP_VERSION3 ?
+                                               LDAP_ADMINLIMIT_EXCEEDED : LDAP_OTHER;
+                       const char      *timeout_text = "Operation timed out";
 
-               ldap_get_option( msc->msc_ld, LDAP_OPT_ERROR_NUMBER, &rs->sr_err );
-               if ( rs->sr_err != LDAP_SUCCESS ) {
-                       /*
-                        * better check the type of error. In some cases
-                        * (search ?) it might be better to return a
-                        * success if at least one of the targets gave
-                        * positive result ...
-                        */
-                       ldap_get_option( msc->msc_ld,
-                                       LDAP_OPT_ERROR_STRING, &rmsg );
-                       if ( rmsg != NULL && rmsg[ 0 ] == '\0' ) {
-                               ldap_memfree( rmsg );
-                               rmsg = NULL;
+                       /* if timeout is not specified, compute and use
+                        * the one specific to the ongoing operation */
+                       if ( timeout == (time_t)(-1) ) {
+                               slap_op_t       opidx = slap_req2op( op->o_tag );
+
+                               if ( opidx == SLAP_OP_SEARCH ) {
+                                       if ( op->ors_tlimit <= 0 ) {
+                                               timeout = 0;
+
+                                       } else {
+                                               timeout = op->ors_tlimit;
+                                               timeout_err = LDAP_TIMELIMIT_EXCEEDED;
+                                               timeout_text = NULL;
+                                       }
+
+                               } else {
+                                       timeout = mt->mt_timeout[ opidx ];
+                               }
+                       }
+
+                       /* better than nothing :) */
+                       if ( timeout == 0 ) {
+                               if ( mi->mi_idle_timeout ) {
+                                       timeout = mi->mi_idle_timeout;
+
+                               } else if ( mi->mi_conn_ttl ) {
+                                       timeout = mi->mi_conn_ttl;
+                               }
                        }
 
-                       ldap_get_option( msc->msc_ld,
-                                       LDAP_OPT_MATCHED_DN, &rmatch );
-                       if ( rmatch != NULL && rmatch[ 0 ] == '\0' ) {
-                               ldap_memfree( rmatch );
-                               rmatch = NULL;
+                       if ( timeout ) {
+                               stoptime = op->o_time + timeout;
                        }
 
-                       rerr = rs->sr_err = slap_map_api2result( rs );
+                       LDAP_BACK_TV_SET( &tv );
+
+retry:;
+                       rc = ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res );
+                       switch ( rc ) {
+                       case 0:
+                               if ( timeout && slap_get_time() > stoptime ) {
+                                       (void)meta_back_cancel( mc, op, rs, msgid, candidate, sendok );
+                                       rs->sr_err = timeout_err;
+                                       rs->sr_text = timeout_text;
+                                       break;
+                               }
+
+                               LDAP_BACK_TV_SET( &tv );
+                               ldap_pvt_thread_yield();
+                               goto retry;
+
+                       case -1:
+                               ldap_get_option( msc->msc_ld, LDAP_OPT_RESULT_CODE,
+                                               &rs->sr_err );
+                               break;
+
+
+                       /* otherwise get the result; if it is not
+                        * LDAP_SUCCESS, record it in the reply
+                        * structure (this includes 
+                        * LDAP_COMPARE_{TRUE|FALSE}) */
+                       default:
+                               /* only touch when activity actually took place... */
+                               if ( mi->mi_idle_timeout != 0 && msc->msc_time < op->o_time ) {
+                                       msc->msc_time = op->o_time;
+                               }
+
+                               rc = ldap_parse_result( msc->msc_ld, res, &rs->sr_err,
+                                               &matched, &text, &refs, &ctrls, 1 );
+                               res = NULL;
+                               if ( rc == LDAP_SUCCESS ) {
+                                       rs->sr_text = text;
+                               } else {
+                                       rs->sr_err = rc;
+                               }
+                               rs->sr_err = slap_map_api2result( rs );
+
+                               /* RFC 4511: referrals can only appear
+                                * if result code is LDAP_REFERRAL */
+                               if ( refs != NULL
+                                       && refs[ 0 ] != NULL
+                                       && refs[ 0 ][ 0 ] != '\0' )
+                               {
+                                       if ( rs->sr_err != LDAP_REFERRAL ) {
+                                               Debug( LDAP_DEBUG_ANY,
+                                                       "%s meta_back_op_result[%d]: "
+                                                       "got referrals with err=%d\n",
+                                                       op->o_log_prefix,
+                                                       candidate, rs->sr_err );
+
+                                       } else {
+                                               int     i;
+       
+                                               for ( i = 0; refs[ i ] != NULL; i++ )
+                                                       /* count */ ;
+                                               rs->sr_ref = op->o_tmpalloc( sizeof( struct berval ) * ( i + 1 ),
+                                                       op->o_tmpmemctx );
+                                               for ( i = 0; refs[ i ] != NULL; i++ ) {
+                                                       ber_str2bv( refs[ i ], 0, 0, &rs->sr_ref[ i ] );
+                                               }
+                                               BER_BVZERO( &rs->sr_ref[ i ] );
+                                       }
+
+                               } else if ( rs->sr_err == LDAP_REFERRAL ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "%s meta_back_op_result[%d]: "
+                                               "got err=%d with null "
+                                               "or empty referrals\n",
+                                               op->o_log_prefix,
+                                               candidate, rs->sr_err );
+
+                                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
+                               }
+
+                               if ( ctrls != NULL ) {
+                                       rs->sr_ctrls = ctrls;
+                               }
+                       }
+
+                       assert( res == NULL );
+               }
+
+               /* if the error in the reply structure is not
+                * LDAP_SUCCESS, try to map it from client 
+                * to server error */
+               if ( !LDAP_ERR_OK( rs->sr_err ) ) {
+                       rs->sr_err = slap_map_api2result( rs );
 
-                       if ( LogTest( LDAP_DEBUG_ANY ) ) {
-                               char    buf[ SLAP_TEXT_BUFLEN ];
+                       /* internal ops ( op->o_conn == NULL ) 
+                        * must not reply to client */
+                       if ( op->o_conn && !op->o_do_not_cache && matched ) {
 
-                               snprintf( buf, sizeof( buf ),
-                                       "meta_back_op_result[%d] "
-                                       "err=%d text=\"%s\" matched=\"%s\"", 
-                                       candidate, rs->sr_err,
-                                       ( rmsg ? rmsg : "" ),
-                                       ( rmatch ? rmatch : "" ) );
-                               Debug( LDAP_DEBUG_ANY, "%s %s.\n",
-                                       op->o_log_prefix, buf, 0 );
+                               /* record the (massaged) matched
+                                * DN into the reply structure */
+                               rs->sr_matched = matched;
                        }
                }
 
-               if ( META_BACK_TGT_QUARANTINE( mi->mi_targets[ candidate ] ) ) {
+               if ( META_BACK_TGT_QUARANTINE( mt ) ) {
                        meta_back_quarantine( op, rs, candidate );
                }
 
        } else {
+               int     i,
+                       err = rs->sr_err;
+
                for ( i = 0; i < mi->mi_ntargets; i++ ) {
                        metasingleconn_t        *msc = &mc->mc_conns[ i ];
-                       char                    *msg = NULL;
-                       char                    *match = NULL;
+                       char                    *xtext = NULL;
+                       char                    *xmatched = NULL;
+
+                       if ( msc->msc_ld == NULL ) {
+                               continue;
+                       }
 
                        rs->sr_err = LDAP_SUCCESS;
 
-                       ldap_get_option( msc->msc_ld, LDAP_OPT_ERROR_NUMBER, &rs->sr_err );
+                       ldap_get_option( msc->msc_ld, LDAP_OPT_RESULT_CODE, &rs->sr_err );
                        if ( rs->sr_err != LDAP_SUCCESS ) {
                                /*
                                 * better check the type of error. In some cases
@@ -887,17 +1166,17 @@ meta_back_op_result(
                                 * positive result ...
                                 */
                                ldap_get_option( msc->msc_ld,
-                                               LDAP_OPT_ERROR_STRING, &msg );
-                               if ( msg != NULL && msg[ 0 ] == '\0' ) {
-                                       ldap_memfree( msg );
-                                       msg = NULL;
+                                               LDAP_OPT_DIAGNOSTIC_MESSAGE, &xtext );
+                               if ( xtext != NULL && xtext [ 0 ] == '\0' ) {
+                                       ldap_memfree( xtext );
+                                       xtext = NULL;
                                }
 
                                ldap_get_option( msc->msc_ld,
-                                               LDAP_OPT_MATCHED_DN, &match );
-                               if ( match != NULL && match[ 0 ] == '\0' ) {
-                                       ldap_memfree( match );
-                                       match = NULL;
+                                               LDAP_OPT_MATCHED_DN, &xmatched );
+                               if ( xmatched != NULL && xmatched[ 0 ] == '\0' ) {
+                                       ldap_memfree( xmatched );
+                                       xmatched = NULL;
                                }
 
                                rs->sr_err = slap_map_api2result( rs );
@@ -909,41 +1188,41 @@ meta_back_op_result(
                                                "meta_back_op_result[%d] "
                                                "err=%d text=\"%s\" matched=\"%s\"", 
                                                i, rs->sr_err,
-                                               ( rmsg ? rmsg : "" ),
-                                               ( rmatch ? rmatch : "" ) );
+                                               ( xtext ? xtext : "" ),
+                                               ( xmatched ? xmatched : "" ) );
                                        Debug( LDAP_DEBUG_ANY, "%s %s.\n",
                                                op->o_log_prefix, buf, 0 );
                                }
-       
+
                                /*
                                 * FIXME: need to rewrite "match" (need rwinfo)
                                 */
                                switch ( rs->sr_err ) {
                                default:
-                                       rerr = rs->sr_err;
-                                       if ( msg != NULL ) {
-                                               if ( rmsg ) {
-                                                       ldap_memfree( rmsg );
+                                       err = rs->sr_err;
+                                       if ( xtext != NULL ) {
+                                               if ( text ) {
+                                                       ldap_memfree( text );
                                                }
-                                               rmsg = msg;
-                                               msg = NULL;
+                                               text = xtext;
+                                               xtext = NULL;
                                        }
-                                       if ( match != NULL ) {
-                                               if ( rmatch ) {
-                                                       ldap_memfree( rmatch );
+                                       if ( xmatched != NULL ) {
+                                               if ( matched ) {
+                                                       ldap_memfree( matched );
                                                }
-                                               rmatch = match;
-                                               match = NULL;
+                                               matched = xmatched;
+                                               xmatched = NULL;
                                        }
                                        break;
                                }
 
-                               if ( msg ) {
-                                       ldap_memfree( msg );
+                               if ( xtext ) {
+                                       ldap_memfree( xtext );
                                }
        
-                               if ( match ) {
-                                       ldap_memfree( match );
+                               if ( xmatched ) {
+                                       ldap_memfree( xmatched );
                                }
                        }
 
@@ -951,35 +1230,524 @@ meta_back_op_result(
                                meta_back_quarantine( op, rs, i );
                        }
                }
+
+               if ( err != LDAP_SUCCESS ) {
+                       rs->sr_err = err;
+               }
        }
-       
-       rs->sr_err = rerr;
-       if ( rmsg != NULL ) {
-               save_rmsg = rs->sr_text;
-               rs->sr_text = rmsg;
-       }
-       if ( rmatch != NULL ) {
+
+       if ( matched != NULL ) {
                struct berval   dn, pdn;
 
-               ber_str2bv( rmatch, 0, 0, &dn );
+               ber_str2bv( matched, 0, 0, &dn );
                if ( dnPretty( NULL, &dn, &pdn, op->o_tmpmemctx ) == LDAP_SUCCESS ) {
-                       ldap_memfree( rmatch );
-                       rmatch_ctx = op->o_tmpmemctx;
-                       rmatch = pdn.bv_val;
+                       ldap_memfree( matched );
+                       matched_ctx = op->o_tmpmemctx;
+                       matched = pdn.bv_val;
+               }
+               rs->sr_matched = matched;
+       }
+
+       if ( rs->sr_err == LDAP_UNAVAILABLE ) {
+               if ( !( sendok & LDAP_BACK_RETRYING ) ) {
+                       if ( op->o_conn && ( sendok & LDAP_BACK_SENDERR ) ) {
+                               if ( rs->sr_text == NULL ) rs->sr_text = "Proxy operation retry failed";
+                               send_ldap_result( op, rs );
+                       }
+               }
+
+       } else if ( op->o_conn &&
+               ( ( ( sendok & LDAP_BACK_SENDOK ) && LDAP_ERR_OK( rs->sr_err ) )
+                       || ( ( sendok & LDAP_BACK_SENDERR ) && !LDAP_ERR_OK( rs->sr_err ) ) ) )
+       {
+               send_ldap_result( op, rs );
+       }
+       if ( matched ) {
+               op->o_tmpfree( (char *)rs->sr_matched, matched_ctx );
+       }
+       if ( text ) {
+               ldap_memfree( text );
+       }
+       if ( rs->sr_ref ) {
+               op->o_tmpfree( rs->sr_ref, op->o_tmpmemctx );
+               rs->sr_ref = NULL;
+       }
+       if ( refs ) {
+               ber_memvfree( (void **)refs );
+       }
+       if ( ctrls ) {
+               assert( rs->sr_ctrls != NULL );
+               ldap_controls_free( ctrls );
+       }
+
+       rs->sr_text = save_text;
+       rs->sr_matched = save_matched;
+       rs->sr_ref = save_ref;
+       rs->sr_ctrls = save_ctrls;
+
+       return( LDAP_ERR_OK( rs->sr_err ) ? LDAP_SUCCESS : rs->sr_err );
+}
+
+/*
+ * meta_back_proxy_authz_cred()
+ *
+ * prepares credentials & method for meta_back_proxy_authz_bind();
+ * or, if method is SASL, performs the SASL bind directly.
+ */
+int
+meta_back_proxy_authz_cred(
+       metaconn_t              *mc,
+       int                     candidate,
+       Operation               *op,
+       SlapReply               *rs,
+       ldap_back_send_t        sendok,
+       struct berval           *binddn,
+       struct berval           *bindcred,
+       int                     *method )
+{
+       metainfo_t              *mi = (metainfo_t *)op->o_bd->be_private;
+       metatarget_t            *mt = mi->mi_targets[ candidate ];
+       metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
+       struct berval           ndn;
+       int                     dobind = 0;
+
+       /* don't proxyAuthz if protocol is not LDAPv3 */
+       switch ( mt->mt_version ) {
+       case LDAP_VERSION3:
+               break;
+
+       case 0:
+               if ( op->o_protocol == 0 || op->o_protocol == LDAP_VERSION3 ) {
+                       break;
+               }
+               /* fall thru */
+
+       default:
+               rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+               if ( sendok & LDAP_BACK_SENDERR ) {
+                       send_ldap_result( op, rs );
+               }
+               LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+               goto done;
+       }
+
+       if ( op->o_tag == LDAP_REQ_BIND ) {
+               ndn = op->o_req_ndn;
+
+       } else if ( !BER_BVISNULL( &op->o_conn->c_ndn ) ) {
+               ndn = op->o_conn->c_ndn;
+
+       } else {
+               ndn = op->o_ndn;
+       }
+       rs->sr_err = LDAP_SUCCESS;
+
+       /*
+        * FIXME: we need to let clients use proxyAuthz
+        * otherwise we cannot do symmetric pools of servers;
+        * we have to live with the fact that a user can
+        * authorize itself as any ID that is allowed
+        * by the authzTo directive of the "proxyauthzdn".
+        */
+       /*
+        * NOTE: current Proxy Authorization specification
+        * and implementation do not allow proxy authorization
+        * control to be provided with Bind requests
+        */
+       /*
+        * if no bind took place yet, but the connection is bound
+        * and the "proxyauthzdn" is set, then bind as 
+        * "proxyauthzdn" and explicitly add the proxyAuthz 
+        * control to every operation with the dn bound 
+        * to the connection as control value.
+        */
+
+       /* bind as proxyauthzdn only if no idassert mode
+        * is requested, or if the client's identity
+        * is authorized */
+       switch ( mt->mt_idassert_mode ) {
+       case LDAP_BACK_IDASSERT_LEGACY:
+               if ( !BER_BVISNULL( &ndn ) && !BER_BVISEMPTY( &ndn ) ) {
+                       if ( !BER_BVISNULL( &mt->mt_idassert_authcDN ) && !BER_BVISEMPTY( &mt->mt_idassert_authcDN ) )
+                       {
+                               *binddn = mt->mt_idassert_authcDN;
+                               *bindcred = mt->mt_idassert_passwd;
+                               dobind = 1;
+                       }
+               }
+               break;
+
+       default:
+               /* NOTE: rootdn can always idassert */
+               if ( BER_BVISNULL( &ndn )
+                       && mt->mt_idassert_authz == NULL
+                       && !( mt->mt_idassert_flags & LDAP_BACK_AUTH_AUTHZ_ALL ) )
+               {
+                       if ( mt->mt_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) {
+                               rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
+                               if ( sendok & LDAP_BACK_SENDERR ) {
+                                       send_ldap_result( op, rs );
+                               }
+                               LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+                               goto done;
+
+                       }
+
+                       rs->sr_err = LDAP_SUCCESS;
+                       *binddn = slap_empty_bv;
+                       *bindcred = slap_empty_bv;
+                       break;
+
+               } else if ( mt->mt_idassert_authz && !be_isroot( op ) ) {
+                       struct berval authcDN;
+
+                       if ( BER_BVISNULL( &ndn ) ) {
+                               authcDN = slap_empty_bv;
+
+                       } else {
+                               authcDN = ndn;
+                       }       
+                       rs->sr_err = slap_sasl_matches( op, mt->mt_idassert_authz,
+                                       &authcDN, &authcDN );
+                       if ( rs->sr_err != LDAP_SUCCESS ) {
+                               if ( mt->mt_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) {
+                                       if ( sendok & LDAP_BACK_SENDERR ) {
+                                               send_ldap_result( op, rs );
+                                       }
+                                       LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+                                       goto done;
+                               }
+
+                               rs->sr_err = LDAP_SUCCESS;
+                               *binddn = slap_empty_bv;
+                               *bindcred = slap_empty_bv;
+                               break;
+                       }
+               }
+
+               *binddn = mt->mt_idassert_authcDN;
+               *bindcred = mt->mt_idassert_passwd;
+               dobind = 1;
+               break;
+       }
+
+       if ( dobind && mt->mt_idassert_authmethod == LDAP_AUTH_SASL ) {
+#ifdef HAVE_CYRUS_SASL
+               void            *defaults = NULL;
+               struct berval   authzID = BER_BVNULL;
+               int             freeauthz = 0;
+
+               /* if SASL supports native authz, prepare for it */
+               if ( ( !op->o_do_not_cache || !op->o_is_auth_check ) &&
+                               ( mt->mt_idassert_flags & LDAP_BACK_AUTH_NATIVE_AUTHZ ) )
+               {
+                       switch ( mt->mt_idassert_mode ) {
+                       case LDAP_BACK_IDASSERT_OTHERID:
+                       case LDAP_BACK_IDASSERT_OTHERDN:
+                               authzID = mt->mt_idassert_authzID;
+                               break;
+
+                       case LDAP_BACK_IDASSERT_ANONYMOUS:
+                               BER_BVSTR( &authzID, "dn:" );
+                               break;
+
+                       case LDAP_BACK_IDASSERT_SELF:
+                               if ( BER_BVISNULL( &ndn ) ) {
+                                       /* connection is not authc'd, so don't idassert */
+                                       BER_BVSTR( &authzID, "dn:" );
+                                       break;
+                               }
+                               authzID.bv_len = STRLENOF( "dn:" ) + ndn.bv_len;
+                               authzID.bv_val = slap_sl_malloc( authzID.bv_len + 1, op->o_tmpmemctx );
+                               AC_MEMCPY( authzID.bv_val, "dn:", STRLENOF( "dn:" ) );
+                               AC_MEMCPY( authzID.bv_val + STRLENOF( "dn:" ),
+                                               ndn.bv_val, ndn.bv_len + 1 );
+                               freeauthz = 1;
+                               break;
+
+                       default:
+                               break;
+                       }
+               }
+
+               if ( mt->mt_idassert_secprops != NULL ) {
+                       rs->sr_err = ldap_set_option( msc->msc_ld,
+                               LDAP_OPT_X_SASL_SECPROPS,
+                               (void *)mt->mt_idassert_secprops );
+
+                       if ( rs->sr_err != LDAP_OPT_SUCCESS ) {
+                               rs->sr_err = LDAP_OTHER;
+                               if ( sendok & LDAP_BACK_SENDERR ) {
+                                       send_ldap_result( op, rs );
+                               }
+                               LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+                               goto done;
+                       }
+               }
+
+               defaults = lutil_sasl_defaults( msc->msc_ld,
+                               mt->mt_idassert_sasl_mech.bv_val,
+                               mt->mt_idassert_sasl_realm.bv_val,
+                               mt->mt_idassert_authcID.bv_val,
+                               mt->mt_idassert_passwd.bv_val,
+                               authzID.bv_val );
+               if ( defaults == NULL ) {
+                       rs->sr_err = LDAP_OTHER;
+                       LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+                       if ( sendok & LDAP_BACK_SENDERR ) {
+                               send_ldap_result( op, rs );
+                       }
+                       goto done;
+               }
+
+               rs->sr_err = ldap_sasl_interactive_bind_s( msc->msc_ld, binddn->bv_val,
+                               mt->mt_idassert_sasl_mech.bv_val, NULL, NULL,
+                               LDAP_SASL_QUIET, lutil_sasl_interact,
+                               defaults );
+
+               rs->sr_err = slap_map_api2result( rs );
+               if ( rs->sr_err != LDAP_SUCCESS ) {
+                       LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+                       if ( sendok & LDAP_BACK_SENDERR ) {
+                               send_ldap_result( op, rs );
+                       }
+
+               } else {
+                       LDAP_BACK_CONN_ISBOUND_SET( msc );
+               }
+
+               lutil_sasl_freedefs( defaults );
+               if ( freeauthz ) {
+                       slap_sl_free( authzID.bv_val, op->o_tmpmemctx );
+               }
+
+               goto done;
+#endif /* HAVE_CYRUS_SASL */
+       }
+
+       *method = mt->mt_idassert_authmethod;
+       switch ( mt->mt_idassert_authmethod ) {
+       case LDAP_AUTH_NONE:
+               BER_BVSTR( binddn, "" );
+               BER_BVSTR( bindcred, "" );
+               /* fallthru */
+
+       case LDAP_AUTH_SIMPLE:
+               break;
+
+       default:
+               /* unsupported! */
+               LDAP_BACK_CONN_ISBOUND_CLEAR( msc );
+               rs->sr_err = LDAP_AUTH_METHOD_NOT_SUPPORTED;
+               if ( sendok & LDAP_BACK_SENDERR ) {
+                       send_ldap_result( op, rs );
                }
-               save_rmatch = rs->sr_matched;
-               rs->sr_matched = rmatch;
+               break;
        }
-       send_ldap_result( op, rs );
-       if ( rmsg != NULL ) {
-               ber_memfree( rmsg );
-               rs->sr_text = save_rmsg;
+
+done:;
+
+       if ( !BER_BVISEMPTY( binddn ) ) {
+               LDAP_BACK_CONN_ISIDASSERT_SET( msc );
        }
-       if ( rmatch != NULL ) {
-               ber_memfree_x( rmatch, rmatch_ctx );
-               rs->sr_matched = save_rmatch;
+
+       return rs->sr_err;
+}
+
+static int
+meta_back_proxy_authz_bind(
+       metaconn_t *mc,
+       int candidate,
+       Operation *op,
+       SlapReply *rs,
+       ldap_back_send_t sendok,
+       int dolock )
+{
+       metainfo_t              *mi = (metainfo_t *)op->o_bd->be_private;
+       metatarget_t            *mt = mi->mi_targets[ candidate ];
+       metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
+       struct berval           binddn = BER_BVC( "" ),
+                               cred = BER_BVC( "" );
+       int                     method = LDAP_AUTH_NONE,
+                               rc;
+
+       rc = meta_back_proxy_authz_cred( mc, candidate, op, rs, sendok, &binddn, &cred, &method );
+       if ( rc == LDAP_SUCCESS && !LDAP_BACK_CONN_ISBOUND( msc ) ) {
+               int     msgid;
+
+               switch ( method ) {
+               case LDAP_AUTH_NONE:
+               case LDAP_AUTH_SIMPLE:
+                       for (;;) {
+                               rs->sr_err = ldap_sasl_bind( msc->msc_ld,
+                                       binddn.bv_val, LDAP_SASL_SIMPLE,
+                                       &cred, NULL, NULL, &msgid );
+                               if ( rs->sr_err != LDAP_X_CONNECTING ) {
+                                       break;
+                               }
+                               ldap_pvt_thread_yield();
+                       }
+                       rc = meta_back_bind_op_result( op, rs, mc, candidate, msgid, sendok, dolock );
+                       if ( rc == LDAP_SUCCESS ) {
+                               /* set rebind stuff in case of successful proxyAuthz bind,
+                                * so that referral chasing is attempted using the right
+                                * identity */
+                               LDAP_BACK_CONN_ISBOUND_SET( msc );
+                               ber_bvreplace( &msc->msc_bound_ndn, &binddn );
+
+                               if ( META_BACK_TGT_SAVECRED( mt ) ) {
+                                       if ( !BER_BVISNULL( &msc->msc_cred ) ) {
+                                               memset( msc->msc_cred.bv_val, 0,
+                                                       msc->msc_cred.bv_len );
+                                       }
+                                       ber_bvreplace( &msc->msc_cred, &cred );
+                                       ldap_set_rebind_proc( msc->msc_ld, mt->mt_rebind_f, msc );
+                               }
+                       }
+                       break;
+
+               default:
+                       assert( 0 );
+                       break;
+               }
        }
 
-       return ( ( rerr == LDAP_SUCCESS ) ? 0 : -1 );
+       return LDAP_BACK_CONN_ISBOUND( msc );
+}
+
+/*
+ * Add controls;
+ *
+ * if any needs to be added, it is prepended to existing ones,
+ * in a newly allocated array.  The companion function
+ * mi->mi_ldap_extra->controls_free() must be used to restore the original
+ * status of op->o_ctrls.
+ */
+int
+meta_back_controls_add(
+               Operation       *op,
+               SlapReply       *rs,
+               metaconn_t      *mc,
+               int             candidate,
+               LDAPControl     ***pctrls )
+{
+       metainfo_t              *mi = (metainfo_t *)op->o_bd->be_private;
+       metatarget_t            *mt = mi->mi_targets[ candidate ];
+       metasingleconn_t        *msc = &mc->mc_conns[ candidate ];
+
+       LDAPControl             **ctrls = NULL;
+       /* set to the maximum number of controls this backend can add */
+       LDAPControl             c[ 2 ] = {{ 0 }};
+       int                     n = 0, i, j1 = 0, j2 = 0;
+
+       *pctrls = NULL;
+
+       rs->sr_err = LDAP_SUCCESS;
+
+       /* don't add controls if protocol is not LDAPv3 */
+       switch ( mt->mt_version ) {
+       case LDAP_VERSION3:
+               break;
+
+       case 0:
+               if ( op->o_protocol == 0 || op->o_protocol == LDAP_VERSION3 ) {
+                       break;
+               }
+               /* fall thru */
+
+       default:
+               goto done;
+       }
+
+       /* put controls that go __before__ existing ones here */
+
+       /* proxyAuthz for identity assertion */
+       switch ( mi->mi_ldap_extra->proxy_authz_ctrl( op, rs, &msc->msc_bound_ndn,
+               mt->mt_version, &mt->mt_idassert, &c[ j1 ] ) )
+       {
+       case SLAP_CB_CONTINUE:
+               break;
+
+       case LDAP_SUCCESS:
+               j1++;
+               break;
+
+       default:
+               goto done;
+       }
+
+       /* put controls that go __after__ existing ones here */
+
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+       /* session tracking */
+       if ( META_BACK_TGT_ST_REQUEST( mt ) ) {
+               switch ( slap_ctrl_session_tracking_request_add( op, rs, &c[ j1 + j2 ] ) ) {
+               case SLAP_CB_CONTINUE:
+                       break;
+
+               case LDAP_SUCCESS:
+                       j2++;
+                       break;
+
+               default:
+                       goto done;
+               }
+       }
+#endif /* SLAP_CONTROL_X_SESSION_TRACKING */
+
+       if ( rs->sr_err == SLAP_CB_CONTINUE ) {
+               rs->sr_err = LDAP_SUCCESS;
+       }
+
+       /* if nothing to do, just bail out */
+       if ( j1 == 0 && j2 == 0 ) {
+               goto done;
+       }
+
+       assert( j1 + j2 <= (int) (sizeof( c )/sizeof( c[0] )) );
+
+       if ( op->o_ctrls ) {
+               for ( n = 0; op->o_ctrls[ n ]; n++ )
+                       /* just count ctrls */ ;
+       }
+
+       ctrls = op->o_tmpalloc( (n + j1 + j2 + 1) * sizeof( LDAPControl * ) + ( j1 + j2 ) * sizeof( LDAPControl ),
+                       op->o_tmpmemctx );
+       if ( j1 ) {
+               ctrls[ 0 ] = (LDAPControl *)&ctrls[ n + j1 + j2 + 1 ];
+               *ctrls[ 0 ] = c[ 0 ];
+               for ( i = 1; i < j1; i++ ) {
+                       ctrls[ i ] = &ctrls[ 0 ][ i ];
+                       *ctrls[ i ] = c[ i ];
+               }
+       }
+
+       i = 0;
+       if ( op->o_ctrls ) {
+               for ( i = 0; op->o_ctrls[ i ]; i++ ) {
+                       ctrls[ i + j1 ] = op->o_ctrls[ i ];
+               }
+       }
+
+       n += j1;
+       if ( j2 ) {
+               ctrls[ n ] = (LDAPControl *)&ctrls[ n + j2 + 1 ] + j1;
+               *ctrls[ n ] = c[ j1 ];
+               for ( i = 1; i < j2; i++ ) {
+                       ctrls[ n + i ] = &ctrls[ n ][ i ];
+                       *ctrls[ n + i ] = c[ i ];
+               }
+       }
+
+       ctrls[ n + j2 ] = NULL;
+
+done:;
+       if ( ctrls == NULL ) {
+               ctrls = op->o_ctrls;
+       }
+
+       *pctrls = ctrls;
+       
+       return rs->sr_err;
 }