]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bind.c
Fix last commit.
[openldap] / servers / slapd / bind.c
index f54461363df926d8990243b975408cba71f6ac0b..9d8f6ba159786fa900a97ebddd1d28411befb35f 100644 (file)
@@ -1,7 +1,7 @@
 /* bind.c - decode an ldap bind operation and pass it to a backend db */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -33,54 +33,45 @@ do_bind(
     Operation  *op
 )
 {
-       BerElement      *ber = op->o_ber;
-       ber_int_t               version;
+       BerElement *ber = op->o_ber;
+       ber_int_t version;
        ber_tag_t method;
-       char            *mech;
-       char            *dn;
-       char *ndn;
-       ber_tag_t       tag;
-       int                     rc = LDAP_SUCCESS;
-       char    *text;
-       struct berval   cred;
-       Backend         *be;
-
+       struct berval mech = { 0, NULL };
+       struct berval dn = { 0, NULL };
+       struct berval pdn = { 0, NULL };
+       struct berval ndn = { 0, NULL };
+       struct berval edn = { 0, NULL };
+       ber_tag_t tag;
+       int     rc = LDAP_SUCCESS;
+       const char *text;
+       struct berval cred = { 0, NULL };
+       Backend *be = NULL;
+
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ENTRY, "do_bind: conn %d\n", conn->c_connid, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
-
-       dn = NULL;
-       ndn = NULL;
-       mech = NULL;
-       cred.bv_val = NULL;
-
-       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+#endif
 
        /*
         * Force to connection to "anonymous" until bind succeeds.
         */
-
-       if ( conn->c_cdn != NULL ) {
-               free( conn->c_cdn );
-               conn->c_cdn = NULL;
-       }
-
-       if ( conn->c_dn != NULL ) {
-               free( conn->c_dn );
-               conn->c_dn = NULL;
-       }
-
-       conn->c_authc_backend = NULL;
-       conn->c_authz_backend = NULL;
-
+       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+       if ( conn->c_sasl_bind_in_progress ) be = conn->c_authz_backend;
+       connection2anonymous( conn );
+       if ( conn->c_sasl_bind_in_progress ) conn->c_authz_backend = be;
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
-       if ( op->o_dn != NULL ) {
-               free( op->o_dn );
-               op->o_dn = ch_strdup( "" );
+       if ( op->o_dn.bv_val != NULL ) {
+               free( op->o_dn.bv_val );
+               op->o_dn.bv_val = ch_strdup( "" );
+               op->o_dn.bv_len = 0;
        }
 
-       if ( op->o_ndn != NULL ) {
-               free( op->o_ndn );
-               op->o_ndn = ch_strdup( "" );
+       if ( op->o_ndn.bv_val != NULL ) {
+               free( op->o_ndn.bv_val );
+               op->o_ndn.bv_val = ch_strdup( "" );
+               op->o_ndn.bv_len = 0;
        }
 
        /*
@@ -98,15 +89,20 @@ do_bind(
         *      }
         *
         *      SaslCredentials ::= SEQUENCE {
-     *         mechanism           LDAPString,
-     *         credentials         OCTET STRING OPTIONAL
+     *         mechanism           LDAPString,
+     *         credentials         OCTET STRING OPTIONAL
         *      }
         */
 
-       tag = ber_scanf( ber, "{iat" /*}*/, &version, &dn, &method );
+       tag = ber_scanf( ber, "{imt" /*}*/, &version, &dn, &method );
 
        if ( tag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_bind: conn %d  ber_scanf failed\n", conn->c_connid, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
+#endif
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
                rc = -1;
@@ -116,17 +112,21 @@ do_bind(
        op->o_protocol = version;
 
        if( method != LDAP_AUTH_SASL ) {
-               tag = ber_scanf( ber, /*{*/ "o}", &cred );
+               tag = ber_scanf( ber, /*{*/ "m}", &cred );
 
        } else {
-               tag = ber_scanf( ber, "{a" /*}*/, &mech );
+               tag = ber_scanf( ber, "{o" /*}*/, &mech );
 
                if ( tag != LBER_ERROR ) {
                        ber_len_t len;
                        tag = ber_peek_tag( ber, &len );
 
                        if ( tag == LDAP_TAG_LDAPCRED ) { 
-                               tag = ber_scanf( ber, "o", &cred );
+                               tag = ber_scanf( ber, "m", &cred );
+                       } else {
+                               tag = LDAP_TAG_LDAPCRED;
+                               cred.bv_val = NULL;
+                               cred.bv_len = 0;
                        }
 
                        if ( tag != LBER_ERROR ) {
@@ -138,42 +138,81 @@ 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, INFO, 
+                       "do_bind: conn %d  get_ctrls failed\n", conn->c_connid, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
+#endif
                goto cleanup;
        } 
 
-       ndn = ch_strdup( dn );
-
-       if ( dn_normalize( ndn ) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n", dn, 0, 0 );
+       rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
+       if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "do_bind: conn %d  invalid dn (%s)\n", 
+                       conn->c_connid, dn.bv_val, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n",
+                       dn.bv_val, 0, 0 );
+#endif
                send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
                    "invalid DN", NULL, NULL );
                goto cleanup;
        }
 
        if( method == LDAP_AUTH_SASL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION,     DETAIL1, 
+                       "do_sasl_bind: conn %d  dn (%s) mech %s\n", 
+                       conn->c_connid, pdn.bv_val, mech.bv_val );
+#else
                Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
-                       dn, mech, NULL );
+                       pdn.bv_val, mech.bv_val, NULL );
+#endif
+
        } else {
-               Debug( LDAP_DEBUG_TRACE, "do_bind: version=%ld dn=\"%s\" method=%ld\n",
-                       (unsigned long) version, dn, (unsigned long) method );
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, DETAIL1, 
+                       "do_bind: version=%ld dn=\"%s\" method=%ld\n",
+                       (unsigned long) version, pdn.bv_val, (unsigned long)method );
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "do_bind: version=%ld dn=\"%s\" method=%ld\n",
+                       (unsigned long) version,
+                       pdn.bv_val, (unsigned long) method );
+#endif
        }
 
