]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldap/bind.c
fix -ULDAP_DEVEL compile
[openldap] / servers / slapd / back-ldap / bind.c
index 67ce0fc16a8b894b74f88e9ac886334f243808c6..ce991e476c96b8e84ebf505a1efe4d04827f0a13 100644 (file)
@@ -1,29 +1,24 @@
 /* bind.c - ldap backend bind function */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* 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.
+ *
+ * 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>.
  */
-/* 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.
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.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 int
+ldap_back_proxy_authz_bind( struct ldapconn *lc, Operation *op, SlapReply *rs );
+
+static int
+ldap_back_prepare_conn( struct ldapconn **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok );
+
 int
-ldap_back_bind(
-    Backend            *be,
-    Connection         *conn,
-    Operation          *op,
-    const char         *dn,
-    const char         *ndn,
-    int                        method,
-    struct berval      *cred,
-       char            **edn
-)
+ldap_back_bind( Operation *op, SlapReply *rs )
 {
-       struct ldapinfo *li = (struct ldapinfo *) be->be_private;
+       struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
        struct ldapconn *lc;
 
-       *edn = NULL;
+       int rc = 0;
+       ber_int_t msgid;
+
+       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
+       if ( !lc ) {
+               return rs->sr_err;
+       }
+
+       if ( !BER_BVISNULL( &lc->lc_bound_ndn ) ) {
+               ch_free( lc->lc_bound_ndn.bv_val );
+               BER_BVZERO( &lc->lc_bound_ndn );
+       }
+       lc->lc_bound = 0;
+
+       /* method is always LDAP_AUTH_SIMPLE if we got here */
+       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, 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->idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) {
+                       ldap_back_proxy_authz_bind( lc, op, rs );
+                       if ( lc->lc_bound == 0 ) {
+                               rc = 1;
+                               goto done;
+                       }
+               }
+
+               lc->lc_bound = 1;
+               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 );
+                               ch_free( lc->lc_cred.bv_val );
+                       }
+                       ber_dupbv( &lc->lc_cred, &op->orb_cred );
+                       ldap_set_rebind_proc( lc->lc_ld, ldap_back_rebind, lc );
+               }
+       }
+done:;
 
-       lc = ldap_back_getconn(li, conn, op);
-       if (!lc)
-               return( -1 );
+       /* must re-insert if local DN changed as result of bind */
+       if ( lc->lc_bound && !dn_match( &op->o_req_ndn, &lc->lc_local_ndn ) ) {
+               int     lerr;
 
-       if (ldap_bind_s(lc->ld, dn, cred->bv_val, method) != LDAP_SUCCESS)
-               return( ldap_back_op_result(lc, op) );
+               ldap_pvt_thread_mutex_lock( &li->conn_mutex );
+               lc = avl_delete( &li->conntree, (caddr_t)lc,
+                               ldap_back_conn_cmp );
+               if ( !BER_BVISNULL( &lc->lc_local_ndn ) ) {
+                       ch_free( lc->lc_local_ndn.bv_val );
+               }
+               ber_dupbv( &lc->lc_local_ndn, &op->o_req_ndn );
+               lerr = avl_insert( &li->conntree, (caddr_t)lc,
+                       ldap_back_conn_cmp, ldap_back_conn_dup );
+               ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
+               if ( lerr == -1 ) {
+                       ldap_back_conn_free( lc );
+               }
+       }
 
-       lc->bound = 1;
-       return( 0 );
+       return( rc );
 }
 
