/* $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
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 );
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 ) {
goto cleanup;
}
- if( BER_BVISNULL( &mech ) || BER_BVISEMPTY( &mech ) ) {
+ if( BER_BVISNULL( &op->orb_tmp_mech ) || BER_BVISEMPTY( &op->orb_tmp_mech ) ) {
Debug( LDAP_DEBUG_ANY,
"do_bind: no sasl mechanism provided\n",
0, 0, 0 );
}
/* check restrictions */
- if( backend_check_restrictions( op, rs, &mech ) != LDAP_SUCCESS ) {
+ if( backend_check_restrictions( op, rs, &op->orb_tmp_mech ) != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
goto cleanup;
}
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
if ( op->o_conn->c_sasl_bind_in_progress ) {
- if( !bvmatch( &op->o_conn->c_sasl_bind_mech, &mech ) ) {
+ if( !bvmatch( &op->o_conn->c_sasl_bind_mech, &op->orb_tmp_mech ) ) {
/* mechanism changed between bind steps */
slap_sasl_reset(op->o_conn);
}
} else {
- ber_dupbv(&op->o_conn->c_sasl_bind_mech, &mech);
+ ber_dupbv(&op->o_conn->c_sasl_bind_mech, &op->orb_tmp_mech);
}
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
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 {
}
if ( op->orb_method == LDAP_AUTH_SIMPLE ) {
- BER_BVSTR( &mech, "SIMPLE" );
+ BER_BVSTR( &op->orb_tmp_mech, "SIMPLE" );
/* accept "anonymous" binds */
if ( BER_BVISEMPTY( &op->orb_cred ) || BER_BVISEMPTY( &op->o_req_ndn ) ) {
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = "anonymous bind disallowed";
} else {
- backend_check_restrictions( op, rs, &mech );
+ backend_check_restrictions( op, rs, &op->orb_tmp_mech );
}
/*
op->o_protocol, 0, 0 );
goto cleanup;
}
- BER_BVSTR( &mech, "KRBV4" );
+ BER_BVSTR( &op->orb_tmp_mech, "KRBV4" );
} else if ( op->orb_method == LDAP_AUTH_KRBV42 ) {
rs->sr_err = LDAP_AUTH_METHOD_NOT_SUPPORTED;
/* 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;
}
rs->sr_err = (op->o_bd->be_bind)( op, rs );
if ( rs->sr_err == 0 ) {
- ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
-
- if( op->o_conn->c_authz_backend == NULL ) {
- op->o_conn->c_authz_backend = op->o_bd;
- }
-
- /* be_bind returns regular/global edn */
- if( !BER_BVISEMPTY( &op->orb_edn ) ) {
- op->o_conn->c_dn = op->orb_edn;
- } else {
- ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn);
- }
-
- ber_dupbv( &op->o_conn->c_ndn, &op->o_req_ndn );
-
- 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=0\n",
- op->o_log_prefix,
- op->o_conn->c_dn.bv_val, mech.bv_val, 0, 0 );
-
- Debug( LDAP_DEBUG_TRACE,
- "do_bind: v%d bind: \"%s\" to \"%s\"\n",
- op->o_protocol, op->o_req_dn.bv_val, op->o_conn->c_dn.bv_val );
-
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-
- /* send this here to avoid a race condition */
- send_ldap_result( op, rs );
+ (void)fe_op_bind_success( op, rs );
} else if ( !BER_BVISNULL( &op->orb_edn ) ) {
free( op->orb_edn.bv_val );
}
cleanup:;
+ op->o_bd = bd;
return rs->sr_err;
}
+int
+fe_op_bind_success( Operation *op, SlapReply *rs )
+{
+ ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+
+ if( op->o_conn->c_authz_backend == NULL ) {
+ op->o_conn->c_authz_backend = op->o_bd;
+ }
+
+ /* be_bind returns regular/global edn */
+ if( !BER_BVISEMPTY( &op->orb_edn ) ) {
+ op->o_conn->c_dn = op->orb_edn;
+ } else {
+ ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn);
+ }
+
+ ber_dupbv( &op->o_conn->c_ndn, &op->o_req_ndn );
+
+ 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=0\n",
+ op->o_log_prefix,
+ op->o_conn->c_dn.bv_val, op->orb_tmp_mech.bv_val, 0, 0 );
+
+ Debug( LDAP_DEBUG_TRACE,
+ "do_bind: v%d bind: \"%s\" to \"%s\"\n",
+ op->o_protocol, op->o_req_dn.bv_val, op->o_conn->c_dn.bv_val );
+
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+
+ /* send this here to avoid a race condition */
+ send_ldap_result( op, rs );
+
+ return LDAP_SUCCESS;
+}
projects / openldap / blobdiff