]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bind.c
Set SLAPI_BIND_CREDENTIALS for bind preoperation plugin
[openldap] / servers / slapd / bind.c
index d980c36bb083957c0d27a185acfbbd1d698a1da0..d7b1cf36ec52eb90781b3bfcdbee17c0294106eb 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-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,6 +18,7 @@
  */
 
 #include "portable.h"
+#include "slapi_common.h"
 
 #include <stdio.h>
 
@@ -26,6 +27,8 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#include "slapi.h"
+
 
 int
 do_bind(
@@ -36,19 +39,21 @@ do_bind(
        BerElement *ber = op->o_ber;
        ber_int_t version;
        ber_tag_t method;
-       char *mech = NULL;
+       struct berval mech = { 0, NULL };
        struct berval dn = { 0, NULL };
-       struct berval *pdn = NULL;
-       struct berval *ndn = 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;
+       Backend *be = NULL;
+
+       Slapi_PBlock *pb = op->o_pb;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-               "do_bind: conn %d\n", conn->c_connid ));
+       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 );
 #endif
@@ -57,7 +62,17 @@ do_bind(
         * Force to connection to "anonymous" until bind succeeds.
         */
        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+       if ( conn->c_sasl_bind_in_progress ) be = conn->c_authz_backend;
+
+       /* log authorization identity demotion */
+       if ( conn->c_dn.bv_len ) {
+               Statslog( LDAP_DEBUG_STATS,
+                       "conn=%lu op=%lu AUTHZ anonymous mech=implicit ssf=0",
+                       op->o_connid, op->o_opid, 0, 0, 0 );
+       }
+
        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.bv_val != NULL ) {
@@ -87,17 +102,17 @@ do_bind(
         *      }
         *
         *      SaslCredentials ::= SEQUENCE {
-     *         mechanism           LDAPString,
-     *         credentials         OCTET STRING OPTIONAL
+        *              mechanism           LDAPString,
+        *              credentials         OCTET STRING OPTIONAL
         *      }
         */
 
-       tag = ber_scanf( ber, "{iot" /*}*/, &version, &dn, &method );
+       tag = ber_scanf( ber, "{imt" /*}*/, &version, &dn, &method );
 
        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, 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
@@ -110,17 +125,17 @@ 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;
@@ -143,35 +158,20 @@ do_bind(
 
        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, 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;
        } 
 
-       rc = dnPretty( NULL, &dn, &pdn );
+       rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
        if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_bind: conn %d  invalid dn (%s)\n",
-                       conn->c_connid, dn.bv_val ));
-#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;
-       }
-
-       rc = dnNormalize( NULL, &dn, &ndn );
-       if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "do_bind: conn %d  invalid dn (%s)\n",
-                       conn->c_connid, dn.bv_val ));
+               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 );
@@ -183,36 +183,35 @@ 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,
-                       pdn->bv_val, mech ));
+               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",
-                       pdn->bv_val, mech, NULL );
+                       pdn.bv_val, mech.bv_val, 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,
-                       pdn->bv_val, (unsigned long)method ));
+               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 );
+                       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, pdn->bv_val, (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", LDAP_LEVEL_INFO,
+               LDAP_LOG( OPERATION, INFO, 
                        "do_bind: conn %d  unknown version = %ld\n",
-                       conn->c_connid, (unsigned long)version ));
+                       conn->c_connid, (unsigned long)version, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
                        (unsigned long) version, 0, 0 );
@@ -236,15 +235,26 @@ 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 */
+       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", LDAP_LEVEL_INFO,
+                       LDAP_LOG( OPERATION, INFO, 
                                "do_bind: conn %d  sasl with LDAPv%ld\n",
-                               conn->c_connid, (unsigned long)version ));
+                               conn->c_connid, (unsigned long)version , 0 );
 #else
                        Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
                                (unsigned long) version, 0, 0 );
@@ -255,11 +265,11 @@ do_bind(
                        goto cleanup;
                }
 