-       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 );
+       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu BIND dn=\"%s\" method=%ld\n",
+           op->o_connid, op->o_opid, pdn.bv_val, (unsigned long) method, 0 );
 
        if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "do_bind: conn %d  unknown version = %ld\n",
+                       conn->c_connid, (unsigned long)version, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
                        (unsigned long) version, 0, 0 );
+#endif
                send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
                        NULL, "requested protocol version not supported", NULL, NULL );
                goto cleanup;
+
+       } else if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
+               version < LDAP_VERSION3 )
+       {
+               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+                       NULL, "requested protocol version not allowed", NULL, NULL );
+               goto cleanup;
        }
 
        /* we set connection version regardless of whether bind succeeds
@@ -183,82 +222,122 @@ do_bind(
        conn->c_protocol = version;
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
+       /* check for inappropriate controls */
+       if( get_manageDSAit( op ) == SLAP_CRITICAL_CONTROL ) {
+               send_ldap_result( conn, op,
+                       rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
+                       NULL, "manageDSAit control inappropriate",
+                       NULL, NULL );
+               goto cleanup;
+       }
+
+       /* Set the bindop for the benefit of in-directory SASL lookups */
+       ldap_pvt_thread_mutex_lock( &conn->c_sasl_bindmutex );
+       conn->c_sasl_bindop = op;
+
        if ( method == LDAP_AUTH_SASL ) {
-               char *edn;
+               slap_ssf_t ssf = 0;
 
                if ( version < LDAP_VERSION3 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, INFO, 
+                               "do_bind: conn %d  sasl with LDAPv%ld\n",
+                               conn->c_connid, (unsigned long)version , 0 );
+#else
                        Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
                                (unsigned long) version, 0, 0 );
+#endif
                        send_ldap_disconnect( conn, op,
                                LDAP_PROTOCOL_ERROR, "SASL bind requires LDAPv3" );
                        rc = SLAPD_DISCONNECT;
                        goto cleanup;
                }
 
-               if( mech == NULL || *mech == '\0' ) {
+               if( mech.bv_len == 0 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, INFO, 
+                                  "do_bind: conn %d  no SASL mechanism provided\n",
+                                  conn->c_connid, 0, 0 );
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "do_bind: no sasl mechanism provided\n",
                                0, 0, 0 );
+#endif
                        send_ldap_result( conn, op, rc = LDAP_AUTH_METHOD_NOT_SUPPORTED,
                                NULL, "no SASL mechanism provided", NULL, NULL );
                        goto cleanup;
                }
 
-               if( !charray_inlist( supportedSASLMechanisms, mech ) ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "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, NULL );
+               /* 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_mech != NULL ) {
-                       if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
-                               /* mechanism changed, cancel in progress bind */
-#ifdef HAVE_CYRUS_SASL
-                               sasl_dispose(&conn->c_sasl_bind_context);
-                               conn->c_sasl_bind_context = NULL;
-#endif
+               if ( conn->c_sasl_bind_in_progress ) {
+                       if((ber_bvcmp(&conn->c_sasl_bind_mech, &mech) != 0)) {
+                               /* mechanism changed between bind steps */
+                               slap_sasl_reset(conn);
                        }
-                       free( conn->c_sasl_bind_mech );
-                       conn->c_sasl_bind_mech = NULL;
-
-#ifdef LDAP_DEBUG
-#ifdef HAVE_CYRUS_SASL
                } else {
-                       assert( conn->c_sasl_bind_context == NULL );
-#endif
-#endif
+                       conn->c_sasl_bind_mech = mech;
+                       mech.bv_val = NULL;
+                       mech.bv_len = 0;
                }
-
                ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
-               edn = NULL;
-               rc = sasl_bind( conn, op, dn, ndn, mech, &cred, &edn );
+               rc = slap_sasl_bind( conn, op,
+                       &pdn, &ndn,
+                       &cred, &edn, &ssf );
 
+               ldap_pvt_thread_mutex_lock( &conn->c_mutex );
                if( rc == LDAP_SUCCESS ) {
-                       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-#ifdef HAVE_CYRUS_SASL
-                       assert( conn->c_sasl_bind_context == NULL );
-#endif
                        conn->c_dn = edn;
-                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+                       if( edn.bv_len != 0 ) {
+                               /* edn is always normalized already */
+                               ber_dupbv( &conn->c_ndn, &conn->c_dn );
+                       }
+                       conn->c_authmech = conn->c_sasl_bind_mech;
+                       conn->c_sasl_bind_mech.bv_val = NULL;
+                       conn->c_sasl_bind_mech.bv_len = 0;
+                       conn->c_sasl_bind_in_progress = 0;
+
+                       conn->c_sasl_ssf = ssf;
+                       if( ssf > conn->c_ssf ) {
+                               conn->c_ssf = ssf;
+                       }
 
-               } else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {
-#ifdef HAVE_CYRUS_SASL
-                       assert( conn->c_sasl_bind_context != NULL );
+                       if( conn->c_dn.bv_len != 0 ) {
+                               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, DETAIL1, 
+                               "do_bind: SASL/%s bind: dn=\"%s\" ssf=%d\n",
+                               conn->c_authmech.bv_val, conn->c_dn.bv_val, ssf );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "do_bind: SASL/%s bind: dn=\"%s\" ssf=%d\n",
+                               conn->c_authmech.bv_val, conn->c_dn.bv_val, ssf );
 #endif
-                       conn->c_sasl_bind_mech = mech;
-                       mech = NULL;
 
-#ifdef HAVE_CYRUS_SASL
+               } else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {
+                       conn->c_sasl_bind_in_progress = 1;
+
                } else {
-                       assert( conn->c_sasl_bind_context != NULL );
-#endif
+                       if ( conn->c_sasl_bind_mech.bv_val ) {
+                               free( conn->c_sasl_bind_mech.bv_val );
+                               conn->c_sasl_bind_mech.bv_val = NULL;
+                               conn->c_sasl_bind_mech.bv_len = 0;
+                       }
+                       conn->c_sasl_bind_in_progress = 0;
                }
+               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
                goto cleanup;
 
@@ -266,37 +345,138 @@ do_bind(
                /* Not SASL, cancel any in-progress bind */
                ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
-               if ( conn->c_sasl_bind_mech != NULL ) {
-                       assert( conn->c_sasl_bind_in_progress );
+               if ( conn->c_sasl_bind_mech.bv_val != NULL ) {
+                       free(conn->c_sasl_bind_mech.bv_val);
+                       conn->c_sasl_bind_mech.bv_val = NULL;
+                       conn->c_sasl_bind_mech.bv_len = 0;
+               }
+               conn->c_sasl_bind_in_progress = 0;
+
+               slap_sasl_reset( conn );
+               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+       }
+
+       if ( method == LDAP_AUTH_SIMPLE ) {
+               /* accept "anonymous" binds */
+               if ( cred.bv_len == 0 || ndn.bv_len == 0 ) {
+                       rc = LDAP_SUCCESS;
+                       text = NULL;
+
+                       if( cred.bv_len &&
+                               !( global_allows & SLAP_ALLOW_BIND_ANON_CRED ))
+                       {
+                               /* cred is not empty, disallow */
+                               rc = LDAP_INVALID_CREDENTIALS;
+
+                       } else if ( ndn.bv_len &&
+                               !( global_allows & SLAP_ALLOW_BIND_ANON_DN ))
+                       {
+                               /* DN is not empty, disallow */
+                               rc = LDAP_UNWILLING_TO_PERFORM;
+                               text = "unwilling to allow anonymous bind with non-empty DN";
+
+                       } else if ( global_disallows & SLAP_DISALLOW_BIND_ANON ) {
+                               /* disallow */
+                               rc = LDAP_INAPPROPRIATE_AUTH;
+                               text = "anonymous bind disallowed";
 
-                       free(conn->c_sasl_bind_mech);
-                       conn->c_sasl_bind_mech = NULL;
+                       } else {
+                               rc = backend_check_restrictions( NULL, conn, op,
+                                       &mech, &text );
+                       }
 
-#ifdef HAVE_CYRUS_SASL
-                       assert( conn->c_sasl_bind_context != NULL );
-                       sasl_dispose(&conn->c_sasl_bind_context);
-                       conn->c_sasl_bind_context = NULL;
+                       /*
+                        * we already forced connection to "anonymous",
+                        * just need to send success
+                        */
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, DETAIL1, 
+                                  "do_bind: conn %d  v%d anonymous bind\n",
+                                  conn->c_connid, version , 0 );
+#else
+                       Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
+                               version, 0, 0 );
 #endif
-               } else {
-                       assert( !conn->c_sasl_bind_in_progress );
-#ifdef HAVE_CYRUS_SASL
-                       assert( conn->c_sasl_bind_context == NULL );
+                       goto cleanup;
+
+               } else if ( global_disallows & SLAP_DISALLOW_BIND_SIMPLE ) {
+                       /* disallow simple authentication */
+                       rc = LDAP_UNWILLING_TO_PERFORM;
+                       text = "unwilling to perform simple authentication";
+
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, INFO, 
+                                  "do_bind: conn %d  v%d simple bind(%s) disallowed\n",
+                                  conn->c_connid, version, ndn.bv_val );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "do_bind: v%d simple bind(%s) disallowed\n",
+                               version, ndn.bv_val, 0 );
+#endif
+                       goto cleanup;
+
+               } else if (( global_disallows & SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED )
+                       && ( op->o_ssf < global_ssf_set.sss_ssf ))
+               {
+                       rc = LDAP_CONFIDENTIALITY_REQUIRED;
+                       text = "unwilling to perform simple authentication "
+                               "without confidentilty protection";
+
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, INFO, "do_bind: conn %d  "
+                               "v%d unprotected simple bind(%s) disallowed\n",
+                               conn->c_connid, version, ndn.bv_val );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "do_bind: v%d unprotected simple bind(%s) disallowed\n",
+                               version, ndn.bv_val, 0 );
 #endif
+                       goto cleanup;
                }
 
-               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-       }
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+       } else if ( method == LDAP_AUTH_KRBV41 || method == LDAP_AUTH_KRBV42 ) {
+               if ( global_disallows & SLAP_DISALLOW_BIND_KRBV4 ) {
+                       /* disallow simple authentication */
+                       rc = LDAP_UNWILLING_TO_PERFORM;
+                       text = "unwilling to perform Kerberos V4 bind";
+
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+                       LDAP_LOG( OPERATION, DETAIL1, 
+                                  "do_bind: conn %d  v%d Kerberos V4 bind\n",
+                                  conn->c_connid, version , 0 );
+#else
+                       Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n",
+                               version, 0, 0 );
+#endif
+                       goto cleanup;
+               }
+#endif
+
+       } else {
+               rc = LDAP_AUTH_METHOD_NOT_SUPPORTED;
+               text = "unknown authentication method";
 
-       /* accept "anonymous" binds */
-       if ( cred.bv_len == 0 || ndn == NULL || *ndn == '\0' ) {
-               /*
-                * we already forced connection to "anonymous",
-                * just need to send success
-                */
-               send_ldap_result( conn, op, LDAP_SUCCESS,
-                       NULL, NULL, NULL, NULL );
-               Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
-                       version, 0, 0 );
+               send_ldap_result( conn, op, rc,
+                       NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                          "do_bind: conn %ld  v%d unknown authentication method (%ld)\n",
+                          conn->c_connid, version, method );
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "do_bind: v%d unknown authentication method (%ld)\n",
+                       version, method, 0 );
+#endif
                goto cleanup;
        }
 