-struct ldapconn *
-ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
+/*
+ * ldap_back_conn_cmp
+ *
+ * compares two struct ldapconn based on the value of the conn pointer;
+ * used by avl stuff
+ */
+int
+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;
+       int rc;
+
+       /* If local DNs don't match, it is definitely not a match */
+       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->lc_conn, lc2->lc_conn );
+}
+
+/*
+ * ldap_back_conn_dup
+ *
+ * returns -1 in case a duplicate struct ldapconn has been inserted;
+ * used by avl stuff
+ */
+int
+ldap_back_conn_dup( void *c1, void *c2 )
+{
+       struct ldapconn *lc1 = (struct ldapconn *)c1;
+       struct ldapconn *lc2 = (struct ldapconn *)c2;
+
+       /* Cannot have more than one shared session with same DN */
+       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 )
+{
+       int     i;
        struct ldapconn *lc;
-       LDAP *ld;
+       
+       if ( root == 0 ) {
+               return;
+       }
+       
+       ravl_print( root->avl_right, depth+1 );
+       
+       for ( i = 0; i < depth; i++ ) {
+               printf( "   " );
+       }
+
+       lc = root->avl_data;
+       printf( "lc(%lx) local(%s) conn(%lx) %d\n",
+                       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 )
+{
+       printf( "********\n" );
+       
+       if ( root == 0 ) {
+               printf( "\tNULL\n" );
+
+       } else {
+               ravl_print( root, 0 );
+       }
+       
+       printf( "********\n" );
+}
+#endif /* PRINT_CONNTREE */
+
+int
+ldap_back_freeconn( Operation *op, struct ldapconn *lc )
+{
+       struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
 
        ldap_pvt_thread_mutex_lock( &li->conn_mutex );
-       for (lc = li->lcs; lc; lc=lc->next)
-               if (lc->conn == conn)
-                       break;
+       lc = avl_delete( &li->conntree, (caddr_t)lc,
+                       ldap_back_conn_cmp );
+       ldap_back_conn_free( (void *)lc );
        ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
 
-       /* Looks like we didn't get a bind. Open a new session... */
-       if (!lc) {
-               int vers = conn->c_protocol;
-               int err = ldap_initialize(&ld, li->url);
-               if (err != LDAP_SUCCESS) {
-                       err = ldap_back_map_result(err);
-                       send_ldap_result( conn, op, err,
-                               NULL, "ldap_init failed", NULL, NULL );
-                       return( NULL );
-               }
-               /* Set LDAP version. This will always succeed: If the client
-                * bound with a particular version, then so can we.
+       return 0;
+}
+
+static int
+ldap_back_prepare_conn( struct ldapconn **lcp, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
+{
+       struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
+       int             vers = op->o_protocol;
+       LDAP            *ld = NULL;
+
+       assert( lcp != NULL );
+
+       rs->sr_err = ldap_initialize( &ld, li->url );
+       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.
+        */
+       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
+       /* start TLS ("tls-[try-]{start,propagate}" statements) */
+       if ( ( LDAP_BACK_USE_TLS( li ) || ( op->o_conn->c_is_tls && LDAP_BACK_PROPAGATE_TLS( li ) ) )
+                               && !ldap_is_ldaps_url( li->url ) )
+       {
+#ifdef SLAP_STARTTLS_ASYNCHRONOUS
+               /*
+                * use asynchronous StartTLS
+                * in case, chase referral (not implemented yet)
+                */
+               int             msgid;
+
+               rs->sr_err = ldap_start_tls( ld, NULL, NULL, &msgid );
+               if ( rs->sr_err == LDAP_SUCCESS ) {
+                       LDAPMessage     *res = NULL;
+                       int             rc, retries = 1;
+                       struct timeval  tv = { 0, 0 };
+
+retry:;
+                       rc = ldap_result( ld, msgid, LDAP_MSG_ALL, &tv, &res );
+                       if ( rc < 0 ) {
+                               rs->sr_err = LDAP_OTHER;
+
+                       } else if ( rc == 0 ) {
+                               if ( retries ) {
+                                       retries--;
+                                       tv.tv_sec = 0;
+                                       tv.tv_usec = 100000;
+                                       goto retry;
+                               }
+                               rs->sr_err = LDAP_OTHER;
+
+                       } else if ( rc == LDAP_RES_EXTENDED ) {
+                               struct berval   *data = NULL;
+
+                               rs->sr_err = ldap_parse_extended_result( ld, res,
+                                               NULL, &data, 0 );
+                               if ( rs->sr_err == LDAP_SUCCESS ) {
+                                       rs->sr_err = ldap_result2error( ld, res, 1 );
+                                       res = NULL;
+                                       
+                                       /* FIXME: in case a referral 
+                                        * is returned, should we try
+                                        * using it instead of the 
+                                        * configured URI? */
+                                       if ( rs->sr_err == LDAP_SUCCESS ) {
+                                               ldap_install_tls( ld );
+
+                                       } else if ( rs->sr_err == LDAP_REFERRAL ) {
+                                               rs->sr_err = LDAP_OTHER;
+                                               rs->sr_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 {
+                               rs->sr_err = LDAP_OTHER;
+                       }
+
+                       if ( res != NULL ) {
+                               ldap_msgfree( res );
+                       }
+               }
+#else /* ! SLAP_STARTTLS_ASYNCHRONOUS */
+               /*
+                * use synchronous StartTLS
                 */
-               ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &vers);
+               rs->sr_err = 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 */
+               if ( rs->sr_err == LDAP_SERVER_DOWN
+                               || ( rs->sr_err != LDAP_SUCCESS && LDAP_BACK_TLS_CRITICAL( li ) ) )
+               {
+                       ldap_unbind_ext_s( ld, NULL, NULL );
+                       goto error_return;
+               }
+       }
+#endif /* HAVE_TLS */
+
+       if ( *lcp == NULL ) {
+               *lcp = (struct ldapconn *)ch_malloc( sizeof( struct ldapconn ) );
+               memset( *lcp, 0, sizeof( struct ldapconn ) );
+       }
+       (*lcp)->lc_ld = ld;
+
+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";
+                       }
+                       send_ldap_result( op, rs );
+                       rs->sr_text = NULL;
+               }
+       }
+
+       return rs->sr_err;
+}
+
+struct ldapconn *
+ldap_back_getconn( Operation *op, SlapReply *rs, ldap_back_send_t sendok )
+{
+       struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
+       struct ldapconn *lc, lc_curr = { 0 };
+
+       /* Searches for a ldapconn in the avl tree */
+
+       /* Explicit binds must not be shared */
+       if ( op->o_tag == LDAP_REQ_BIND
+               || ( op->o_conn
+                       && op->o_conn->c_authz_backend
+                       && op->o_bd->be_private == op->o_conn->c_authz_backend->be_private ) )
+       {
+               lc_curr.lc_conn = op->o_conn;
+
+       } else {
+               lc_curr.lc_conn = NULL;
+       }
+       
+       /* Internal searches are privileged and shared. So is root. */
+       if ( op->o_do_not_cache || be_isroot( op ) ) {
+               lc_curr.lc_local_ndn = op->o_bd->be_rootndn;
+               lc_curr.lc_conn = NULL;
+               lc_curr.lc_ispriv = 1;
+
+       } else {
+               lc_curr.lc_local_ndn = op->o_ndn;
+       }
+
+       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 );
 
-               lc = (struct ldapconn *)ch_malloc(sizeof(struct ldapconn));
-               lc->conn = conn;
-               lc->ld = ld;
-               lc->bound = 0;
+       /* Looks like we didn't get a bind. Open a new session... */
+       if ( !lc ) {
+               /* lc here must be 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 );
+
+               ldap_pvt_thread_mutex_init( &lc->lc_mutex );
+
+               if ( lc_curr.lc_ispriv ) {
+                       ber_dupbv( &lc->lc_cred, &li->acl_passwd );
+                       ber_dupbv( &lc->lc_bound_ndn, &li->acl_authcDN );
+                       lc->lc_ispriv = lc_curr.lc_ispriv;
+
+               } else {
+                       BER_BVZERO( &lc->lc_cred );
+                       BER_BVZERO( &lc->lc_bound_ndn );
+                       if ( op->o_conn && !BER_BVISEMPTY( &op->o_ndn )
+                                       && op->o_bd == op->o_conn->c_authz_backend )
+                       {
+                               ber_dupbv( &lc->lc_bound_ndn, &op->o_ndn );
+                       }
+               }
+
+               lc->lc_bound = 0;
+
+               /* Inserts the newly created ldapconn in the avl tree */
                ldap_pvt_thread_mutex_lock( &li->conn_mutex );
-               lc->next = li->lcs;
-               li->lcs = lc;
+               rs->sr_err = avl_insert( &li->conntree, (caddr_t)lc,
+                       ldap_back_conn_cmp, ldap_back_conn_dup );
+
+#if PRINT_CONNTREE > 0
+               myprint( li->conntree );
+#endif /* PRINT_CONNTREE */
+       
                ldap_pvt_thread_mutex_unlock( &li->conn_mutex );
+
+               Debug( LDAP_DEBUG_TRACE,
+                       "=>ldap_back_getconn: conn %p inserted\n", (void *) lc, 0, 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 && ( sendok & LDAP_BACK_SENDERR ) ) {
+                               send_ldap_error( op, rs, LDAP_OTHER,
+                               "internal server error" );
+                       }
+                       return NULL;
+               }
+       } else {
+               Debug( LDAP_DEBUG_TRACE,
+                       "=>ldap_back_getconn: conn %p fetched\n", (void *) lc, 0, 0 );
        }
