s/orb_tmp_mech/orb_mech/

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 6139e078eb49b5caca447d608b4dc027d8baec87..6b76332a5c547cad19a691899ac06b515e693933 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -199,7 +199,7 @@ do_bind(
        op->o_conn->c_protocol = version;
        ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
-       op->orb_tmp_mech = mech;
+       op->orb_mech = mech;
 
        op->o_bd = frontendDB;
        rs->sr_err = frontendDB->be_bind( op, rs );
@@ -247,7 +247,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
                        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,
                                "do_bind: no sasl mechanism provided\n",
                                0, 0, 0 );
@@ -257,19 +257,19 @@ fe_op_bind( Operation *op, SlapReply *rs )
                }
 
                /* 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 );
                        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, &op->orb_tmp_mech ) ) {
+                       if( !bvmatch( &op->o_conn->c_sasl_bind_mech, &op->orb_mech ) ) {
                                /* mechanism changed between bind steps */
                                slap_sasl_reset(op->o_conn);
                        }
                } 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 */
@@ -296,7 +296,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
        }
 
        if ( op->orb_method == LDAP_AUTH_SIMPLE ) {
-               BER_BVSTR( &op->orb_tmp_mech, "SIMPLE" );
+               BER_BVSTR( &op->orb_mech, "SIMPLE" );
                /* accept "anonymous" binds */
                if ( BER_BVISEMPTY( &op->orb_cred ) || BER_BVISEMPTY( &op->o_req_ndn ) ) {
                        rs->sr_err = LDAP_SUCCESS;
@@ -321,7 +321,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
                                rs->sr_text = "anonymous bind disallowed";
 
                        } 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,
                "%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 );
+               op->o_conn->c_dn.bv_val, op->orb_mech.bv_val, 0, 0 );
 
        Debug( LDAP_DEBUG_TRACE,
                "do_bind: v%d bind: \"%s\" to \"%s\"\n",

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index b456dc13f0879852528287dd496fe310532841db..7e139de37e216d68b6a3c219ad42762ae6b29bd0 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -1254,10 +1254,10 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                if ( op->orb_method == LDAP_AUTH_SIMPLE ) {
                        attr_merge_one( e, ad_reqMethod, &simple, NULL );
                } 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 );
                        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 = '\0';
                        attr_merge_one( e, ad_reqMethod, &bv, NULL );

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 9106d198be3a7184d2a91176d535f6be45d602e3..84f7100ea200e071e3cf5084ed62bae2bcbd6526 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1888,7 +1888,7 @@ typedef struct req_bind_s {
        struct berval rb_cred;
        struct berval rb_edn;
        slap_ssf_t rb_ssf;
-       struct berval rb_tmp_mech;      /* FIXME: temporary */
+       struct berval rb_mech;
 } req_bind_s;
 
 typedef struct req_search_s {

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index b36f5a749fc84df227a7c85a7f7917aa2b5ed9f0..4e9f9941f28fbe794a48de6532cc5b03ad7aa8d8 100644 (file)
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -280,8 +280,8 @@ slapi_op_bind_callback( Operation *op, SlapReply *rs, int prc )
                                op->o_log_prefix,
                                BER_BVISNULL( &op->o_conn->c_dn )
                                        ? "<empty>" : op->o_conn->c_dn.bv_val,
-                               BER_BVISNULL( &op->orb_tmp_mech )
-                                       ? "<empty>" : op->orb_tmp_mech.bv_val, 0, 0 );
+                               BER_BVISNULL( &op->orb_mech )
+                                       ? "<empty>" : op->orb_mech.bv_val, 0, 0 );
 
                        return -1;
                }