@@ -306,10 +486,15 @@ do_bind(
         * if we don't hold it.
         */
 
-       if ( (be = select_backend( ndn )) == NULL ) {
+       if ( (be = select_backend( &ndn, 0, 0 )) == NULL ) {
                if ( default_referral ) {
+                       BerVarray ref = referral_rewrite( default_referral,
+                               NULL, &pdn, LDAP_SCOPE_DEFAULT );
+
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                               NULL, NULL, default_referral, NULL );
+                               NULL, NULL, ref ? ref : default_referral, NULL );
+
+                       ber_bvarray_free( ref );
 
                } else {
                        /* noSuchObject is not allowed to be returned by bind */
@@ -320,11 +505,8 @@ do_bind(
                goto cleanup;
        }
 
-       conn->c_authz_backend = be;
-
-       /* make sure this backend recongizes critical controls */
-       rc = backend_check_controls( be, conn, op, &text ) ;
-
+       /* check restrictions */
+       rc = backend_check_restrictions( be, conn, op, NULL, &text );
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );
@@ -333,30 +515,47 @@ do_bind(
 
        if ( be->be_bind ) {
                int ret;
-               /* alias suffix */
-               char *edn = NULL;
 
                /* deref suffix alias if appropriate */
-               ndn = suffix_alias( be, ndn );
+               suffix_alias( be, &ndn );
 
-               ret = (*be->be_bind)( be, conn, op, dn, ndn,
-                       method, mech, &cred, &edn );
+               ret = (*be->be_bind)( be, conn, op,
+                       &pdn, &ndn, method, &cred, &edn );
 
                if ( ret == 0 ) {
                        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
-                       conn->c_cdn = dn;
-                       dn = NULL;
+                       if( conn->c_authz_backend == NULL ) {
+                               conn->c_authz_backend = be;
+                       }
 
-                       if(edn != NULL) {
+                       if(edn.bv_len) {
                                conn->c_dn = edn;
                        } else {
-                               conn->c_dn = ndn;
-                               ndn = NULL;
+                               conn->c_dn = pdn;
+                               pdn.bv_val = NULL;
+                               pdn.bv_len = 0;
                        }
 
-                       Debug( LDAP_DEBUG_TRACE, "do_bind: v%d bind: \"%s\" to \"%s\"\n",
-                       version, conn->c_cdn, conn->c_dn );
+                       conn->c_ndn = ndn;
+                       ndn.bv_val = NULL;
+                       ndn.bv_len = 0;
+
+                       if( conn->c_dn.bv_len != 0 ) {
+                               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, DETAIL1, 
+                               "do_bind: v%d bind: \"%s\" to \"%s\" \n",
+                               version, conn->c_dn.bv_val, conn->c_dn.bv_val );
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "do_bind: v%d bind: \"%s\" to \"%s\"\n",
+                               version, dn.bv_val, conn->c_dn.bv_val );
+#endif
 
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
@@ -364,27 +563,30 @@ do_bind(
                        send_ldap_result( conn, op, LDAP_SUCCESS,
                                NULL, NULL, NULL, NULL );
 
-               } else if (edn != NULL) {
-                       free( edn );
+               } else if (edn.bv_val != NULL) {
+                       free( edn.bv_val );
                }
 
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "operation not supported within namingContext", NULL, NULL );
+                       NULL, "operation not supported within namingContext",
+                       NULL, NULL );
        }
 
 cleanup:
-       if( dn != NULL ) {
-               free( dn );
+       if( conn->c_sasl_bindop != NULL ) {
+               conn->c_sasl_bindop = NULL;
+               ldap_pvt_thread_mutex_unlock( &conn->c_sasl_bindmutex );
        }
-       if( ndn != NULL ) {
-               free( ndn );
+
+       if( pdn.bv_val != NULL ) {
+               free( pdn.bv_val );
        }
-       if ( mech != NULL ) {
-               free( mech );
+       if( ndn.bv_val != NULL ) {
+               free( ndn.bv_val );
        }
-       if ( cred.bv_val != NULL ) {
-               free( cred.bv_val );
+       if ( mech.bv_val != NULL ) {
+               free( mech.bv_val );
        }
 
        return rc;