]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bind.c
Add LDAPsubentry (without OID).
[openldap] / servers / slapd / bind.c
index 9d721a71e09565c475e57221a3b9413811b42d7c..262dd3c4b8cb773d354a02a131d9b8da5d090d66 100644 (file)
@@ -1,4 +1,8 @@
 /* bind.c - decode an ldap bind operation and pass it to a backend db */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
 
 #include "slap.h"
 
-char *supportedSASLMechanisms[] = {
-       "X-CRAM-MD5",
-       "X-DIGEST-MD5",
-       NULL
-};
-
 int
 do_bind(
     Connection *conn,
@@ -37,7 +35,7 @@ do_bind(
        ber_int_t               version;
        ber_tag_t method;
        char            *mech;
-       char            *cdn, *ndn;
+       char            *dn, *ndn;
        ber_tag_t       tag;
        int                     rc = LDAP_SUCCESS;
        struct berval   cred;
@@ -45,7 +43,7 @@ do_bind(
 
        Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
 
-       cdn = NULL;
+       dn = NULL;
        ndn = NULL;
        mech = NULL;
        cred.bv_val = NULL;
@@ -69,14 +67,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( "" );
        }
 
        /*
@@ -99,15 +97,27 @@ do_bind(
         *      }
         */
 
-       tag = ber_scanf( ber, "{iat" /*}*/, &version, &cdn, &method );
+       tag = ber_scanf( ber, "{iat" /*}*/, &version, &dn, &method );
 
        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;
+       }
+
+       ndn = ch_strdup( dn );
+
+       if ( dn_normalize_case( ndn ) == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n", dn, 0, 0 );
+               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+                   "invalid DN", NULL, NULL );
                goto cleanup;
        }
 
+       op->o_protocol = version;
+
        if( method != LDAP_AUTH_SASL ) {
                tag = ber_scanf( ber, /*{*/ "o}", &cred );
 
@@ -129,35 +139,33 @@ 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",
-                       cdn, mech, NULL );
+                       dn, mech, NULL );
        } else {
                Debug( LDAP_DEBUG_TRACE, "do_bind: version %d dn (%s) method %d\n",
-                       version, cdn, method );
+                       version, dn, method );
        }
 
-       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 );
+       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
+           op->o_connid, op->o_opid, ndn, (unsigned long) 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 +173,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 +184,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 +193,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 +248,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 +262,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,13 +280,14 @@ do_bind(
                /* alias suffix */
                char *edn;
 
-               ndn = suffixAlias( ndn, op, be );
+               /* deref suffix alias if appropriate */
+               ndn = suffix_alias( be, ndn );
 
                if ( (*be->be_bind)( be, conn, op, ndn, method, mech, &cred, &edn ) == 0 ) {
                        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
-                       conn->c_cdn = cdn;
-                       cdn = NULL;
+                       conn->c_cdn = dn;
+                       dn = NULL;
 
                        if(edn != NULL) {
                                conn->c_dn = edn;
@@ -291,20 +302,21 @@ 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:
-       if( cdn != NULL ) {
-               free( cdn );
+       if( dn != NULL ) {
+               free( dn );
        }
        if( ndn != NULL ) {
                free( ndn );