]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bind.c
minor cleanup
[openldap] / servers / slapd / bind.c
index 6d5c39bb3c1654a3ac3a602095d460567e8dbfe8..6480cf7fb82b5fcaa375e44e08ab3e2a9737df07 100644 (file)
@@ -46,7 +46,7 @@ do_bind(
        Backend         *be;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "do_bind: conn %d\n", conn->c_connid ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "do_bind: conn %d\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
 #endif
@@ -88,8 +88,8 @@ do_bind(
         *      }
         *
         *      SaslCredentials ::= SEQUENCE {
-     *         mechanism           LDAPString,
-     *         credentials         OCTET STRING OPTIONAL
+     *         mechanism           LDAPString,
+     *         credentials         OCTET STRING OPTIONAL
         *      }
         */
 
@@ -97,8 +97,8 @@ do_bind(
 
        if ( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_bind: conn %d  ber_scanf failed\n", conn->c_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_bind: conn %d  ber_scanf failed\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -137,15 +137,15 @@ do_bind(
        if ( tag == LBER_ERROR ) {
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR,
-               "decoding error" );
+               "decoding error" );
                rc = SLAPD_DISCONNECT;
                goto cleanup;
        }
 
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_bind: conn %d  get_ctrls failed\n", conn->c_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_bind: conn %d  get_ctrls failed\n", conn->c_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
 #endif
@@ -156,8 +156,8 @@ do_bind(
 
        if ( dn_normalize( ndn ) == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_bind: conn %d  invalid dn (%s)\n", conn->c_connid, dn ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_bind: conn %d  invalid dn (%s)\n", conn->c_connid, dn ));
 #else
                Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n", dn, 0, 0 );
 #endif
@@ -168,32 +168,32 @@ do_bind(
 
        if( method == LDAP_AUTH_SASL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation",  LDAP_LEVEL_DETAIL1,
-                       "do_sasl_bind: conn %d  dn (%s) mech %s\n", conn->c_connid,
-                       dn, mech ));
+               LDAP_LOG(( "operation",  LDAP_LEVEL_DETAIL1,
+                          "do_sasl_bind: conn %d  dn (%s) mech %s\n", conn->c_connid,
+                          dn, mech ));
 #else
                Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
                        dn, mech, NULL );
 #endif
        } else {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                       "do_bind: conn %d  version=%ld dn=\"%s\" method=%ld\n",
-                       conn->c_connid, (unsigned long) version, dn, (unsigned long)method ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                          "do_bind: conn %d  version=%ld dn=\"%s\" method=%ld\n",
+                          conn->c_connid, (unsigned long) version, dn, (unsigned long)method ));
 #else
                Debug( LDAP_DEBUG_TRACE, "do_bind: version=%ld dn=\"%s\" method=%ld\n",
                        (unsigned long) version, dn, (unsigned long) method );
 #endif
        }
 
-        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
+       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 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_bind: conn %d  unknown version = %ld\n",
-                       conn->c_connid, (unsigned long)version ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_bind: conn %d  unknown version = %ld\n",
+                          conn->c_connid, (unsigned long)version ));
 #else
                Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
                        (unsigned long) version, 0, 0 );
@@ -223,9 +223,9 @@ do_bind(
 
                if ( version < LDAP_VERSION3 ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                               "do_bind: conn %d  sasl with LDAPv%ld\n",
-                               conn->c_connid, (unsigned long)version ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "do_bind: conn %d  sasl with LDAPv%ld\n",
+                                  conn->c_connid, (unsigned long)version ));
 #else
                        Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
                                (unsigned long) version, 0, 0 );
@@ -238,9 +238,9 @@ do_bind(
 
                if( mech == NULL || *mech == '\0' ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                               "do_bind: conn %d  no SASL mechanism provided\n",
-                               conn->c_connid ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "do_bind: conn %d  no SASL mechanism provided\n",
+                                  conn->c_connid ));
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "do_bind: no sasl mechanism provided\n",
@@ -251,6 +251,14 @@ do_bind(
                        goto cleanup;
                }
 
