Fix maxDeref directive

[openldap] / servers / slapd / bind.c

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 9d721a71e09565c475e57221a3b9413811b42d7c..c09d4098e7218bfb47bef0561cf9abe38d9a4440 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -22,7 +22,6 @@
 #include "slap.h"
 
 char *supportedSASLMechanisms[] = {
-       "X-CRAM-MD5",
        "X-DIGEST-MD5",
        NULL
 };
@@ -69,14 +68,14 @@ do_bind(
 
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
-       if ( op->o_ndn != NULL ) {
-               free( op->o_ndn );
-               op->o_ndn = NULL;
-       }
-
        if ( op->o_dn != NULL ) {
                free( op->o_dn );
-               op->o_dn = NULL;
+               op->o_dn = ch_strdup( "" );
+       }
+
+       if ( op->o_ndn != NULL ) {
+               free( op->o_ndn );
+               op->o_ndn = ch_strdup( "" );
        }
 
        /*
@@ -103,11 +102,14 @@ do_bind(
 
        if ( tag == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
-                   "decoding error" );
+               send_ldap_disconnect( conn, op,
+                       LDAP_PROTOCOL_ERROR, "decoding error" );
+               rc = -1;
                goto cleanup;
        }
 
+       op->o_protocol = version;
+
        if( method != LDAP_AUTH_SASL ) {
                tag = ber_scanf( ber, /*{*/ "o}", &cred );
 
@@ -129,17 +131,17 @@ do_bind(
        }
 
        if ( tag == LBER_ERROR ) {
-               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
+               send_ldap_disconnect( conn, op,
+                       LDAP_PROTOCOL_ERROR,
                "decoding error" );
+               rc = -1;
                goto cleanup;
        }
 
-#ifdef GET_CTRLS
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
                goto cleanup;
        } 
-#endif
 
        if( method == LDAP_AUTH_SASL ) {
                Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
@@ -152,12 +154,12 @@ do_bind(
        ndn = dn_normalize_case( ch_strdup( cdn ) );
 
        Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d BIND dn=\"%s\" method=%d\n",
-           conn->c_connid, op->o_opid, ndn, method, 0 );
+           op->o_connid, op->o_opid, ndn, method, 0 );
 
        if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
                Debug( LDAP_DEBUG_ANY, "unknown version %d\n", version, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
-                   "version not supported" );
+               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+                       NULL, "version not supported", NULL, NULL );
                goto cleanup;
        }
 
@@ -165,8 +167,9 @@ do_bind(
                if ( version < LDAP_VERSION3 ) {
                        Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%d\n",
                                version, 0, 0 );
-                       send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
-                               "sasl bind requires LDAPv3" );
+                       send_ldap_disconnect( conn, op,
+                               LDAP_PROTOCOL_ERROR, "sasl bind requires LDAPv3" );
+                       rc = -1;
                        goto cleanup;
                }
 
@@ -175,7 +178,7 @@ do_bind(
                                "do_bind: no sasl mechanism provided\n",
                                version, 0, 0 );
                        send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED,
-                               NULL, "no sasl mechanism provided" );
+                               NULL, "no sasl mechanism provided", NULL, NULL );
                        goto cleanup;
                }
 
@@ -184,7 +187,7 @@ do_bind(
                                "do_bind: sasl mechanism \"%s\" not supported.\n",
                                mech, 0, 0 );
                        send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED,
-                               NULL, "sasl mechanism not supported" );
+                               NULL, "sasl mechanism not supported", NULL, NULL );
                        goto cleanup;
                }
 
@@ -239,7 +242,8 @@ do_bind(
                 * we already forced connection to "anonymous", we just
                 * need to send success
                 */
-               send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
                goto cleanup;
        }
 
@@ -252,15 +256,15 @@ do_bind(
        if ( (be = select_backend( ndn )) == NULL ) {
                if ( cred.bv_len == 0 ) {
                        send_ldap_result( conn, op, LDAP_SUCCESS,
-                               NULL, NULL );
+                               NULL, NULL, NULL, NULL );
 
-               } else if ( default_referral && *default_referral ) {
-                       send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS,
-                               NULL, default_referral );
+               } else if ( default_referral ) {
+                       send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+                               NULL, NULL, default_referral, NULL );
 
                } else {
                        send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
-                               NULL, default_referral );
+                               NULL, NULL, NULL, NULL );
                }
 
                goto cleanup;
@@ -270,8 +274,6 @@ do_bind(
                /* alias suffix */
                char *edn;
 
-               ndn = suffixAlias( ndn, op, be );
-
                if ( (*be->be_bind)( be, conn, op, ndn, method, mech, &cred, &edn ) == 0 ) {
                        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
@@ -291,15 +293,16 @@ do_bind(
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
                        /* send this here to avoid a race condition */
-                       send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL );
+                       send_ldap_result( conn, op, LDAP_SUCCESS,
+                               NULL, NULL, NULL, NULL );
 
                } else if (edn != NULL) {
                        free( edn );
                }
 
        } else {
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "Function not implemented" );
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "Function not implemented", NULL, NULL );
        }
 
 cleanup: