X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbind.c;h=8c261489e8657f7226c542a45dc2ff66458db421;hb=4361a942abb69d6b3dbae637cddb4055080fe6fa;hp=73699edf1d81b1bccef425ff171400e0f6e827ee;hpb=ffe20229dc2a3c0b69c327d49dbbea172d213e4c;p=openldap

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 73699edf1d..8c261489e8 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -207,8 +207,6 @@ cleanup:
 		op->o_conn->c_authtype = op->orb_method;
 	}
 
-	op->o_conn->c_sasl_bindop = NULL;
-
 	if( !BER_BVISNULL( &op->o_req_dn ) ) {
 		slap_sl_free( op->o_req_dn.bv_val, op->o_tmpmemctx );
 		BER_BVZERO( &op->o_req_dn );
@@ -225,6 +223,7 @@ int
 fe_op_bind( Operation *op, SlapReply *rs )
 {
 	struct berval	mech = op->orb_tmp_mech;
+	BackendDB	*bd = op->o_bd;
 
 	/* check for inappropriate controls */
 	if( get_manageDSAit( op ) == SLAP_CONTROL_CRITICAL ) {
@@ -275,56 +274,6 @@ fe_op_bind( Operation *op, SlapReply *rs )
 
 		rs->sr_err = slap_sasl_bind( op, rs );
 
-		ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
-		if( rs->sr_err == LDAP_SUCCESS ) {
-			ber_dupbv(&op->o_conn->c_dn, &op->orb_edn);
-			if( !BER_BVISEMPTY( &op->orb_edn ) ) {
-				/* edn is always normalized already */
-				ber_dupbv( &op->o_conn->c_ndn, &op->o_conn->c_dn );
-			}
-			op->o_tmpfree( op->orb_edn.bv_val, op->o_tmpmemctx );
-			BER_BVZERO( &op->orb_edn );
-			op->o_conn->c_authmech = op->o_conn->c_sasl_bind_mech;
-			BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
-			op->o_conn->c_sasl_bind_in_progress = 0;
-
-			op->o_conn->c_sasl_ssf = op->orb_ssf;
-			if( op->orb_ssf > op->o_conn->c_ssf ) {
-				op->o_conn->c_ssf = op->orb_ssf;
-			}
-
-			if( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
-				ber_len_t max = sockbuf_max_incoming_auth;
-				ber_sockbuf_ctrl( op->o_conn->c_sb,
-					LBER_SB_OPT_SET_MAX_INCOMING, &max );
-			}
-
-			/* log authorization identity */
-			Statslog( LDAP_DEBUG_STATS,
-				"%s BIND dn=\"%s\" mech=%s ssf=%d\n",
-				op->o_log_prefix,
-				BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
-				op->o_conn->c_authmech.bv_val, op->orb_ssf, 0 );
-
-			Debug( LDAP_DEBUG_TRACE,
-				"do_bind: SASL/%s bind: dn=\"%s\" ssf=%d\n",
-				op->o_conn->c_authmech.bv_val,
-				BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
-				op->orb_ssf );
-
-		} else if ( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS ) {
-			op->o_conn->c_sasl_bind_in_progress = 1;
-
-		} else {
-			if ( !BER_BVISNULL( &op->o_conn->c_sasl_bind_mech ) ) {
-				free( op->o_conn->c_sasl_bind_mech.bv_val );
-				BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
-			}
-			op->o_conn->c_sasl_bind_in_progress = 0;
-		}
-
-		ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-
 		goto cleanup;
 
 	} else {
@@ -439,9 +388,8 @@ fe_op_bind( Operation *op, SlapReply *rs )
 		/* don't return referral for bind requests */
 		/* noSuchObject is not allowed to be returned by bind */
 		rs->sr_err = LDAP_INVALID_CREDENTIALS;
-		op->o_bd = frontendDB;
+		op->o_bd = bd;
 		send_ldap_result( op, rs );
-		op->o_bd = NULL;
 		goto cleanup;
 	}
 
@@ -452,6 +400,8 @@ fe_op_bind( Operation *op, SlapReply *rs )
 	}
 
 	if( op->o_bd->be_bind ) {
+		op->o_conn->c_authz_cookie = NULL;
+
 		rs->sr_err = (op->o_bd->be_bind)( op, rs );
 
 		if ( rs->sr_err == 0 ) {
@@ -502,6 +452,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
 	}
 
 cleanup:;
+	op->o_bd = bd;
 	return rs->sr_err;
 }