-               if( mech == NULL || *mech == '\0' ) {
+               if( mech.bv_len == 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                       LDAP_LOG( OPERATION, INFO, 
                                   "do_bind: conn %d  no SASL mechanism provided\n",
-                                  conn->c_connid ));
+                                  conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "do_bind: no sasl mechanism provided\n",
@@ -271,7 +281,7 @@ do_bind(
                }
 
                /* check restrictions */
-               rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+               rc = backend_check_restrictions( NULL, conn, op, &mech, &text );
                if( rc != LDAP_SUCCESS ) {
                        send_ldap_result( conn, op, rc,
                                NULL, text, NULL, NULL );
@@ -280,33 +290,31 @@ do_bind(
 
                ldap_pvt_thread_mutex_lock( &conn->c_mutex );
                if ( conn->c_sasl_bind_in_progress ) {
-                       if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
+                       if( !bvmatch( &conn->c_sasl_bind_mech, &mech ) ) {
                                /* mechanism changed between bind steps */
                                slap_sasl_reset(conn);
                        }
                } else {
                        conn->c_sasl_bind_mech = mech;
-                       mech = NULL;
+                       mech.bv_val = NULL;
+                       mech.bv_len = 0;
                }
                ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
-               edn = NULL;
                rc = slap_sasl_bind( conn, op,
-                       pdn->bv_val, ndn->bv_val,
+                       &pdn, &ndn,
                        &cred, &edn, &ssf );
 
                ldap_pvt_thread_mutex_lock( &conn->c_mutex );
                if( rc == LDAP_SUCCESS ) {
-                       conn->c_dn.bv_val = edn;
-                       if( edn != NULL ) {
-                               struct berval *cndn;
-                               conn->c_dn.bv_len = strlen( edn );
-                               dnNormalize( NULL, &conn->c_dn, &cndn );
-                               conn->c_ndn = *cndn;
-                               free( cndn );
+                       conn->c_dn = edn;
+                       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 = NULL;
+                       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;
@@ -315,18 +323,40 @@ do_bind(
                        }
 
                        if( conn->c_dn.bv_len != 0 ) {
-                               ber_len_t max = sockbuf_max_incoming;
+                               ber_len_t max = sockbuf_max_incoming_auth;
                                ber_sockbuf_ctrl( conn->c_sb,
                                        LBER_SB_OPT_SET_MAX_INCOMING, &max );
                        }
 
+                       /* log authorization identity */
+                       Statslog( LDAP_DEBUG_STATS,
+                               "conn=%lu op=%lu AUTHZ dn=\"%s\" mech=%s ssf=%d\n",
+                               op->o_connid, op->o_opid,
+                               conn->c_dn.bv_val ? conn->c_dn.bv_val : "<empty>",
+                               conn->c_authmech.bv_val, ssf );
+
+#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 ? conn->c_dn.bv_val : "<empty>",
+                               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 ? conn->c_dn.bv_val : "<empty>",
+                               ssf );
+#endif
+
                } else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {
                        conn->c_sasl_bind_in_progress = 1;
 
                } else {
-                       if ( conn->c_sasl_bind_mech ) {
-                               free( conn->c_sasl_bind_mech );
-                               conn->c_sasl_bind_mech = NULL;
+                       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;
                }
@@ -338,9 +368,10 @@ do_bind(
                /* Not SASL, cancel any in-progress bind */
                ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
-               if ( conn->c_sasl_bind_mech != NULL ) {
-                       free(conn->c_sasl_bind_mech);
-                       conn->c_sasl_bind_mech = NULL;
+               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;
 
@@ -350,7 +381,7 @@ do_bind(
 
        if ( method == LDAP_AUTH_SIMPLE ) {
                /* accept "anonymous" binds */
-               if ( cred.bv_len == 0 || ndn->bv_len == 0 ) {
+               if ( cred.bv_len == 0 || ndn.bv_len == 0 ) {
                        rc = LDAP_SUCCESS;
                        text = NULL;
 
@@ -360,7 +391,7 @@ do_bind(
                                /* cred is not empty, disallow */
                                rc = LDAP_INVALID_CREDENTIALS;
 
-                       } else if ( ndn->bv_len &&
+                       } else if ( ndn.bv_len &&
                                !( global_allows & SLAP_ALLOW_BIND_ANON_DN ))
                        {
                                /* DN is not empty, disallow */
@@ -373,7 +404,8 @@ do_bind(
                                text = "anonymous bind disallowed";
 
                        } else {
-                               rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+                               rc = backend_check_restrictions( NULL, conn, op,
+                                       &mech, &text );
                        }
 
                        /*
@@ -383,9 +415,9 @@ do_bind(
                        send_ldap_result( conn, op, rc,
                                NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                       LDAP_LOG( OPERATION, DETAIL1, 
                                   "do_bind: conn %d  v%d anonymous bind\n",
-                                  conn->c_connid, version ));
+                                  conn->c_connid, version , 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
                                version, 0, 0 );
@@ -400,13 +432,34 @@ do_bind(
                        send_ldap_result( conn, op, rc,
                                NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                       LDAP_LOG( OPERATION, INFO, 
                                   "do_bind: conn %d  v%d simple bind(%s) disallowed\n",
-                                  conn->c_connid, version, ndn ));
+                                  conn->c_connid, version, ndn.bv_val );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "do_bind: v%d simple bind(%s) disallowed\n",
-                               version, ndn, 0 );
+                               version, ndn.bv_val, 0 );
+#endif
+                       goto cleanup;
+
+               } else if (( global_disallows & SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED )
+                       && ( op->o_ssf <= 1 ))
+               {
+                       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;
                }
@@ -421,9 +474,9 @@ do_bind(
                        send_ldap_result( conn, op, rc,
                                NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                       LDAP_LOG( OPERATION, DETAIL1, 
                                   "do_bind: conn %d  v%d Kerberos V4 bind\n",
-                                  conn->c_connid, version ));
+                                  conn->c_connid, version , 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n",
                                version, 0, 0 );
@@ -439,9 +492,9 @@ do_bind(
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+               LDAP_LOG( OPERATION, INFO, 
                           "do_bind: conn %ld  v%d unknown authentication method (%ld)\n",
-                          conn->c_connid, version, method ));
+                          conn->c_connid, version, method );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "do_bind: v%d unknown authentication method (%ld)\n",
@@ -456,15 +509,15 @@ do_bind(
         * if we don't hold it.
         */
 
-       if ( (be = select_backend( ndn, 0, 0 )) == NULL ) {
+       if ( (be = select_backend( &ndn, 0, 0 )) == NULL ) {
                if ( default_referral ) {
-                       struct berval **ref = referral_rewrite( default_referral,
-                               NULL, pdn, LDAP_SCOPE_DEFAULT );
+                       BerVarray ref = referral_rewrite( default_referral,
+                               NULL, &pdn, LDAP_SCOPE_DEFAULT );
 
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                                NULL, NULL, ref ? ref : default_referral, NULL );
 
-                       ber_bvecfree( ref );
+                       ber_bvarray_free( ref );
 
                } else {
                        /* noSuchObject is not allowed to be returned by bind */
@@ -483,50 +536,117 @@ do_bind(
                goto cleanup;
        }
 
-       conn->c_authz_backend = be;
+#if defined( LDAP_SLAPI )
+       slapi_x_backend_set_pb( pb, be );
+       slapi_x_connection_set_pb( pb, conn );
+       slapi_x_operation_set_pb( pb, op );
+       slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)dn.bv_val );
+       slapi_pblock_set( pb, SLAPI_BIND_METHOD, (void *)method );
+       slapi_pblock_set( pb, SLAPI_BIND_CREDENTIALS, (void *)&cred );
+       slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(1) );
+
+       rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_BIND_FN, pb );
+       if ( rc != SLAPI_BIND_SUCCESS ) {
+               /*
+                * Binding is a special case for SLAPI plugins. It is
+                * possible for a bind plugin to be successful *and*
+                * abort further processing; this means it has handled
+                * a bind request authoritatively. If we have reached
+                * here, a result has been sent to the client (XXX
+                * need to check with Sun whether SLAPI_BIND_ANONYMOUS
+                * means a result has been sent).
+                */
+               int ldapRc;
+
+               if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&ldapRc ) != 0 )
+                       ldapRc = LDAP_OPERATIONS_ERROR;
+
+               edn.bv_val = NULL;
+               edn.bv_len = 0;
+               if ( rc != SLAPI_BIND_FAIL && ldapRc == LDAP_SUCCESS ) {
+                       /* Set the new connection DN. */
+                       if ( rc != SLAPI_BIND_ANONYMOUS ) {
+                               slapi_pblock_get( pb, SLAPI_CONN_DN, (void *)&edn.bv_val );
+                       }
+                       rc = dnPrettyNormal( NULL, &edn, &pdn, &ndn );
+                       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+                       conn->c_dn = pdn;
+                       conn->c_ndn = ndn;
+                       pdn.bv_val = NULL;
+                       pdn.bv_len = 0;
+                       ndn.bv_val = NULL;
+                       ndn.bv_len = 0;
+                       if ( conn->c_dn.bv_len != 0 ) {
+                               ber_len_t max = sockbuf_max_incoming_auth;
+                               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
+                       }
+                       /* log authorization identity */
+                       Statslog( LDAP_DEBUG_STATS,
+                               "conn=%lu op=%lu AUTHZ dn=\"%s\" mech=simple (SLAPI) ssf=0\n",
+                               op->o_connid, op->o_opid,
+                               conn->c_dn.bv_val, 0, 0 );
+                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+               }
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, "do_bind: Bind preoperation plugin returned %d\n",
+                               rc, 0, 0);
+#else
+               Debug(LDAP_DEBUG_TRACE, "do_bind: Bind preoperation plugin returned %d.\n",
+                               rc, 0, 0);
+#endif
+               rc = ldapRc;
+               goto cleanup;
+       }
+#endif /* defined( LDAP_SLAPI ) */
 
        if ( be->be_bind ) {
                int ret;
-               /* alias suffix */
-               struct berval edn = { 0, NULL };
 
                /* deref suffix alias if appropriate */
-               suffix_alias( be, ndn );
+               suffix_alias( be, &ndn );
 
                ret = (*be->be_bind)( be, conn, op,
-                       pdn, ndn, method, &cred, &edn );
+                       &pdn, &ndn, method, &cred, &edn );
 
                if ( ret == 0 ) {
                        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
+                       if( conn->c_authz_backend == NULL ) {
+                               conn->c_authz_backend = be;
+                       }
+
                        if(edn.bv_len) {
                                conn->c_dn = edn;
                        } else {
-                               conn->c_dn.bv_val = ch_strdup( pdn->bv_val );
-                               conn->c_dn.bv_len = pdn->bv_len;
+                               conn->c_dn = pdn;
+                               pdn.bv_val = NULL;
+                               pdn.bv_len = 0;
                        }
-                       conn->c_cdn = pdn->bv_val;
-                       pdn->bv_val = NULL;
-                       pdn->bv_len = 0;
 
-                       conn->c_ndn = *ndn;
-                       ndn->bv_val = NULL;
-                       ndn->bv_len = 0;
+                       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_len_t max = sockbuf_max_incoming_auth;
                                ber_sockbuf_ctrl( conn->c_sb,
                                        LBER_SB_OPT_SET_MAX_INCOMING, &max );
                        }
 
+                       /* log authorization identity */
+                       Statslog( LDAP_DEBUG_STATS,
+                               "conn=%lu op=%lu AUTHZ dn=\"%s\" mech=simple ssf=0\n",
+                               op->o_connid, op->o_opid,
+                               conn->c_dn.bv_val, conn->c_authmech.bv_val, 0 );
+
 #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.bv_val ));
+                       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, conn->c_cdn, conn->c_dn.bv_val );
+                               version, dn.bv_val, conn->c_dn.bv_val );
 #endif
 
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
@@ -545,19 +665,29 @@ do_bind(
                        NULL, NULL );
        }
 
-cleanup:
-       free( dn.bv_val );
-       if( pdn != NULL ) {
-               ber_bvfree( pdn );
+#if defined( LDAP_SLAPI )
+       if ( doPluginFNs( be, SLAPI_PLUGIN_POST_BIND_FN, pb ) != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, "do_bind: Bind postoperation plugins failed\n",
+                               0, 0, 0);
+#else
+               Debug(LDAP_DEBUG_TRACE, "do_bind: Bind postoperation plugins failed.\n",
+                               0, 0, 0);
+#endif
        }
-       if( ndn != NULL ) {
-               ber_bvfree( ndn );
+#endif /* defined( LDAP_SLAPI ) */
+
+cleanup:
+       conn->c_sasl_bindop = NULL;
+
+       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;