]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldap/bind.c
ITS#4115 fixes for back-meta/ldap
[openldap] / servers / slapd / back-ldap / bind.c
index 015660a7d690433de226cb1aabfff6e7ff8e21ed..ac5cef995d92b8d15b342df4ae17846d7e1180ac 100644 (file)
 /* bind.c - ldap backend bind function */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* This is an altered version */
-/*
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
+ * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Portions Copyright 2000-2003 Pierangelo Masarati.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * All rights reserved.
  *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- * 
- * This software is being modified by Pierangelo Masarati.
- * The previously reported conditions apply to the modified code as well.
- * Changes in the original code are highlighted where required.
- * Credits for the original code go to the author, Howard Chu.
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.h"
 
 #include <stdio.h>
 
+#include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
-
 #define AVL_INTERNAL
 #include "slap.h"
 #include "back-ldap.h"
 
+#include <lutil_ldap.h>
+
 #define PRINT_CONNTREE 0
 
-static LDAP_REBIND_PROC        ldap_back_rebind;
+static LDAP_REBIND_PROC        ldap_back_default_rebind;
+
+LDAP_REBIND_PROC       *ldap_back_rebind_f = ldap_back_default_rebind;
+
+static int
+ldap_back_proxy_authz_bind( ldapconn_t *lc, Operation *op, SlapReply *rs );
+
+static int
+ldap_back_prepare_conn( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok );
 
 int
-ldap_back_bind(
-    Operation          *op,
-    SlapReply          *rs )
+ldap_back_bind( Operation *op, SlapReply *rs )
 {
-       struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
-       struct ldapconn *lc;
+       ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
+       ldapconn_t      *lc;
 
-       struct berval mdn = { 0, NULL };
        int rc = 0;
        ber_int_t msgid;
-       dncookie dc;
 
-       lc = ldap_back_getconn(op, rs);
+       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
        if ( !lc ) {
-               return( -1 );
+               return rs->sr_err;
        }
 
-       /*
-        * Rewrite the bind dn if needed
-        */
-       dc.rwmap = &li->rwmap;
-#ifdef ENABLE_REWRITE
-       dc.conn = op->o_conn;
-       dc.rs = rs;
-       dc.ctx = "bindDn";
-#else
-       dc.tofrom = 1;
-       dc.normalized = 0;
-#endif
-       if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
-               send_ldap_result( op, rs );
-               return -1;
+       if ( !BER_BVISNULL( &lc->lc_bound_ndn ) ) {
+               ch_free( lc->lc_bound_ndn.bv_val );
+               BER_BVZERO( &lc->lc_bound_ndn );
        }
+       LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
 
-       if ( lc->bound_dn.bv_val ) {
-               ch_free( lc->bound_dn.bv_val );
-               lc->bound_dn.bv_len = 0;
-               lc->bound_dn.bv_val = NULL;
-       }
-       lc->bound = 0;
        /* method is always LDAP_AUTH_SIMPLE if we got here */