+               /* check restrictions */
+               rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+               if( rc != LDAP_SUCCESS ) {
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+                       goto cleanup;
+               }
+
                ldap_pvt_thread_mutex_lock( &conn->c_mutex );
                if ( conn->c_sasl_bind_in_progress ) {
                        if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
@@ -272,10 +280,18 @@ do_bind(
                        conn->c_authmech = conn->c_sasl_bind_mech;
                        conn->c_sasl_bind_mech = NULL;
                        conn->c_sasl_bind_in_progress = 0;
+
                        conn->c_sasl_ssf = ssf;
                        if( ssf > conn->c_ssf ) {
                                conn->c_ssf = ssf;
                        }
+
+                       if( conn->c_dn != NULL ) {
+                               ber_len_t max = sockbuf_max_incoming;
+                               ber_sockbuf_ctrl( conn->c_sb,
+                                       LBER_SB_OPT_SET_MAX_INCOMING, &max );
+                       }
+
                } else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {
                        conn->c_sasl_bind_in_progress = 1;
 
@@ -327,6 +343,9 @@ do_bind(
                                /* disallow */
                                rc = LDAP_INAPPROPRIATE_AUTH;
                                text = "anonymous bind disallowed";
+
+                       } else {
+                               rc = backend_check_restrictions( NULL, conn, op, mech, &text );
                        }
 
                        /*
@@ -336,12 +355,12 @@ do_bind(
                        send_ldap_result( conn, op, rc,
                                NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
-                        LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                                   "do_bind: conn %d  v%d anonymous bind\n",
-                                   conn->c_connid, version ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                                  "do_bind: conn %d  v%d anonymous bind\n",
+                                  conn->c_connid, version ));
 #else
                        Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
-                               version, 0, 0 );
+                               version, 0, 0 );
 #endif
                        goto cleanup;
 
@@ -353,13 +372,13 @@ do_bind(
                        send_ldap_result( conn, op, rc,
                                NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
-                        LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                                   "do_bind: conn %d  v%d simple bind(%s) disallowed\n",
-                                   conn->c_connid, version, ndn ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "do_bind: conn %d  v%d simple bind(%s) disallowed\n",
+                                  conn->c_connid, version, ndn ));
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "do_bind: v%d simple bind(%s) disallowed\n",
-                               version, ndn, 0 );
+                               version, ndn, 0 );
 #endif
                        goto cleanup;
                }
@@ -374,9 +393,9 @@ do_bind(
                        send_ldap_result( conn, op, rc,
                                NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
-                        LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                                   "do_bind: conn %d  v%d Kerberos V4 bind\n",
-                                   conn->c_connid, version ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                                  "do_bind: conn %d  v%d Kerberos V4 bind\n",
+                                  conn->c_connid, version ));
 #else
                        Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n",
                                version, 0, 0 );
@@ -392,9 +411,9 @@ do_bind(
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                           "do_bind: conn %d  v%d unknown authentication method (%d)\n",
-                           conn->c_connid, version, method ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_bind: conn %d  v%d unknown authentication method (%d)\n",
+                          conn->c_connid, version, method ));
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "do_bind: v%d unknown authentication method (%d)\n",
@@ -411,8 +430,13 @@ do_bind(
 
        if ( (be = select_backend( ndn, 0 )) == NULL ) {
                if ( default_referral ) {
+                       struct berval **ref = referral_rewrite( default_referral,
+                               NULL, dn, LDAP_SCOPE_DEFAULT );
+
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                               NULL, NULL, default_referral, NULL );
+                               NULL, NULL, ref ? ref : default_referral, NULL );
+
+                       ber_bvecfree( ref );
 
                } else {
                        /* noSuchObject is not allowed to be returned by bind */
@@ -424,7 +448,7 @@ do_bind(
        }
 
        /* check restrictions */
-       rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
+       rc = backend_check_restrictions( be, conn, op, NULL, &text );
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );
@@ -457,13 +481,19 @@ do_bind(
                                ndn = NULL;
                        }
 
+                       if( conn->c_dn != NULL ) {
+                               ber_len_t max = sockbuf_max_incoming;
+                               ber_sockbuf_ctrl( conn->c_sb,
+                                       LBER_SB_OPT_SET_MAX_INCOMING, &max );
+                       }
+
 #ifdef NEW_LOGGING
-                        LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-                                   "do_bind: conn %d  v%d bind: \"%s\" to \"%s\" \n",
-                                   conn->c_connid, version, conn->c_cdn, conn->c_dn ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                                  "do_bind: conn %d  v%d bind: \"%s\" to \"%s\" \n",
+                                  conn->c_connid, version, conn->c_cdn, conn->c_dn ));
 #else
                        Debug( LDAP_DEBUG_TRACE, "do_bind: v%d bind: \"%s\" to \"%s\"\n",
-                       version, conn->c_cdn, conn->c_dn );
+                       version, conn->c_cdn, conn->c_dn );
 #endif
 
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );