mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

s/orb_tmp_mech/orb_mech/

Browse Source
This commit is contained in:
Pierangelo Masarati 2007-08-16 09:29:45 +00:00
parent 87f918ebc0
commit f4844889fd
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
servers/slapd/bind.c
View File

@ -199,7 +199,7 @@ do_bind(
op->o_conn->c_protocol = version; op->o_conn->c_protocol = version;
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
op->orb_tmp_mech = mech; op->orb_mech = mech;
op->o_bd = frontendDB; op->o_bd = frontendDB;
rs->sr_err = frontendDB->be_bind( op, rs ); rs->sr_err = frontendDB->be_bind( op, rs );
@ -247,7 +247,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
goto cleanup; goto cleanup;
} }
if( BER_BVISNULL( &op->orb_tmp_mech ) || BER_BVISEMPTY( &op->orb_tmp_mech ) ) { if( BER_BVISNULL( &op->orb_mech ) || BER_BVISEMPTY( &op->orb_mech ) ) {
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"do_bind: no sasl mechanism provided\n", "do_bind: no sasl mechanism provided\n",
0, 0, 0 ); 0, 0, 0 );
@ -257,19 +257,19 @@ fe_op_bind( Operation *op, SlapReply *rs )
} }
/* check restrictions */ /* check restrictions */
if( backend_check_restrictions( op, rs, &op->orb_tmp_mech ) != LDAP_SUCCESS ) { if( backend_check_restrictions( op, rs, &op->orb_mech ) != LDAP_SUCCESS ) {
send_ldap_result( op, rs ); send_ldap_result( op, rs );
goto cleanup; goto cleanup;
} }
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
if ( op->o_conn->c_sasl_bind_in_progress ) { if ( op->o_conn->c_sasl_bind_in_progress ) {
if( !bvmatch( &op->o_conn->c_sasl_bind_mech, &op->orb_tmp_mech ) ) { if( !bvmatch( &op->o_conn->c_sasl_bind_mech, &op->orb_mech ) ) {
/* mechanism changed between bind steps */ /* mechanism changed between bind steps */
slap_sasl_reset(op->o_conn); slap_sasl_reset(op->o_conn);
} }
} else { } else {
ber_dupbv(&op->o_conn->c_sasl_bind_mech, &op->orb_tmp_mech); ber_dupbv(&op->o_conn->c_sasl_bind_mech, &op->orb_mech);
} }
/* Set the bindop for the benefit of in-directory SASL lookups */ /* Set the bindop for the benefit of in-directory SASL lookups */
@ -296,7 +296,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
} }
if ( op->orb_method == LDAP_AUTH_SIMPLE ) { if ( op->orb_method == LDAP_AUTH_SIMPLE ) {
BER_BVSTR( &op->orb_tmp_mech, "SIMPLE" ); BER_BVSTR( &op->orb_mech, "SIMPLE" );
/* accept "anonymous" binds */ /* accept "anonymous" binds */
if ( BER_BVISEMPTY( &op->orb_cred ) || BER_BVISEMPTY( &op->o_req_ndn ) ) { if ( BER_BVISEMPTY( &op->orb_cred ) || BER_BVISEMPTY( &op->o_req_ndn ) ) {
rs->sr_err = LDAP_SUCCESS; rs->sr_err = LDAP_SUCCESS;
@ -321,7 +321,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
rs->sr_text = "anonymous bind disallowed"; rs->sr_text = "anonymous bind disallowed";
} else { } else {
backend_check_restrictions( op, rs, &op->orb_tmp_mech ); backend_check_restrictions( op, rs, &op->orb_mech );
} }
/* /*
@ -428,7 +428,7 @@ fe_op_bind_success( Operation *op, SlapReply *rs )
Statslog( LDAP_DEBUG_STATS, Statslog( LDAP_DEBUG_STATS,
"%s BIND dn=\"%s\" mech=%s ssf=0\n", "%s BIND dn=\"%s\" mech=%s ssf=0\n",
op->o_log_prefix, op->o_log_prefix,
op->o_conn->c_dn.bv_val, op->orb_tmp_mech.bv_val, 0, 0 ); op->o_conn->c_dn.bv_val, op->orb_mech.bv_val, 0, 0 );
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d bind: \"%s\" to \"%s\"\n", "do_bind: v%d bind: \"%s\" to \"%s\"\n",

4
servers/slapd/overlays/accesslog.c
View File

@ -1254,10 +1254,10 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
if ( op->orb_method == LDAP_AUTH_SIMPLE ) { if ( op->orb_method == LDAP_AUTH_SIMPLE ) {
attr_merge_one( e, ad_reqMethod, &simple, NULL ); attr_merge_one( e, ad_reqMethod, &simple, NULL );
} else { } else {
bv.bv_len = STRLENOF("SASL()") + op->orb_tmp_mech.bv_len; bv.bv_len = STRLENOF("SASL()") + op->orb_mech.bv_len;
bv.bv_val = op->o_tmpalloc( bv.bv_len + 1, op->o_tmpmemctx ); bv.bv_val = op->o_tmpalloc( bv.bv_len + 1, op->o_tmpmemctx );
ptr = lutil_strcopy( bv.bv_val, "SASL(" ); ptr = lutil_strcopy( bv.bv_val, "SASL(" );
ptr = lutil_strcopy( ptr, op->orb_tmp_mech.bv_val ); ptr = lutil_strcopy( ptr, op->orb_mech.bv_val );
*ptr++ = ')'; *ptr++ = ')';
*ptr = '\0'; *ptr = '\0';
attr_merge_one( e, ad_reqMethod, &bv, NULL ); attr_merge_one( e, ad_reqMethod, &bv, NULL );

2
servers/slapd/slap.h
View File

@ -1888,7 +1888,7 @@ typedef struct req_bind_s {
struct berval rb_cred; struct berval rb_cred;
struct berval rb_edn; struct berval rb_edn;
slap_ssf_t rb_ssf; slap_ssf_t rb_ssf;
struct berval rb_tmp_mech; /* FIXME: temporary */ struct berval rb_mech;
} req_bind_s; } req_bind_s;
typedef struct req_search_s { typedef struct req_search_s {

4
servers/slapd/slapi/slapi_overlay.c
View File

@ -280,8 +280,8 @@ slapi_op_bind_callback( Operation *op, SlapReply *rs, int prc )
op->o_log_prefix, op->o_log_prefix,
BER_BVISNULL( &op->o_conn->c_dn ) BER_BVISNULL( &op->o_conn->c_dn )
? "<empty>" : op->o_conn->c_dn.bv_val, ? "<empty>" : op->o_conn->c_dn.bv_val,
BER_BVISNULL( &op->orb_tmp_mech ) BER_BVISNULL( &op->orb_mech )
? "<empty>" : op->orb_tmp_mech.bv_val, 0, 0 ); ? "<empty>" : op->orb_mech.bv_val, 0, 0 );
return -1; return -1;
} }