ITS#5183 - better delete index handling

[openldap] / servers / slapd / bind.c

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index b8a506aab351afa55ba1a4cc7d27d3c3233d33e9..6b76332a5c547cad19a691899ac06b515e693933 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -46,10 +46,11 @@ do_bind(
        ber_tag_t tag;
        Backend *be = NULL;
 
-       Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "%s do_bind\n",
+               op->o_log_prefix, 0, 0 );
 
        /*
-        * Force to connection to "anonymous" until bind succeeds.
+        * Force the connection to "anonymous" until bind succeeds.
         */
        ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
        if ( op->o_conn->c_sasl_bind_in_progress ) {
@@ -101,7 +102,8 @@ do_bind(
        tag = ber_scanf( ber, "{imt" /*}*/, &version, &dn, &method );
 
        if ( tag == LBER_ERROR ) {
-               Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_bind: ber_scanf failed\n",
+                       op->o_log_prefix, 0, 0 );
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                rs->sr_err = SLAPD_DISCONNECT;
                goto cleanup;
@@ -134,13 +136,16 @@ do_bind(
        }
 
        if ( tag == LBER_ERROR ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_bind: ber_scanf failed\n",
+                       op->o_log_prefix, 0, 0 );
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                rs->sr_err = SLAPD_DISCONNECT;
                goto cleanup;
        }
 
        if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_bind: get_ctrls failed\n",
+                       op->o_log_prefix, 0, 0 );
                goto cleanup;
        } 
 
@@ -151,14 +156,18 @@ do_bind(
        rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
                op->o_tmpmemctx );
        if ( rs->sr_err != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n",
-                       dn.bv_val, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_bind: invalid dn (%s)\n",
+                       op->o_log_prefix, dn.bv_val, 0 );
                send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
                goto cleanup;
        }
 
+       Statslog( LDAP_DEBUG_STATS, "%s BIND dn=\"%s\" method=%ld\n",
+           op->o_log_prefix, op->o_req_dn.bv_val,
+               (unsigned long) op->orb_method, 0, 0 );
+
        if( op->orb_method == LDAP_AUTH_SASL ) {
-               Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
+               Debug( LDAP_DEBUG_TRACE, "do_bind: dn (%s) SASL mech %s\n",
                        op->o_req_dn.bv_val, mech.bv_val, NULL );
 
        } else {
@@ -168,13 +177,9 @@ do_bind(
                        (unsigned long) op->orb_method );
        }
 
-       Statslog( LDAP_DEBUG_STATS, "%s BIND dn=\"%s\" method=%ld\n",
-           op->o_log_prefix, op->o_req_dn.bv_val,
-               (unsigned long) op->orb_method, 0, 0 );
-
        if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
-               Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
-                       (unsigned long) version, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_bind: unknown version=%ld\n",
+                       op->o_log_prefix, (unsigned long) version, 0 );
                send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
                        "requested protocol version not supported" );
                goto cleanup;
@@ -194,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 );
@@ -242,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 );
@@ -252,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 */
@@ -291,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;
@@ -316,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 );
                        }
 
                        /*
@@ -423,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",