-       return( lc );
+       
+       return lc;
 }
 
-void
-ldap_back_dobind(struct ldapconn *lc, Operation *op)
+/*
+ * ldap_back_dobind
+ *
+ * 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.
+ */
+static int
+ldap_back_dobind_int(
+       struct ldapconn         *lc,
+       Operation               *op,
+       SlapReply               *rs,
+       ldap_back_send_t        sendok,
+       int                     retries )
+{      
+       int             rc;
+       ber_int_t       msgid;
+
+       assert( retries >= 0 );
+
+       if ( !lc->lc_bound ) {
+               struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
+
+               /*
+                * 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 &&
+                               !be_isroot( op ) &&
+                               ( BER_BVISNULL( &lc->lc_bound_ndn ) ||
+                                 ( li->idassert_flags & LDAP_BACK_AUTH_OVERRIDE ) ) )
+               {
+                       (void)ldap_back_proxy_authz_bind( lc, op, rs );
+                       goto done;
+               }
+
+#ifdef HAVE_CYRUS_SASL
+               if ( lc->lc_ispriv && li->acl_authmethod == LDAP_AUTH_SASL ) {
+                       void            *defaults = NULL;
+
+#if 1  /* will deal with this later... */
+                       if ( li->acl_secprops != NULL ) {
+                               rc = ldap_set_option( lc->lc_ld,
+                                       LDAP_OPT_X_SASL_SECPROPS, li->acl_secprops);
+
+                               if( rc != LDAP_OPT_SUCCESS ) {
+                                       Debug( LDAP_DEBUG_ANY, "Error: ldap_set_option "
+                                               "(%s,SECPROPS,\"%s\") failed!\n",
+                                               li->url, li->acl_secprops, 0 );
+                                       goto done;
+                               }
+                       }
+#endif
+
+                       defaults = lutil_sasl_defaults( lc->lc_ld,
+                                       li->acl_sasl_mech.bv_val,
+                                       li->acl_sasl_realm.bv_val,
+                                       li->acl_authcID.bv_val,
+                                       li->acl_passwd.bv_val,
+                                       NULL );
+
+                       rs->sr_err = ldap_sasl_interactive_bind_s( lc->lc_ld,
+                                       li->acl_authcDN.bv_val,
+                                       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 ) {
+                               lc->lc_bound = 0;
+                               send_ldap_result( op, rs );
+
+                       } else {
+                               lc->lc_bound = 1;
+                       }
+                       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 > 0 ) {
+                               ldap_unbind_ext_s( lc->lc_ld, NULL, NULL );
+                               lc->lc_ld = NULL;
+
+                               /* lc here must be the regular lc, reset and ready for init */
+                               if ( ldap_back_prepare_conn( &lc, op, rs, sendok ) != LDAP_SUCCESS ) {
+                                       return 0;
+                               }
+
+                               retries--;
+                               goto retry;
+                       }
+
+                       ldap_back_freeconn( op, lc );
+                       rs->sr_err = slap_map_api2result( rs );
+
+                       return 0;
+               }
+
+               rc = ldap_back_op_result( lc, op, rs, msgid, sendok );
+               if ( rc == LDAP_SUCCESS ) {
+                       lc->lc_bound = 1;
+               }
+       }
+
+done:;
+       rc = lc->lc_bound;
+       return rc;
+}
+
+int
+ldap_back_dobind( struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
 {
-       if (lc->bound)
-               return;
+       int     rc;
+
+       ldap_pvt_thread_mutex_lock( &lc->lc_mutex );
+       rc = ldap_back_dobind_int( lc, op, rs, sendok, 1 );
+       ldap_pvt_thread_mutex_unlock( &lc->lc_mutex );
 
-       if (ldap_bind_s(lc->ld, lc->conn->c_cdn, NULL, LDAP_AUTH_SIMPLE) !=
-               LDAP_SUCCESS)
-               ldap_back_op_result(lc, op);
-       else
-               lc->bound = 1;
+       return rc;
 }
 
-/* Map API errors to protocol errors... */
+/*
+ * ldap_back_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,
+       ber_int_t msgid, void *params )
+{
+       struct ldapconn *lc = (struct ldapconn *)params;
+
+       /* 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_map_result(int err)
+ldap_back_op_result(
+               struct ldapconn         *lc,
+               Operation               *op,
+               SlapReply               *rs,
+               ber_int_t               msgid,
+               ldap_back_send_t        sendok )
 {
-       switch(err)
+       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 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 = { 0, 0 };
+
+retry:;
+               /* if result parsing fails, note the failure reason */
+               switch ( ldap_result( lc->lc_ld, msgid, 1, &tv, &res ) ) {
+               case 0:
+                       tv.tv_sec = 0;
+                       tv.tv_usec = 100000;    /* 0.1 s */
+                       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 );
+                       rs->sr_text = text;
+                       if ( rc != LDAP_SUCCESS ) {
+                               rs->sr_err = rc;
+                       }
+               }
+       }
+
+       /* 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 ( op->o_conn == NULL ) 
+                * must not reply to client */
+               if ( op->o_conn && !op->o_do_not_cache && match ) {
+
+                       /* record the (massaged) matched
+                        * DN into the reply structure */
+                       rs->sr_matched = match;
+               }
+       }
+       if ( op->o_conn &&
+                       ( ( sendok & LDAP_BACK_SENDOK ) 
+                         || ( ( sendok & LDAP_BACK_SENDERR ) && rs->sr_err != LDAP_SUCCESS ) ) )
        {
-       case LDAP_SERVER_DOWN:
-               return LDAP_UNAVAILABLE;
-       case LDAP_LOCAL_ERROR:
-               return LDAP_OPERATIONS_ERROR;
-       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:
-               return LDAP_OPERATIONS_ERROR;
-       case LDAP_USER_CANCELLED:
-               return LDAP_OPERATIONS_ERROR;
-       case LDAP_PARAM_ERROR:
-               return LDAP_PROTOCOL_ERROR;
-       case LDAP_NO_MEMORY:
-               return LDAP_OPERATIONS_ERROR;
-       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:
-               return LDAP_OTHER;
-       case LDAP_CLIENT_LOOP:
-       case LDAP_REFERRAL_LIMIT_EXCEEDED:
-               return LDAP_LOOP_DETECT;
+               send_ldap_result( op, rs );
+       }
+       if ( match ) {
+               if ( rs->sr_matched != match ) {
+                       free( (char *)rs->sr_matched );
+               }
+               rs->sr_matched = NULL;
+               ldap_memfree( match );
+       }
+       if ( text ) {
+               ldap_memfree( text );
+       }
+       rs->sr_text = NULL;
+       return( ERR_OK( rs->sr_err ) ? 0 : -1 );
+}
+
+/* return true if bound, false if failed */
+int
+ldap_back_retry( struct ldapconn *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
+{
+       int     rc;
+
+       ldap_pvt_thread_mutex_lock( &lc->lc_mutex );
+       ldap_unbind_ext_s( lc->lc_ld, NULL, NULL );
+       lc->lc_ld = NULL;
+       lc->lc_bound = 0;
+
+       /* lc here must be the regular lc, reset and ready for init */
+       rc = ldap_back_prepare_conn( &lc, op, rs, sendok );
+       if ( rc == LDAP_SUCCESS ) {
+               rc = ldap_back_dobind_int( lc, op, rs, sendok, 0 );
+       }
+       ldap_pvt_thread_mutex_unlock( &lc->lc_mutex );
+
+       return rc;
+}
+
+static int
+ldap_back_proxy_authz_bind( struct ldapconn *lc, Operation *op, SlapReply *rs )
+{
+       struct ldapinfo *li = (struct ldapinfo *)op->o_bd->be_private;
+       struct berval   binddn = slap_empty_bv;
+       struct berval   bindcred = slap_empty_bv;
+       int             dobind = 0;
+       int             msgid;
+       int             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 "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->idassert_mode ) {
+       case LDAP_BACK_IDASSERT_LEGACY:
+               if ( !BER_BVISNULL( &op->o_conn->c_ndn ) && !BER_BVISEMPTY( &op->o_conn->c_ndn ) ) {
+                       if ( !BER_BVISNULL( &li->idassert_authcDN ) && !BER_BVISEMPTY( &li->idassert_authcDN ) )
+                       {
+                               binddn = li->idassert_authcDN;
+                               bindcred = li->idassert_passwd;
+                               dobind = 1;
+                       }
+               }
+               break;
+
        default:
-               if LDAP_API_ERROR(err)
-                       return LDAP_OTHER;
-               else
-                       return err;
+               if ( li->idassert_authz ) {
+                       struct berval authcDN;
+
+                       if ( BER_BVISNULL( &op->o_conn->c_ndn ) ) {
+                               authcDN = slap_empty_bv;
+                       } else {
+                               authcDN = op->o_conn->c_ndn;
+                       }       
+                       rs->sr_err = slap_sasl_matches( op, li->idassert_authz,
+                                       &authcDN, &authcDN );
+                       if ( rs->sr_err != LDAP_SUCCESS ) {
+                               send_ldap_result( op, rs );
+                               lc->lc_bound = 0;
+                               goto done;
+                       }
+               }
+
+               binddn = li->idassert_authcDN;
+               bindcred = li->idassert_passwd;
+               dobind = 1;
+               break;
+       }
+
+       if ( dobind && 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->idassert_flags & LDAP_BACK_AUTH_NATIVE_AUTHZ ) )
+               {
+                       switch ( li->idassert_mode ) {
+                       case LDAP_BACK_IDASSERT_OTHERID:
+                       case LDAP_BACK_IDASSERT_OTHERDN:
+                               authzID = li->idassert_authzID;
+                               break;
+
+                       case LDAP_BACK_IDASSERT_ANONYMOUS:
+                               BER_BVSTR( &authzID, "dn:" );
+                               break;
+
+                       case LDAP_BACK_IDASSERT_SELF:
+                               if ( BER_BVISNULL( &op->o_conn->c_ndn ) ) {
+                                       /* connection is not authc'd, so don't idassert */
+                                       BER_BVSTR( &authzID, "dn:" );
+                                       break;
+                               }
+                               authzID.bv_len = STRLENOF( "dn:" ) + op->o_conn->c_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:" ),
+                                               op->o_conn->c_ndn.bv_val, op->o_conn->c_ndn.bv_len + 1 );
+                               freeauthz = 1;
+                               break;
+
+                       default:
+                               break;
+                       }
+               }
+
+#if 0  /* will deal with this later... */
+               if ( sasl_secprops != NULL ) {
+                       rs->sr_err = ldap_set_option( lc->lc_ld, LDAP_OPT_X_SASL_SECPROPS,
+                               (void *) sasl_secprops );
+
+                       if ( rs->sr_err != LDAP_OPT_SUCCESS ) {
+                               send_ldap_result( op, rs );
+                               lc->lc_bound = 0;
+                               goto done;
+                       }
+               }
+#endif
+
+               defaults = lutil_sasl_defaults( lc->lc_ld,
+                               li->idassert_sasl_mech.bv_val,
+                               li->idassert_sasl_realm.bv_val,
+                               li->idassert_authcID.bv_val,
+                               li->idassert_passwd.bv_val,
+                               authzID.bv_val );
+
+               rs->sr_err = ldap_sasl_interactive_bind_s( lc->lc_ld, binddn.bv_val,
+                               li->idassert_sasl_mech.bv_val, NULL, NULL,
+                               LDAP_SASL_QUIET, lutil_sasl_interact,
+                               defaults );
+
+               lutil_sasl_freedefs( defaults );
+               if ( freeauthz ) {
+                       slap_sl_free( authzID.bv_val, op->o_tmpmemctx );
+               }
+
+               rs->sr_err = slap_map_api2result( rs );
+               if ( rs->sr_err != LDAP_SUCCESS ) {
+                       lc->lc_bound = 0;
+                       send_ldap_result( op, rs );
+
+               } else {
+                       lc->lc_bound = 1;
+               }
+               goto done;
+#endif /* HAVE_CYRUS_SASL */
        }