-       rs->sr_err = ldap_sasl_bind(lc->ld, mdn.bv_val, LDAP_SASL_SIMPLE,
-               &op->oq_bind.rb_cred, op->o_ctrls, NULL, &msgid);
-       rc = ldap_back_op_result( lc, op, rs, msgid, 1 );
-       if (rc == LDAP_SUCCESS) {
-               lc->bound = 1;
-               if ( mdn.bv_val != op->o_req_dn.bv_val ) {
-                       lc->bound_dn = mdn;
-               } else {
-                       ber_dupbv( &lc->bound_dn, &op->o_req_dn );
+       rs->sr_err = ldap_sasl_bind( lc->lc_ld, op->o_req_dn.bv_val,
+                       LDAP_SASL_SIMPLE,
+                       &op->orb_cred, op->o_ctrls, NULL, &msgid );
+       rc = ldap_back_op_result( lc, op, rs, msgid, 0, LDAP_BACK_SENDERR );
+
+       if ( rc == LDAP_SUCCESS ) {
+               /* 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 ( li->li_idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) {
+                       ldap_back_proxy_authz_bind( lc, op, rs );
+                       if ( !LDAP_BACK_CONN_ISBOUND( lc ) ) {
+                               rc = 1;
+                               goto done;
+                       }
                }
-               mdn.bv_val = NULL;
 
-               if ( li->savecred ) {
-                       if ( lc->cred.bv_val ) {
-                               memset( lc->cred.bv_val, 0, lc->cred.bv_len );
-                               ch_free( lc->cred.bv_val );
+               LDAP_BACK_CONN_ISBOUND_SET( lc );
+               ber_dupbv( &lc->lc_bound_ndn, &op->o_req_ndn );
+
+               if ( LDAP_BACK_SAVECRED( li ) ) {
+                       if ( !BER_BVISNULL( &lc->lc_cred ) ) {
+                               memset( lc->lc_cred.bv_val, 0,
+                                               lc->lc_cred.bv_len );
                        }
-                       ber_dupbv( &lc->cred, &op->oq_bind.rb_cred );
-                       ldap_set_rebind_proc( lc->ld, ldap_back_rebind, lc );
+                       ber_bvreplace( &lc->lc_cred, &op->orb_cred );
+                       ldap_set_rebind_proc( lc->lc_ld, ldap_back_rebind_f, lc );
                }
        }
+done:;
 
        /* must re-insert if local DN changed as result of bind */
-       if ( lc->bound && !bvmatch(&op->o_req_ndn, &lc->local_dn ) ) {
-               int lerr;
+       if ( LDAP_BACK_CONN_ISBOUND( lc )
+               && !dn_match( &op->o_req_ndn, &lc->lc_local_ndn ) )
+       {
+               int             lerr;
+
+               /* wait for all other ops to release the connection */
+retry_lock:;
+               ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+               if ( lc->lc_refcnt > 1 ) {
+                       ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+                       ldap_pvt_thread_yield();
+                       goto retry_lock;
+               }
 
-               ldap_pvt_thread_mutex_lock( &li->conn_mutex );
-               lc = avl_delete( &li->conntree, (caddr_t)lc,
+               assert( lc->lc_refcnt == 1 );
+               lc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)lc,
                                ldap_back_conn_cmp );
-               if ( lc->local_dn.bv_val )
-                       ch_free( lc->local_dn.bv_val );
-               ber_dupbv( &lc->local_dn, &op->o_req_ndn );
-               lerr = avl_insert( &li->conntree, (caddr_t)lc,
+               assert( lc != NULL );
+
+               ber_bvreplace( &lc->lc_local_ndn, &op->o_req_ndn );
+               lerr = avl_insert( &li->li_conninfo.lai_tree, (caddr_t)lc,
                        ldap_back_conn_cmp, ldap_back_conn_dup );
-               ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
+               ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
                if ( lerr == -1 ) {
+                       /* we can do this because lc_refcnt == 1 */
                        ldap_back_conn_free( lc );
+                       lc = NULL;
                }
        }
 
-       if ( mdn.bv_val && mdn.bv_val != op->o_req_dn.bv_val ) {
-               free( mdn.bv_val );
+       if ( lc != NULL ) {
+               ldap_back_release_conn( op, rs, lc );
        }
 
        return( rc );
@@ -143,383 +142,783 @@ ldap_back_bind(
 /*
  * ldap_back_conn_cmp
  *
- * compares two struct ldapconn based on the value of the conn pointer;
+ * compares two ldapconn_t based on the value of the conn pointer;
  * used by avl stuff
  */
 int
-ldap_back_conn_cmp(
-       const void *c1,
-       const void *c2
-       )
+ldap_back_conn_cmp( const void *c1, const void *c2 )
 {
-       const struct ldapconn *lc1 = (const struct ldapconn *)c1;
-       const struct ldapconn *lc2 = (const struct ldapconn *)c2;
+       const ldapconn_t        *lc1 = (const ldapconn_t *)c1;
+       const ldapconn_t        *lc2 = (const ldapconn_t *)c2;
        int rc;
-       
+
        /* If local DNs don't match, it is definitely not a match */
-       if ( ( rc = ber_bvcmp( &lc1->local_dn, &lc2->local_dn )) )
+       rc = ber_bvcmp( &lc1->lc_local_ndn, &lc2->lc_local_ndn );
+       if ( rc ) {
                return rc;
+       }
 
        /* For shared sessions, conn is NULL. Only explicitly
         * bound sessions will have non-NULL conn.
         */
-       return SLAP_PTRCMP(lc1->conn, lc2->conn);
+       return SLAP_PTRCMP( lc1->lc_conn, lc2->lc_conn );
 }
 
 /*
  * ldap_back_conn_dup
  *
- * returns -1 in case a duplicate struct ldapconn has been inserted;
+ * returns -1 in case a duplicate ldapconn_t has been inserted;
  * used by avl stuff
  */
 int
-ldap_back_conn_dup(
-       void *c1,
-       void *c2
-       )
+ldap_back_conn_dup( void *c1, void *c2 )
 {
-       struct ldapconn *lc1 = (struct ldapconn *)c1;
-       struct ldapconn *lc2 = (struct ldapconn *)c2;
+       ldapconn_t      *lc1 = (ldapconn_t *)c1;
+       ldapconn_t      *lc2 = (ldapconn_t *)c2;
 
        /* Cannot have more than one shared session with same DN */
-       if ( dn_match( &lc1->local_dn, &lc2->local_dn ) &&
-                lc1->conn == lc2->conn ) return -1;
+       if ( dn_match( &lc1->lc_local_ndn, &lc2->lc_local_ndn ) &&
+                               lc1->lc_conn == lc2->lc_conn )
+       {
+               return -1;
+       }
                
        return 0;
 }
 
 #if PRINT_CONNTREE > 0
-static void ravl_print( Avlnode *root, int depth )
+static void
+ravl_print( Avlnode *root, int depth )
 {
-       int     i;
-       struct ldapconn *lc;
+       int             i;
+       ldapconn_t      *lc;
        
-       if ( root == 0 )
+       if ( root == 0 ) {
                return;
+       }
        
        ravl_print( root->avl_right, depth+1 );
        
-       for ( i = 0; i < depth; i++ )
+       for ( i = 0; i < depth; i++ ) {
                printf( "   " );
+       }
 
        lc = root->avl_data;
        printf( "lc(%lx) local(%s) conn(%lx) %d\n",
-                       lc, lc->local_dn.bv_val, lc->conn, root->avl_bf );
+                       lc, lc->lc_local_ndn.bv_val, lc->lc_conn, root->avl_bf );
        
        ravl_print( root->avl_left, depth+1 );
 }
 
-static void myprint( Avlnode *root )
+static void
+myprint( Avlnode *root )
 {
        printf( "********\n" );
        
-       if ( root == 0 )
+       if ( root == 0 ) {
                printf( "\tNULL\n" );
 
-       else
+       } else {
                ravl_print( root, 0 );
+       }
        
        printf( "********\n" );
 }
 #endif /* PRINT_CONNTREE */
 
-struct ldapconn *
-ldap_back_getconn(Operation *op, SlapReply *rs)
+int
+ldap_back_freeconn( Operation *op, ldapconn_t *lc, int dolock )
 {
-       struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
-       struct ldapconn *lc, lc_curr;
-       LDAP *ld;
-       int is_priv = 0;
+       ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
 
-       /* Searches for a ldapconn in the avl tree */
+       if ( dolock ) {
+               ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+       }
 
-       /* Explicit binds must not be shared */
-       if ( op->o_tag == LDAP_REQ_BIND
-               || (op->o_conn
-                 && (op->o_bd == op->o_conn->c_authz_backend ))) {
-               lc_curr.conn = op->o_conn;
-       } else {
-               lc_curr.conn = NULL;
+       assert( lc->lc_refcnt > 0 );
+       if ( --lc->lc_refcnt == 0 ) {
+               lc = avl_delete( &li->li_conninfo.lai_tree, (caddr_t)lc,
+                               ldap_back_conn_cmp );
+               assert( lc != NULL );
+
+               ldap_back_conn_free( (void *)lc );
        }
-       
-       /* Internal searches are privileged and shared. So is root. */
-       if ( op->o_do_not_cache || be_isroot( li->be, &op->o_ndn ) ) {
-               lc_curr.local_dn = li->be->be_rootndn;
-               lc_curr.conn = NULL;
-               is_priv = 1;
+
+       if ( dolock ) {
+               ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+       }
+
+       return 0;
+}
+
+#ifdef HAVE_TLS
+static int
+ldap_back_start_tls(
+       LDAP            *ld,
+       int             protocol,
+       int             *is_tls,
+       const char      *url,
+       unsigned        flags,
+       int             retries,
+       const char      **text )
+{
+       int             rc = LDAP_SUCCESS;
+       ldapinfo_t      dummy;
+
+       /* this is ridiculous... */
+       dummy.li_flags = flags;
+
+       /* start TLS ("tls-[try-]{start,propagate}" statements) */
+       if ( ( LDAP_BACK_USE_TLS( &dummy ) || ( *is_tls && LDAP_BACK_PROPAGATE_TLS( &dummy ) ) )
+                               && !ldap_is_ldaps_url( url ) )
+       {
+#ifdef SLAP_STARTTLS_ASYNCHRONOUS
+               /*
+                * use asynchronous StartTLS
+                * in case, chase referral (not implemented yet)
+                */
+               int             msgid;
+
+               if ( protocol == 0 ) {
+                       ldap_get_option( ld, LDAP_OPT_PROTOCOL_VERSION,
+                                       (void *)&protocol );
+               }
+
+               if ( protocol < LDAP_VERSION3 ) {
+                       protocol = LDAP_VERSION3;
+                       /* Set LDAP version */
+                       ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION,
+                                       (const void *)&protocol );
+               }
+
+               rc = ldap_start_tls( ld, NULL, NULL, &msgid );
+               if ( rc == LDAP_SUCCESS ) {
+                       LDAPMessage     *res = NULL;
+                       struct timeval  tv;
+
+                       LDAP_BACK_TV_SET( &tv );
+
+retry:;
+                       rc = ldap_result( ld, msgid, LDAP_MSG_ALL, &tv, &res );
+                       if ( rc < 0 ) {
+                               rc = LDAP_UNAVAILABLE;
+
+                       } else if ( rc == 0 ) {
+                               if ( retries != LDAP_BACK_RETRY_NEVER ) {
+                                       ldap_pvt_thread_yield();
+                                       if ( retries > 0 ) {
+                                               retries--;
+                                       }
+                                       LDAP_BACK_TV_SET( &tv );
+                                       goto retry;
+                               }
+                               rc = LDAP_UNAVAILABLE;
+
+                       } else if ( rc == LDAP_RES_EXTENDED ) {
+                               struct berval   *data = NULL;
+
+                               rc = ldap_parse_extended_result( ld, res,
+                                               NULL, &data, 0 );
+                               if ( rc == LDAP_SUCCESS ) {
+                                       int err;
+                                       rc = ldap_parse_result( ld, res, &err,
+                                               NULL, NULL, NULL, NULL, 1 );
+                                       if ( rc == LDAP_SUCCESS ) {
+                                               rc = err;
+                                       }
+                                       res = NULL;
+                                       
+                                       /* FIXME: in case a referral 
+                                        * is returned, should we try
+                                        * using it instead of the 
+                                        * configured URI? */
+                                       if ( rc == LDAP_SUCCESS ) {
+                                               rc = ldap_install_tls( ld );
+
+                                       } else if ( rc == LDAP_REFERRAL ) {
+                                               rc = LDAP_UNWILLING_TO_PERFORM;
+                                               *text = "unwilling to chase referral returned by Start TLS exop";
+                                       }
+
+                                       if ( data ) {
+                                               if ( data->bv_val ) {
+                                                       ber_memfree( data->bv_val );
+                                               }
+                                               ber_memfree( data );
+                                       }
+                               }
+
+                       } else {
+                               rc = LDAP_OTHER;
+                       }
+
+                       if ( res != NULL ) {
+                               ldap_msgfree( res );
+                       }
+               }
+#else /* ! SLAP_STARTTLS_ASYNCHRONOUS */
+               /*
+                * use synchronous StartTLS
+                */
+               rc = ldap_start_tls_s( ld, NULL, NULL );
+#endif /* ! SLAP_STARTTLS_ASYNCHRONOUS */
+
+               /* if StartTLS is requested, only attempt it if the URL
+                * is not "ldaps://"; this may occur not only in case
+                * of misconfiguration, but also when used in the chain 
+                * overlay, where the "uri" can be parsed out of a referral */
+               switch ( rc ) {
+               case LDAP_SUCCESS:
+                       *is_tls = 1;
+                       break;
+
+               case LDAP_SERVER_DOWN:
+                       break;
+
+               default:
+                       if ( LDAP_BACK_TLS_CRITICAL( &dummy ) ) {
+                               *text = "could not start TLS";
+                               break;
+                       }
+
+                       /* in case Start TLS is not critical */
+                       *is_tls = 0;
+                       rc = LDAP_SUCCESS;
+                       break;
+               }
+
        } else {
-               lc_curr.local_dn = op->o_ndn;
+               *is_tls = 0;
        }
 
-       ldap_pvt_thread_mutex_lock( &li->conn_mutex );
-       lc = (struct ldapconn *)avl_find( li->conntree, 
-               (caddr_t)&lc_curr, ldap_back_conn_cmp );
-       ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
+       return rc;
+}
+#endif /* HAVE_TLS */
 
-       /* Looks like we didn't get a bind. Open a new session... */
-       if (!lc) {
-               int vers = op->o_protocol;
-               rs->sr_err = ldap_initialize(&ld, li->url);
-               
-               if (rs->sr_err != LDAP_SUCCESS) {
-                       rs->sr_err = ldap_back_map_result(rs);
-                       if (rs->sr_text == NULL) {
+static int
+ldap_back_prepare_conn( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
+{
+       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+       int             vers = op->o_protocol;
+       LDAP            *ld = NULL;
+#ifdef HAVE_TLS
+       int             is_tls = op->o_conn->c_is_tls;
+#endif /* HAVE_TLS */
+
+       assert( lcp != NULL );
+
+       rs->sr_err = ldap_initialize( &ld, li->li_uri );
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               goto error_return;
+       }
+
+       /* Set LDAP version. This will always succeed: If the client
+        * bound with a particular version, then so can we.
+        */
+       if ( vers == 0 ) {
+               /* assume it's an internal op; set to LDAPv3 */
+               vers = LDAP_VERSION3;
+       }
+       ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, (const void *)&vers );
+
+       /* automatically chase referrals ("[dont-]chase-referrals" statement) */
+       if ( LDAP_BACK_CHASE_REFERRALS( li ) ) {
+               ldap_set_option( ld, LDAP_OPT_REFERRALS, LDAP_OPT_ON );
+       }
+
+#ifdef HAVE_TLS
+       rs->sr_err = ldap_back_start_tls( ld, op->o_protocol, &is_tls,
+                       li->li_uri, li->li_flags, li->li_nretries, &rs->sr_text );
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               ldap_unbind_ext( ld, NULL, NULL );
+               goto error_return;
+       }
+#endif /* HAVE_TLS */
+
+       if ( *lcp == NULL ) {
+               *lcp = (ldapconn_t *)ch_calloc( 1, sizeof( ldapconn_t ) );
+               (*lcp)->lc_flags= li->li_flags;
+       }
+       (*lcp)->lc_ld = ld;
+       (*lcp)->lc_refcnt = 1;
+#ifdef HAVE_TLS
+       if ( is_tls ) {
+               LDAP_BACK_CONN_ISTLS_SET( *lcp );
+       } else {
+               LDAP_BACK_CONN_ISTLS_CLEAR( *lcp );
+       }
+#endif /* HAVE_TLS */
+
+error_return:;
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               rs->sr_err = slap_map_api2result( rs );
+               if ( sendok & LDAP_BACK_SENDERR ) {
+                       if ( rs->sr_text == NULL ) {
                                rs->sr_text = "ldap_initialize() failed";
                        }
-                       if (op->o_conn) send_ldap_result( op, rs );
+                       send_ldap_result( op, rs );
                        rs->sr_text = NULL;
-                       return( NULL );
                }
-               /* Set LDAP version. This will always succeed: If the client
-                * bound with a particular version, then so can we.
-                */
-               ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION,
-                               (const void *)&vers);
-               /* FIXME: configurable? */
-               ldap_set_option(ld, LDAP_OPT_REFERRALS, LDAP_OPT_ON);
+       }
 
-               lc = (struct ldapconn *)ch_malloc(sizeof(struct ldapconn));
-               lc->conn = lc_curr.conn;
-               lc->ld = ld;
-               ber_dupbv( &lc->local_dn, &lc_curr.local_dn );
+       return rs->sr_err;
+}
 
-#ifdef ENABLE_REWRITE
-               /*
-                * Sets a cookie for the rewrite session
-                *
-                * FIXME: the o_conn might be no longer valid,
-                * since we may have different entries
-                * for the same connection
-                */
-               ( void )rewrite_session_init( li->rwmap.rwm_rw, op->o_conn );
-#endif /* ENABLE_REWRITE */
+ldapconn_t *
+ldap_back_getconn( Operation *op, SlapReply *rs, ldap_back_send_t sendok )
+{
+       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+       ldapconn_t      *lc,
+                       lc_curr = { 0 };
+       int             refcnt = 1;
 
-               ldap_pvt_thread_mutex_init( &lc->lc_mutex );
+       /* Internal searches are privileged and shared. So is root. */
+       if ( op->o_do_not_cache || be_isroot( op ) ) {
+               LDAP_BACK_CONN_ISPRIV_SET( &lc_curr );
+               lc_curr.lc_local_ndn = op->o_bd->be_rootndn;
+               lc_curr.lc_conn = LDAP_BACK_PCONN_SET( op );
 
-               if ( is_priv ) {
-                       ber_dupbv( &lc->cred, &li->bindpw );
-                       ber_dupbv( &lc->bound_dn, &li->binddn );
+       } else {
+               lc_curr.lc_local_ndn = op->o_ndn;
+               /* Explicit binds must not be shared */
+               if ( op->o_tag == LDAP_REQ_BIND || SLAP_IS_AUTHZ_BACKEND( op ) ) {
+                       lc_curr.lc_conn = op->o_conn;
+       
                } else {
-                       lc->cred.bv_len = 0;
-                       lc->cred.bv_val = NULL;
-                       lc->bound_dn.bv_val = NULL;
-                       lc->bound_dn.bv_len = 0;
-                       if ( op->o_conn->c_dn.bv_len != 0
-                                       && ( op->o_bd == op->o_conn->c_authz_backend ) ) {
-                               
-                               dncookie dc;
-                               struct berval bv;
-
-                               /*
-                                * Rewrite the bind dn if needed
-                                */
-                               dc.rwmap = &li->rwmap;
-#ifdef ENABLE_REWRITE
-                               dc.conn = op->o_conn;
-                               dc.rs = rs;
-                               dc.ctx = "bindDn";
-#else
-                               dc.tofrom = 1;
-                               dc.normalized = 0;
+                       lc_curr.lc_conn = LDAP_BACK_PCONN_SET( op );
+               }
+       }
+
+       /* Searches for a ldapconn in the avl tree */
+       ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+
+       lc = (ldapconn_t *)avl_find( li->li_conninfo.lai_tree, 
+                       (caddr_t)&lc_curr, ldap_back_conn_cmp );
+       if ( lc != NULL ) {
+               refcnt = ++lc->lc_refcnt;
+       }
+       ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+
+       /* Looks like we didn't get a bind. Open a new session... */
+       if ( lc == NULL ) {
+               if ( ldap_back_prepare_conn( &lc, op, rs, sendok ) != LDAP_SUCCESS ) {
+                       return NULL;
+               }
+
+               lc->lc_conn = lc_curr.lc_conn;
+               ber_dupbv( &lc->lc_local_ndn, &lc_curr.lc_local_ndn );
+
+               if ( LDAP_BACK_CONN_ISPRIV( &lc_curr ) ) {
+                       ber_dupbv( &lc->lc_cred, &li->li_acl_passwd );
+                       ber_dupbv( &lc->lc_bound_ndn, &li->li_acl_authcDN );
+                       LDAP_BACK_CONN_ISPRIV_SET( lc );
+
+               } else {
+                       BER_BVZERO( &lc->lc_cred );
+                       BER_BVZERO( &lc->lc_bound_ndn );
+#if 0
+                       /* FIXME: if we set lc_bound_ndn = o_ndn
+                        * we end up with a bind with DN but no password! */
+                       if ( !BER_BVISEMPTY( &op->o_ndn )
+                               && SLAP_IS_AUTHZ_BACKEND( op ) )
+                       {
+                               ber_dupbv( &lc->lc_bound_ndn, &op->o_ndn );
+                       }
 #endif
+               }
 
-                               if ( ldap_back_dn_massage( &dc, &op->o_conn->c_dn, &bv ) ) {
-                                       if (op->o_conn) send_ldap_result( op, rs );
-                                       return NULL;
-                               }
+#ifdef HAVE_TLS
+               /* if start TLS failed but it was not mandatory,
+                * check if the non-TLS connection was already
+                * in cache; in case, destroy the newly created
+                * connection and use the existing one */
+               if ( lc->lc_conn == LDAP_BACK_PCONN_TLS
+                               && !ldap_tls_inplace( lc->lc_ld ) )
+               {
+                       ldapconn_t *tmplc;
+                       
+                       lc_curr.lc_conn = LDAP_BACK_PCONN;
+                       ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+                       tmplc = (ldapconn_t *)avl_find( li->li_conninfo.lai_tree, 
+                                       (caddr_t)&lc_curr, ldap_back_conn_cmp );
+                       if ( tmplc != NULL ) {
+                               refcnt = ++tmplc->lc_refcnt;
+                               ldap_back_conn_free( lc );
+                               lc = tmplc;
+                       }
+                       ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 
-                               if ( bv.bv_val == op->o_conn->c_dn.bv_val ) {
-                                       ber_dupbv( &lc->bound_dn, &bv );
-                               } else {
-                                       lc->bound_dn = bv;
-                               }
+                       if ( tmplc != NULL ) {
+                               goto done;
                        }
                }
+#endif /* HAVE_TLS */
 
-               lc->bound = 0;
+               LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
 
                /* Inserts the newly created ldapconn in the avl tree */
-               ldap_pvt_thread_mutex_lock( &li->conn_mutex );
-               rs->sr_err = avl_insert( &li->conntree, (caddr_t)lc,
+               ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+
+               assert( lc->lc_refcnt == 1 );
+               rs->sr_err = avl_insert( &li->li_conninfo.lai_tree, (caddr_t)lc,
                        ldap_back_conn_cmp, ldap_back_conn_dup );
 
 #if PRINT_CONNTREE > 0
-               myprint( li->conntree );
+               myprint( li->li_conninfo.lai_tree );
 #endif /* PRINT_CONNTREE */
        
-               ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
+               ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_LDAP, INFO, 
-                       "ldap_back_getconn: conn %p inserted\n", (void *) lc, 0, 0);
-#else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_TRACE,
-                       "=>ldap_back_getconn: conn %p inserted\n", (void *) lc, 0, 0 );
-#endif /* !NEW_LOGGING */
+                       "=>ldap_back_getconn: conn %p inserted (refcnt=%u)\n",
+                       (void *)lc, refcnt, 0 );
        
                /* Err could be -1 in case a duplicate ldapconn is inserted */
                if ( rs->sr_err != 0 ) {
                        ldap_back_conn_free( lc );
-                       if (op->o_conn) {
+                       rs->sr_err = LDAP_OTHER;
+                       if ( op->o_conn && ( sendok & LDAP_BACK_SENDERR ) ) {
                                send_ldap_error( op, rs, LDAP_OTHER,
-                               "internal server error" );
+                                       "internal server error" );
                        }
-                       return( NULL );
+                       return NULL;
                }
+
        } else {
-#ifdef NEW_LOGGING
-               LDAP_LOG( BACK_LDAP, INFO, 
-                       "ldap_back_getconn: conn %p fetched\n", 
-                       (void *) lc, 0, 0 );
-#else /* !NEW_LOGGING */
-               Debug( LDAP_DEBUG_TRACE,
-                       "=>ldap_back_getconn: conn %p fetched\n", (void *) lc, 0, 0 );
-#endif /* !NEW_LOGGING */
+               if ( li->li_idle_timeout != 0 && op->o_time > lc->lc_time + li->li_idle_timeout ) {
+                       /* in case of failure, it frees/taints lc and sets it to NULL */
+                       if ( ldap_back_retry( &lc, op, rs, sendok ) ) {
+                               lc = NULL;
+                       }
+               }
+
+               if ( lc ) {
+                       Debug( LDAP_DEBUG_TRACE,
+                               "=>ldap_back_getconn: conn %p fetched (refcnt=%u)\n",
+                               (void *)lc, refcnt, 0 );
+               }
        }
-       
-       return( lc );
+
+       if ( li->li_idle_timeout && lc ) {
+               lc->lc_time = op->o_time;
+       }
+
+done:;
+       return lc;
+}
+
+void
+ldap_back_release_conn(
+       Operation               *op,
+       SlapReply               *rs,
+       ldapconn_t              *lc )
+{
+       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+
+       ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+       assert( lc->lc_refcnt > 0 );
+       lc->lc_refcnt--;
+       ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
 }
 
 /*
  * ldap_back_dobind
  *
- * Note: as the check for the value of lc->bound was already here, I removed
+ * Note: as the check for the value of lc->lc_bound was already here, I removed
  * it from all the callers, and I made the function return the flag, so
  * it can be used to simplify the check.
+ *
+ * Note: dolock indicates whether li->li_conninfo.lai_mutex must be locked or not
  */
-int
-ldap_back_dobind( struct ldapconn *lc, Operation *op, SlapReply *rs )
+static int
+ldap_back_dobind_int(
+       ldapconn_t              *lc,
+       Operation               *op,
+       SlapReply               *rs,
+       ldap_back_send_t        sendok,
+       int                     retries,
+       int                     dolock )
 {      
-       int rc;
-       ber_int_t msgid;
+       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+
+       int             rc = LDAP_BACK_CONN_ISBOUND( lc );
+       ber_int_t       msgid;
+
+       assert( retries >= 0 );
+
+       if ( rc ) {
+               return rc;
+       }
+
+       /*
+        * 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 "idassert-authcDN" (or other ID) is set, 
+        * then bind as the asserting identity and explicitly 
+        * add the proxyAuthz control to every operation with the
+        * dn bound to the connection as control value.
+        * This is done also if this is the authrizing backend,
+        * but the "override" flag is given to idassert.
+        * It allows to use SASL bind and yet proxyAuthz users
+        */
+       if ( op->o_conn != NULL &&
+                       !op->o_do_not_cache &&
+                       ( BER_BVISNULL( &lc->lc_bound_ndn ) ||
+                         ( li->li_idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) ) )
+       {
+               (void)ldap_back_proxy_authz_bind( lc, op, rs );
+               goto done;
+       }
+
+#ifdef HAVE_CYRUS_SASL
+       if ( LDAP_BACK_CONN_ISPRIV( lc )
+               && li->li_acl_authmethod == LDAP_AUTH_SASL )
+       {
+               void            *defaults = NULL;
 
-       ldap_pvt_thread_mutex_lock( &lc->lc_mutex );
-       if ( !lc->bound ) {
-               rs->sr_err = ldap_sasl_bind(lc->ld, lc->bound_dn.bv_val,
-                       LDAP_SASL_SIMPLE, &lc->cred, NULL, NULL, &msgid);
-               rc = ldap_back_op_result( lc, op, rs, msgid, 0 );
-               if (rc == LDAP_SUCCESS) {
-                       lc->bound = 1;
+               if ( li->li_acl_secprops != NULL ) {
+                       rc = ldap_set_option( lc->lc_ld,
+                               LDAP_OPT_X_SASL_SECPROPS, li->li_acl_secprops);
+
+                       if ( rc != LDAP_OPT_SUCCESS ) {
+                               Debug( LDAP_DEBUG_ANY, "Error: ldap_set_option "
+                                       "(%s,SECPROPS,\"%s\") failed!\n",
+                                       li->li_uri, li->li_acl_secprops, 0 );
+                               goto done;
+                       }
+               }
+
+               defaults = lutil_sasl_defaults( lc->lc_ld,
+                               li->li_acl_sasl_mech.bv_val,
+                               li->li_acl_sasl_realm.bv_val,
+                               li->li_acl_authcID.bv_val,
+                               li->li_acl_passwd.bv_val,
+                               NULL );
+
+               rs->sr_err = ldap_sasl_interactive_bind_s( lc->lc_ld,
+                               li->li_acl_authcDN.bv_val,
+                               li->li_acl_sasl_mech.bv_val, NULL, NULL,
+                               LDAP_SASL_QUIET, lutil_sasl_interact,
+                               defaults );
+
+               lutil_sasl_freedefs( defaults );
+
+               rs->sr_err = slap_map_api2result( rs );
+               if ( rs->sr_err != LDAP_SUCCESS ) {
+                       LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
+                       send_ldap_result( op, rs );
+
+               } else {
+                       LDAP_BACK_CONN_ISBOUND_SET( lc );
+               }
+               goto done;
+       }
+#endif /* HAVE_CYRUS_SASL */
+
+retry:;
+       rs->sr_err = ldap_sasl_bind( lc->lc_ld,
+                       lc->lc_bound_ndn.bv_val,
+                       LDAP_SASL_SIMPLE, &lc->lc_cred,
+                       NULL, NULL, &msgid );
+
+       if ( rs->sr_err == LDAP_SERVER_DOWN ) {
+               if ( retries != LDAP_BACK_RETRY_NEVER ) {
+                       if ( dolock ) {
+                               ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+                       }
+
+                       assert( lc->lc_refcnt > 0 );
+                       if ( lc->lc_refcnt == 1 ) {
+                               ldap_unbind_ext( lc->lc_ld, NULL, NULL );
+                               lc->lc_ld = NULL;
+
+                               /* lc here must be the regular lc, reset and ready for init */
+                               rs->sr_err = ldap_back_prepare_conn( &lc, op, rs, sendok );
+                       }
+                       if ( dolock ) {
+                               ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+                       }
+                       if ( rs->sr_err == LDAP_SUCCESS ) {
+                               if ( retries > 0 ) {
+                                       retries--;
+                               }
+                               goto retry;
+                       }
                }
+
+               ldap_back_freeconn( op, lc, dolock );
+               rs->sr_err = slap_map_api2result( rs );
+
+               return 0;
+       }
+
+       rc = ldap_back_op_result( lc, op, rs, msgid, 0, sendok );
+       if ( rc == LDAP_SUCCESS ) {
+               LDAP_BACK_CONN_ISBOUND_SET( lc );
+
+       } else {
+               ldap_back_release_conn( op, rs, lc );
        }
-       rc = lc->bound;
-       ldap_pvt_thread_mutex_unlock( &lc->lc_mutex );
+
+done:;
+       rc = LDAP_BACK_CONN_ISBOUND( lc );
+
        return rc;
 }
 
+int
+ldap_back_dobind( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
+{
+       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+
+       return ldap_back_dobind_int( lc, op, rs, sendok, li->li_nretries, 1 );
+}
+
 /*
- * ldap_back_rebind
+ * ldap_back_default_rebind
  *
  * This is a callback used for chasing referrals using the same
  * credentials as the original user on this session.
  */
 static int 
-ldap_back_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
+ldap_back_default_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
        ber_int_t msgid, void *params )
 {
-       struct ldapconn *lc = params;
+       ldapconn_t      *lc = (ldapconn_t *)params;
 
-       return ldap_bind_s( ld, lc->bound_dn.bv_val, lc->cred.bv_val, LDAP_AUTH_SIMPLE );
-}
+#ifdef HAVE_TLS
+       /* ... otherwise we couldn't get here */
+       assert( lc != NULL );
 
-/* Map API errors to protocol errors... */
+       if ( !ldap_tls_inplace( ld ) ) {
+               int             is_tls = LDAP_BACK_CONN_ISTLS( lc ),
+                               rc;
+               const char      *text = NULL;
 
-int
-ldap_back_map_result(SlapReply *rs)
-{
-       switch(rs->sr_err)
-       {
-       case LDAP_SERVER_DOWN:
-               return LDAP_UNAVAILABLE;
-       case LDAP_LOCAL_ERROR:
-               return LDAP_OTHER;
-       case LDAP_ENCODING_ERROR:
-       case LDAP_DECODING_ERROR:
-               return LDAP_PROTOCOL_ERROR;
-       case LDAP_TIMEOUT:
-               return LDAP_UNAVAILABLE;
-       case LDAP_AUTH_UNKNOWN:
-               return LDAP_AUTH_METHOD_NOT_SUPPORTED;
-       case LDAP_FILTER_ERROR:
-               rs->sr_text = "Filter error";
-               return LDAP_OTHER;
-       case LDAP_USER_CANCELLED:
-               rs->sr_text = "User cancelled";
-               return LDAP_OTHER;
-       case LDAP_PARAM_ERROR:
-               return LDAP_PROTOCOL_ERROR;
-       case LDAP_NO_MEMORY:
-               return LDAP_OTHER;
-       case LDAP_CONNECT_ERROR:
-               return LDAP_UNAVAILABLE;
-       case LDAP_NOT_SUPPORTED:
-               return LDAP_UNWILLING_TO_PERFORM;
-       case LDAP_CONTROL_NOT_FOUND:
-               return LDAP_PROTOCOL_ERROR;
-       case LDAP_NO_RESULTS_RETURNED:
-               return LDAP_NO_SUCH_OBJECT;
-       case LDAP_MORE_RESULTS_TO_RETURN:
-               rs->sr_text = "More results to return";
-               return LDAP_OTHER;
-       case LDAP_CLIENT_LOOP:
-       case LDAP_REFERRAL_LIMIT_EXCEEDED:
-               return LDAP_LOOP_DETECT;
-       default:
-               if LDAP_API_ERROR(rs->sr_err)
-                       return LDAP_OTHER;
-               else
-                       return rs->sr_err;
+               rc = ldap_back_start_tls( ld, 0, &is_tls, url, lc->lc_flags,
+                       LDAP_BACK_RETRY_DEFAULT, &text );
+               if ( rc != LDAP_SUCCESS ) {
+                       return rc;
+               }
        }
+#endif /* HAVE_TLS */
+
+       /* FIXME: add checks on the URL/identity? */
+
+       return ldap_sasl_bind_s( ld, lc->lc_bound_ndn.bv_val,
+                       LDAP_SASL_SIMPLE, &lc->lc_cred, NULL, NULL, NULL );
 }
 
 int
-ldap_back_op_result(struct ldapconn *lc, Operation *op, SlapReply *rs,
-       ber_int_t msgid, int sendok)
+ldap_back_op_result(
+               ldapconn_t              *lc,
+               Operation               *op,
+               SlapReply               *rs,
+               ber_int_t               msgid,
+               time_t                  timeout,
+               ldap_back_send_t        sendok )
 {
-       struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
-       char *match = NULL;
-       LDAPMessage *res;
-       char *text = NULL;
+       char            *match = NULL;
+       LDAPMessage     *res = NULL;
+       char            *text = NULL;
+
+#define        ERR_OK(err) ((err) == LDAP_SUCCESS || (err) == LDAP_COMPARE_FALSE || (err) == LDAP_COMPARE_TRUE)
 
        rs->sr_text = NULL;
        rs->sr_matched = NULL;
 
-       if (rs->sr_err == LDAP_SUCCESS) {
-               if (ldap_result(lc->ld, msgid, 1, NULL, &res) == -1) {
-                       ldap_get_option(lc->ld, LDAP_OPT_ERROR_NUMBER,
-                                       &rs->sr_err);
+       /* if the error recorded in the reply corresponds
+        * to a successful state, get the error from the
+        * remote server response */
+       if ( ERR_OK( rs->sr_err ) ) {
+               int             rc;
+               struct timeval  tv;
+
+               if ( timeout ) {
+                       tv.tv_sec = timeout;
+                       tv.tv_usec = 0;
+
                } else {
-                       int rc = ldap_parse_result(lc->ld, res, &rs->sr_err,
-                                       &match, &text, NULL, NULL, 1);
+                       LDAP_BACK_TV_SET( &tv );
+               }
+
+retry:;
+               /* if result parsing fails, note the failure reason */
+               rc = ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, &tv, &res );
+               switch ( rc ) {
+               case 0:
+                       if ( timeout ) {
+                               (void)ldap_abandon_ext( lc->lc_ld, msgid, NULL, NULL );
+                               rs->sr_err = op->o_protocol >= LDAP_VERSION3 ?
+                                       LDAP_ADMINLIMIT_EXCEEDED : LDAP_OPERATIONS_ERROR;
+                               rs->sr_text = "Operation timed out";
+                               break;
+                       }
+
+                       LDAP_BACK_TV_SET( &tv );
+                       ldap_pvt_thread_yield();
+                       goto retry;
+
+               case -1:
+                       ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER,
+                                       &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:
+                       rc = ldap_parse_result( lc->lc_ld, res, &rs->sr_err,
+                                       &match, &text, NULL, NULL, 1 );
+#ifndef LDAP_NULL_IS_NULL
+                       if ( match != NULL && match[ 0 ] == '\0' ) {
+                               ldap_memfree( match );
+                               match = NULL;
+                       }
+                       if ( text != NULL && text[ 0 ] == '\0' ) {
+                               ldap_memfree( text );
+                               text = NULL;
+                       }
+#endif /* LDAP_NULL_IS_NULL */
                        rs->sr_text = text;
-                       if (rc != LDAP_SUCCESS) rs->sr_err = rc;
+                       if ( rc != LDAP_SUCCESS ) {
+                               rs->sr_err = rc;
+                       }
                }
        }
 
-       if (rs->sr_err != LDAP_SUCCESS) {
-               rs->sr_err = ldap_back_map_result(rs);
+       /* if the error in the reply structure is not
+        * LDAP_SUCCESS, try to map it from client 
+        * to server error */
+       if ( !ERR_OK( rs->sr_err ) ) {
+               rs->sr_err = slap_map_api2result( rs );
 
-               /* internal ops must not reply to client */
+               /* internal ops ( op->o_conn == NULL ) 
+                * must not reply to client */
                if ( op->o_conn && !op->o_do_not_cache && match ) {
-                       struct berval dn, mdn;
-                       dncookie dc;
-
-                       dc.rwmap = &li->rwmap;
-#ifdef ENABLE_REWRITE
-                       dc.conn = op->o_conn;
-                       dc.rs = rs;
-                       dc.ctx = "matchedDn";
-#else
-                       dc.tofrom = 0;
-                       dc.normalized = 0;
-#endif
-                       ber_str2bv(match, 0, 0, &dn);
-                       ldap_back_dn_massage(&dc, &dn, &mdn);
-                       rs->sr_matched = mdn.bv_val;
-                               
+
+                       /* record the (massaged) matched
+                        * DN into the reply structure */
+                       rs->sr_matched = match;
                }
        }
-       if (op->o_conn && (sendok || rs->sr_err != LDAP_SUCCESS)) {
+       if ( op->o_conn &&
+                       ( ( sendok & LDAP_BACK_SENDOK ) 
+                         || ( ( sendok & LDAP_BACK_SENDERR ) && rs->sr_err != LDAP_SUCCESS ) ) )
+       {
                send_ldap_result( op, rs );
        }
        if ( match ) {
@@ -533,6 +932,505 @@ ldap_back_op_result(struct ldapconn *lc, Operation *op, SlapReply *rs,
                ldap_memfree( text );
        }
        rs->sr_text = NULL;
-       return( (rs->sr_err == LDAP_SUCCESS) ? 0 : -1 );
+       return( ERR_OK( rs->sr_err ) ? LDAP_SUCCESS : rs->sr_err );
+}
+
+/* return true if bound, false if failed */
+int
+ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
+{
+       int             rc = 0;
+       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+
+       assert( lcp != NULL );
+       assert( *lcp != NULL );
+
+       ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );
+
+       if ( (*lcp)->lc_refcnt == 1 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "%s ldap_back_retry: retrying URI=\"%s\" DN=\"%s\"\n",
+                       op->o_log_prefix, li->li_uri,
+                       BER_BVISNULL( &(*lcp)->lc_bound_ndn ) ?
+                               "" : (*lcp)->lc_bound_ndn.bv_val );
+
+               ldap_unbind_ext( (*lcp)->lc_ld, NULL, NULL );
+               (*lcp)->lc_ld = NULL;
+               LDAP_BACK_CONN_ISBOUND_CLEAR( (*lcp) );
+
+               /* lc here must be the regular lc, reset and ready for init */
+               rc = ldap_back_prepare_conn( lcp, op, rs, sendok );
+               if ( rc != LDAP_SUCCESS ) {
+                       rc = 0;
+                       *lcp = NULL;
+
+               } else {
+                       rc = ldap_back_dobind_int( *lcp, op, rs, sendok, 0, 0 );
+                       if ( rc == 0 ) {
+                               *lcp = NULL;
+                       }
+               }
+       }
+
+       ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
+
+       return rc;
 }
 
+static int
+ldap_back_proxy_authz_bind( ldapconn_t *lc, Operation *op, SlapReply *rs )
+{
+       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+       struct berval   binddn = slap_empty_bv;
+       struct berval   bindcred = slap_empty_bv;
+       struct berval   ndn;
+       int             dobind = 0;
+       int             msgid;
+       int             rc;
+
+       if ( !BER_BVISNULL( &op->o_conn->c_ndn ) ) {
+               ndn = op->o_conn->c_ndn;
+
+       } else {
+               ndn = op->o_ndn;
+       }
+
+       /*
+        * 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 ( li->li_idassert_mode ) {
+       case LDAP_BACK_IDASSERT_LEGACY:
+               if ( !BER_BVISNULL( &ndn ) && !BER_BVISEMPTY( &ndn ) ) {
+                       if ( !BER_BVISNULL( &li->li_idassert_authcDN ) && !BER_BVISEMPTY( &li->li_idassert_authcDN ) )
+                       {
+                               binddn = li->li_idassert_authcDN;
+                               bindcred = li->li_idassert_passwd;
+                               dobind = 1;
+                       }
+               }
+               break;
+
+       default:
+               /* NOTE: rootdn can always idassert */
+               if ( li->li_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, li->li_idassert_authz,
+                                       &authcDN, &authcDN );
+                       if ( rs->sr_err != LDAP_SUCCESS ) {
+                               if ( li->li_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) {
+                                       send_ldap_result( op, rs );
+                                       LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
+
+                               } else {
+                                       rs->sr_err = LDAP_SUCCESS;
+                                       binddn = slap_empty_bv;
+                                       bindcred = slap_empty_bv;
+                                       break;
+                               }
+
+                               goto done;
+                       }
+               }
+
+               binddn = li->li_idassert_authcDN;
+               bindcred = li->li_idassert_passwd;
+               dobind = 1;
+               break;
+       }
+
+       if ( dobind && li->li_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 ) &&
+                               ( li->li_idassert_flags & LDAP_BACK_AUTH_NATIVE_AUTHZ ) )
+               {
+                       switch ( li->li_idassert_mode ) {
+                       case LDAP_BACK_IDASSERT_OTHERID:
+                       case LDAP_BACK_IDASSERT_OTHERDN:
+                               authzID = li->li_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 ( li->li_idassert_secprops != NULL ) {
+                       rs->sr_err = ldap_set_option( lc->lc_ld,
+                               LDAP_OPT_X_SASL_SECPROPS,
+                               (void *)li->li_idassert_secprops );
+
+                       if ( rs->sr_err != LDAP_OPT_SUCCESS ) {
+                               send_ldap_result( op, rs );
+                               LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
+                               goto done;
+                       }
+               }
+
+               defaults = lutil_sasl_defaults( lc->lc_ld,
+                               li->li_idassert_sasl_mech.bv_val,
+                               li->li_idassert_sasl_realm.bv_val,
+                               li->li_idassert_authcID.bv_val,
+                               li->li_idassert_passwd.bv_val,
+                               authzID.bv_val );
+
+               rs->sr_err = ldap_sasl_interactive_bind_s( lc->lc_ld, binddn.bv_val,
+                               li->li_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( lc );
+                       send_ldap_result( op, rs );
+
+               } else {
+                       LDAP_BACK_CONN_ISBOUND_SET( lc );
+               }
+
+               lutil_sasl_freedefs( defaults );
+               if ( freeauthz ) {
+                       slap_sl_free( authzID.bv_val, op->o_tmpmemctx );
+               }
+
+               goto done;
+#endif /* HAVE_CYRUS_SASL */
+       }
+
+       switch ( li->li_idassert_authmethod ) {
+       case LDAP_AUTH_NONE:
+               LDAP_BACK_CONN_ISBOUND_SET( lc );
+               goto done;
+
+       case LDAP_AUTH_SIMPLE:
+               rs->sr_err = ldap_sasl_bind( lc->lc_ld,
+                               binddn.bv_val, LDAP_SASL_SIMPLE,
+                               &bindcred, NULL, NULL, &msgid );
+               break;
+
+       default:
+               /* unsupported! */
+               LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
+               rs->sr_err = LDAP_AUTH_METHOD_NOT_SUPPORTED;
+               send_ldap_result( op, rs );
+               goto done;
+       }
+
+       rc = ldap_back_op_result( lc, op, rs, msgid, 0, LDAP_BACK_SENDERR );
+       if ( rc == LDAP_SUCCESS ) {
+               LDAP_BACK_CONN_ISBOUND_SET( lc );
+       }
+done:;
+       return LDAP_BACK_CONN_ISBOUND( lc );
+}
+
+/*
+ * ldap_back_proxy_authz_ctrl() prepends a proxyAuthz control
+ * to existing server-side controls if required; if not,
+ * the existing server-side controls are placed in *pctrls.
+ * The caller, after using the controls in client API 
+ * operations, if ( *pctrls != op->o_ctrls ), should
+ * free( (*pctrls)[ 0 ] ) and free( *pctrls ).
+ * The function returns success if the control could
+ * be added if required, or if it did nothing; in the future,
+ * it might return some error if it failed.
+ * 
+ * if no bind took place yet, but the connection is bound
+ * and the "proxyauthzdn" is set, then bind as "proxyauthzdn" 
+ * and explicitly add proxyAuthz the control to every operation
+ * with the dn bound to the connection as control value.
+ *
+ * If no server-side controls are defined for the operation,
+ * simply add the proxyAuthz control; otherwise, if the
+ * proxyAuthz control is not already set, add it as
+ * the first one
+ *
+ * FIXME: is controls order significant for security?
+ * ANSWER: controls ordering and interoperability
+ * must be indicated by the specs of each control; if none
+ * is specified, the order is irrelevant.
+ */
+int
+ldap_back_proxy_authz_ctrl(
+               ldapconn_t      *lc,
+               Operation       *op,
+               SlapReply       *rs,
+               LDAPControl     ***pctrls )
+{
+       ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
+       LDAPControl     **ctrls = NULL;
+       int             i = 0,
+                       mode;
+       struct berval   assertedID,
+                       ndn;
+
+       *pctrls = NULL;
+
+       rs->sr_err = LDAP_SUCCESS;
+
+       /* FIXME: SASL/EXTERNAL over ldapi:// doesn't honor the authcID,
+        * but if it is not set this test fails.  We need a different
+        * means to detect if idassert is enabled */
+       if ( ( BER_BVISNULL( &li->li_idassert_authcID ) || BER_BVISEMPTY( &li->li_idassert_authcID ) )
+                       && ( BER_BVISNULL( &li->li_idassert_authcDN ) || BER_BVISEMPTY( &li->li_idassert_authcDN ) ) )
+       {
+               goto done;
+       }
+
+       if ( !op->o_conn || op->o_do_not_cache || be_isroot( op ) ) {
+               goto done;
+       }
+
+       if ( !BER_BVISNULL( &op->o_conn->c_ndn ) ) {
+               ndn = op->o_conn->c_ndn;
+
+       } else {
+               ndn = op->o_ndn;
+       }
+
+       if ( li->li_idassert_mode == LDAP_BACK_IDASSERT_LEGACY ) {
+               if ( op->o_proxy_authz ) {
+                       /*
+                        * FIXME: we do not want to perform proxyAuthz
+                        * on behalf of the client, because this would
+                        * be performed with "proxyauthzdn" privileges.
+                        *
+                        * This might actually be too strict, since
+                        * the "proxyauthzdn" authzTo, and each entry's
+                        * authzFrom attributes may be crafted
+                        * to avoid unwanted proxyAuthz to take place.
+                        */
+#if 0
+                       rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+                       rs->sr_text = "proxyAuthz not allowed within namingContext";
+#endif
+                       goto done;
+               }
+
+               if ( !BER_BVISNULL( &lc->lc_bound_ndn ) ) {
+                       goto done;
+               }
+
+               if ( BER_BVISNULL( &ndn ) ) {
+                       goto done;
+               }
+
+               if ( BER_BVISNULL( &li->li_idassert_authcDN ) ) {
+                       goto done;
+               }
+
+       } else if ( li->li_idassert_authmethod == LDAP_AUTH_SASL ) {
+               if ( ( li->li_idassert_flags & LDAP_BACK_AUTH_NATIVE_AUTHZ )
+                               /* && ( !BER_BVISNULL( &ndn )
+                                       || LDAP_BACK_CONN_ISBOUND( lc ) ) */ )
+               {
+                       /* already asserted in SASL via native authz */
+                       /* NOTE: the test on lc->lc_bound is used to trap
+                        * native authorization of anonymous users,
+                        * since in that case ndn is NULL */
+                       goto done;
+               }
+
+       } else if ( li->li_idassert_authz && !be_isroot( op ) ) {
+               int             rc;
+               struct berval authcDN;
+
+               if ( BER_BVISNULL( &ndn ) ) {
+                       authcDN = slap_empty_bv;
+               } else {
+                       authcDN = ndn;
+               }
+               rc = slap_sasl_matches( op, li->li_idassert_authz,
+                               &authcDN, & authcDN );
+               if ( rc != LDAP_SUCCESS ) {
+                       if ( li->li_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE )
+                       {
+                               /* ndn is not authorized
+                                * to use idassert */
+                               return rc;
+                       }
+                       return rs->sr_err;
+               }
+       }
+
+       if ( op->o_proxy_authz ) {
+               /*
+                * FIXME: we can:
+                * 1) ignore the already set proxyAuthz control
+                * 2) leave it in place, and don't set ours
+                * 3) add both
+                * 4) reject the operation
+                *
+                * option (4) is very drastic
+                * option (3) will make the remote server reject
+                * the operation, thus being equivalent to (4)
+                * option (2) will likely break the idassert
+                * assumptions, so we cannot accept it;
+                * option (1) means that we are contradicting
+                * the client's reques.
+                *
+                * I think (4) is the only correct choice.
+                */
+               rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+               rs->sr_text = "proxyAuthz not allowed within namingContext";
+       }
+
+       if ( op->o_is_auth_check ) {
+               mode = LDAP_BACK_IDASSERT_NOASSERT;
+
+       } else {
+               mode = li->li_idassert_mode;
+       }
+
+       switch ( mode ) {
+       case LDAP_BACK_IDASSERT_LEGACY:
+       case LDAP_BACK_IDASSERT_SELF:
+               /* original behavior:
+                * assert the client's identity */
+               if ( BER_BVISNULL( &ndn ) ) {
+                       assertedID = slap_empty_bv;
+               } else {
+                       assertedID = ndn;
+               }
+               break;
+
+       case LDAP_BACK_IDASSERT_ANONYMOUS:
+               /* assert "anonymous" */
+               assertedID = slap_empty_bv;
+               break;
+
+       case LDAP_BACK_IDASSERT_NOASSERT:
+               /* don't assert; bind as proxyauthzdn */
+               goto done;
+
+       case LDAP_BACK_IDASSERT_OTHERID:
+       case LDAP_BACK_IDASSERT_OTHERDN:
+               /* assert idassert DN */
+               assertedID = li->li_idassert_authzID;
+               break;
+
+       default:
+               assert( 0 );
+       }
+
+       if ( BER_BVISNULL( &assertedID ) ) {
+               assertedID = slap_empty_bv;
+       }
+
+       if ( op->o_ctrls ) {
+               for ( i = 0; op->o_ctrls[ i ]; i++ )
+                       /* just count ctrls */ ;
+       }
+
+       ctrls = ch_malloc( sizeof( LDAPControl * ) * (i + 2) );
+       ctrls[ 0 ] = ch_malloc( sizeof( LDAPControl ) );
+       
+       ctrls[ 0 ]->ldctl_oid = LDAP_CONTROL_PROXY_AUTHZ;
+       ctrls[ 0 ]->ldctl_iscritical = 1;
+
+       switch ( li->li_idassert_mode ) {
+       /* already in u:ID or dn:DN form */
+       case LDAP_BACK_IDASSERT_OTHERID:
+       case LDAP_BACK_IDASSERT_OTHERDN:
+               ber_dupbv( &ctrls[ 0 ]->ldctl_value, &assertedID );
+               break;
+
+       /* needs the dn: prefix */
+       default:
+               ctrls[ 0 ]->ldctl_value.bv_len = assertedID.bv_len + STRLENOF( "dn:" );
+               ctrls[ 0 ]->ldctl_value.bv_val = ch_malloc( ctrls[ 0 ]->ldctl_value.bv_len + 1 );
+               AC_MEMCPY( ctrls[ 0 ]->ldctl_value.bv_val, "dn:", STRLENOF( "dn:" ) );
+               AC_MEMCPY( &ctrls[ 0 ]->ldctl_value.bv_val[ STRLENOF( "dn:" ) ],
+                               assertedID.bv_val, assertedID.bv_len + 1 );
+               break;
+       }
+
+       if ( op->o_ctrls ) {
+               for ( i = 0; op->o_ctrls[ i ]; i++ ) {
+                       ctrls[ i + 1 ] = op->o_ctrls[ i ];
+               }
+       }
+       ctrls[ i + 1 ] = NULL;
+
+done:;
+       if ( ctrls == NULL ) {
+               ctrls = op->o_ctrls;
+       }
+
+       *pctrls = ctrls;
+       
+       return rs->sr_err;
+}
+
+int
+ldap_back_proxy_authz_ctrl_free( Operation *op, LDAPControl ***pctrls )
+{
+       LDAPControl     **ctrls = *pctrls;
+
+       /* we assume that the first control is the proxyAuthz
+        * added by back-ldap, so it's the only one we explicitly 
+        * free */
+       if ( ctrls && ctrls != op->o_ctrls ) {
+               assert( ctrls[ 0 ] != NULL );
+
+               if ( !BER_BVISNULL( &ctrls[ 0 ]->ldctl_value ) ) {
+                       free( ctrls[ 0 ]->ldctl_value.bv_val );
+               }
+
+               free( ctrls[ 0 ] );
+               free( ctrls );
+       } 
+
+       *pctrls = NULL;
+
+       return 0;
+}