+
+       switch ( li->idassert_authmethod ) {
+       case LDAP_AUTH_SIMPLE:
+               rs->sr_err = ldap_sasl_bind( lc->lc_ld,
+                               binddn.bv_val, LDAP_SASL_SIMPLE,
+                               &bindcred, NULL, NULL, &msgid );
+               break;
+
+       case LDAP_AUTH_NONE:
+               lc->lc_bound = 1;
+               goto done;
+
+       default:
+               /* unsupported! */
+               lc->lc_bound = 0;
+               rs->sr_err = LDAP_AUTH_METHOD_NOT_SUPPORTED;
+               send_ldap_result( op, rs );
+               goto done;
+       }
+
+       rc = ldap_back_op_result( lc, op, rs, msgid, LDAP_BACK_SENDERR );
+       if ( rc == LDAP_SUCCESS ) {
+               lc->lc_bound = 1;
+       }
+done:;
+       return lc->lc_bound;
+}
+
+/*
+ * 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(
+               struct ldapconn *lc,
+               Operation       *op,
+               SlapReply       *rs,
+               LDAPControl     ***pctrls )
+{
+       struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
+       LDAPControl     **ctrls = NULL;
+       int             i = 0,
+                       mode;
+       struct berval   assertedID;
+
+       *pctrls = NULL;
+
+       rs->sr_err = LDAP_SUCCESS;
+
+       if ( ( BER_BVISNULL( &li->idassert_authcID ) || BER_BVISEMPTY( &li->idassert_authcID ) )
+                       && ( BER_BVISNULL( &li->idassert_authcDN ) || BER_BVISEMPTY( &li->idassert_authcDN ) ) ) {
+               goto done;
+       }
+
+       if ( !op->o_conn || op->o_do_not_cache || be_isroot( op ) ) {
+               goto done;
+       }
+
+       if ( 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( &op->o_conn->c_ndn ) ) {
+                       goto done;
+               }
+
+               if ( BER_BVISNULL( &li->idassert_authcDN ) ) {
+                       goto done;
+               }
+
+       } else if ( li->idassert_authmethod == LDAP_AUTH_SASL ) {
+               if ( ( li->idassert_flags & LDAP_BACK_AUTH_NATIVE_AUTHZ )
+                               /* && ( !BER_BVISNULL( &op->o_conn->c_ndn ) || lc->lc_bound ) */ )
+               {
+                       /* 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 op->o_conn->c_ndn is NULL */
+                       goto done;
+               }
+
+       } else if ( li->idassert_authz ) {
+               int             rc;
+               struct berval authcDN;
+
+               if ( BER_BVISNULL( &op->o_conn->c_ndn ) ) {
+                       authcDN = slap_empty_bv;
+               } else {
+                       authcDN = op->o_conn->c_ndn;
+               }
+               rc = slap_sasl_matches( op, li->idassert_authz,
+                               &authcDN, & authcDN );
+               if ( rc != LDAP_SUCCESS ) {
+                       /* op->o_conn->c_ndn is not authorized
+                        * to use idassert */
+                       return rc;
+               }
+       }
+
+       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_do_not_cache && op->o_is_auth_check ) {
+               mode = LDAP_BACK_IDASSERT_NOASSERT;
+
+       } else {
+               mode = 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( &op->o_conn->c_ndn ) ) {
+                       assertedID = slap_empty_bv;
+               } else {
+                       assertedID = op->o_conn->c_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->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->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_op_result(struct ldapconn *lc, Operation *op)
+ldap_back_proxy_authz_ctrl_free( Operation *op, LDAPControl ***pctrls )
 {
-       int err;
-       char *msg;
-       char *match;
-
-       ldap_get_option(lc->ld, LDAP_OPT_ERROR_NUMBER, &err);
-       ldap_get_option(lc->ld, LDAP_OPT_ERROR_STRING, &msg);
-       ldap_get_option(lc->ld, LDAP_OPT_MATCHED_DN, &match);
-       err = ldap_back_map_result(err);
-       send_ldap_result( lc->conn, op, err, match, msg, NULL, NULL );
-       free(match);
-       free(msg);
-       return( (err==LDAP_SUCCESS) ? 0 : -1 );
+       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 ] );
+
+               if ( !BER_BVISNULL( &ctrls[ 0 ]->ldctl_value ) ) {
+                       free( ctrls[ 0 ]->ldctl_value.bv_val );
+               }
+
+               free( ctrls[ 0 ] );
+               free( ctrls );
+       } 
+
+       *pctrls = NULL;
+
+       return 0;
 }