]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bind.c
Suck in HEAD changes since 2.1alpha
[openldap] / servers / slapd / bind.c
index 562ce5b54ab6c08665074201735a7ab76cc798a2..b2b4d32b4a298df0358da2694f1b4db6cba1c30b 100644 (file)
@@ -1,4 +1,9 @@
 /* bind.c - decode an ldap bind operation and pass it to a backend db */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * is provided ``as is'' without express or implied warranty.
  */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "slap.h"
 
-extern Backend *select_backend();
+#include <ac/string.h>
+#include <ac/socket.h>
 
-extern char    *default_referral;
+#include "ldap_pvt.h"
+#include "slap.h"
 
-void
+int
 do_bind(
     Connection *conn,
     Operation  *op
 )
 {
-       BerElement      *ber = op->o_ber;
-       int             version, method, len, rc;
-       char            *dn;
-       struct berval   cred;
-       Backend         *be;
+       BerElement *ber = op->o_ber;
+       ber_int_t version;
+       ber_tag_t method;
+       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;
 
+#ifdef NEW_LOGGING
+       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
+
+       /*
+        * Force to connection to "anonymous" until bind succeeds.
+        */
+       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+       connection2anonymous( conn );
+       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+       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.bv_val != NULL ) {
+               free( op->o_ndn.bv_val );
+               op->o_ndn.bv_val = ch_strdup( "" );
+               op->o_ndn.bv_len = 0;
+       }
 
        /*
         * Parse the bind request.  It looks like this:
@@ -45,90 +82,366 @@ do_bind(
         *              authentication  CHOICE {
         *                      simple          [0] OCTET STRING -- passwd
         *                      krbv42ldap      [1] OCTET STRING
-        *                      krbv42dsa       [1] OCTET STRING
+        *                      krbv42dsa       [2] OCTET STRING
+        *                      SASL            [3] SaslCredentials
         *              }
+        *      }
+        *
+        *      SaslCredentials ::= SEQUENCE {
+     *         mechanism           LDAPString,
+     *         credentials         OCTET STRING OPTIONAL
         *      }
         */
 
-#ifdef COMPAT30
-       /*
-        * in version 3.0 there is an extra SEQUENCE tag after the
-        * BindRequest SEQUENCE tag.
-        */
+       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 ));
+#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;
+               goto cleanup;
+       }
+
+       op->o_protocol = version;
+
+       if( method != LDAP_AUTH_SASL ) {
+               tag = ber_scanf( ber, /*{*/ "m}", &cred );
 
-       {
-       BerElement      tber;
-       unsigned long   tlen, ttag;
-
-       tber = *op->o_ber;
-       ttag = ber_skip_tag( &tber, &tlen );
-       if ( ber_peek_tag( &tber, &tlen ) == LBER_SEQUENCE ) {
-               Debug( LDAP_DEBUG_ANY, "version 3.0 detected\n", 0, 0, 0 );
-               conn->c_version = 30;
-               rc = ber_scanf(ber, "{{iato}}", &version, &dn, &method, &cred);
        } else {
-               rc = ber_scanf( ber, "{iato}", &version, &dn, &method, &cred );
+               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, "m", &cred );
+                       } else {
+                               tag = LDAP_TAG_LDAPCRED;
+                               cred.bv_val = NULL;
+                               cred.bv_len = 0;
+                       }
+
+                       if ( tag != LBER_ERROR ) {
+                               tag = ber_scanf( ber, /*{{*/ "}}" );
+                       }
+               }
+       }
+
+       if ( tag == LBER_ERROR ) {
+               send_ldap_disconnect( conn, op,
+                       LDAP_PROTOCOL_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 ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
+#endif
+               goto cleanup;
+       } 
+
+       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;
        }
+
+       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.bv_val ));
 #else
-       rc = ber_scanf( ber, "{iato}", &version, &dn, &method, &cred );
+               Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
+                       pdn.bv_val, mech.bv_val, NULL );
 #endif
-       if ( rc == LBER_ERROR ) {
-               Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-                   "decoding error" );
-               return;
-       }
-#ifdef COMPAT30
-       if ( conn->c_version == 30 ) {
-               switch ( method ) {
-               case LDAP_AUTH_SIMPLE_30:
-                       method = LDAP_AUTH_SIMPLE;
-                       break;
-#ifdef KERBEROS
-               case LDAP_AUTH_KRBV41_30:
-                       method = LDAP_AUTH_KRBV41;
-                       break;
-               case LDAP_AUTH_KRBV42_30:
-                       method = LDAP_AUTH_KRBV42;
-                       break;
+
+       } 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 ));
+#else
+               Debug( LDAP_DEBUG_TRACE,
+                       "do_bind: version=%ld dn=\"%s\" method=%ld\n",
+                       (unsigned long) version,
+                       pdn.bv_val, (unsigned long) method );
 #endif
-               }
        }
-#endif /* compat30 */
-       dn_normalize( dn );
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d BIND dn=\"%s\" method=%d\n",
-           conn->c_connid, op->o_opid, dn, 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,
+                       "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 );
+#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
+        * or not.
+        */
+       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+       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;
+       }
+
+       if ( method == LDAP_AUTH_SASL ) {
+               slap_ssf_t ssf = 0;
+
+               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 ));
+#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 ( version != LDAP_VERSION2 ) {
-               if ( dn != NULL ) {
-                       free( dn );
+               if( mech.bv_len == 0 ) {
+#ifdef NEW_LOGGING
+                       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",
+                               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 ( cred.bv_val != NULL ) {
-                       free( cred.bv_val );
+
+               /* check restrictions */
+               rc = backend_check_restrictions( NULL, conn, op, mech.bv_val, &text );
+               if( rc != LDAP_SUCCESS ) {
+                       send_ldap_result( conn, op, rc,
+                               NULL, text, NULL, NULL );
+                       goto cleanup;
                }
 
-               Debug( LDAP_DEBUG_ANY, "unknown version %d\n", version, 0, 0 );
-               send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-                   "version not supported" );
-               return;
+               ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+               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);
+                       }
+               } else {
+                       conn->c_sasl_bind_mech = mech;
+                       mech.bv_val = NULL;
+                       mech.bv_len = 0;
+               }
+               ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+               rc = slap_sasl_bind( conn, op,
+                       &pdn, &ndn,
+                       &cred, &edn, &ssf );
+
+               ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+               if( rc == LDAP_SUCCESS ) {
+                       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.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;
+                       }
+
+                       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 );
+                       }
+
+               } else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {
+                       conn->c_sasl_bind_in_progress = 1;
+
+               } else {
+                       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;
+
+       } else {
+               /* Not SASL, cancel any in-progress bind */
+               ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+
+               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 );
        }
 
-       Debug( LDAP_DEBUG_TRACE, "do_bind: version %d dn (%s) method %d\n",
-           version, dn, method );
+       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";
+
+                       } else {
+                               rc = backend_check_restrictions( NULL, conn, op, mech.bv_val, &text );
+                       }
+
+                       /*
+                        * 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", 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 );
+#endif
+                       goto cleanup;
+
+               } else if ( global_disallows & SLAP_DISALLOW_BIND_SIMPLE ) {
+                       /* disallow simple authentication */
+                       rc = LDAP_UNWILLING_TO_PERFORM;
+                       text = "unwilling to perform simple authentication";
 
-       /* accept null binds */
-       if ( dn == NULL || *dn == '\0' ) {
-               if ( dn != NULL ) {
-                       free( dn );
+                       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.bv_val ));
+#else
+                       Debug( LDAP_DEBUG_TRACE,
+                               "do_bind: v%d simple bind(%s) disallowed\n",
+                               version, ndn.bv_val, 0 );
+#endif
+                       goto cleanup;
                }
-               if ( cred.bv_val != NULL ) {
-                       free( cred.bv_val );
+
+#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", 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 );
+#endif
+                       goto cleanup;
                }
+#endif
+
+       } else {
+               rc = LDAP_AUTH_METHOD_NOT_SUPPORTED;
+               text = "unknown authentication method";
 
-               send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL );
-               return;
+               send_ldap_result( conn, op, rc,
+                       NULL, text, NULL, NULL );
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_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;
        }
 
        /*
@@ -137,39 +450,102 @@ do_bind(
         * if we don't hold it.
         */
 
-       if ( (be = select_backend( dn )) == NULL ) {
-               free( dn );
-               if ( cred.bv_val != NULL ) {
-                       free( cred.bv_val );
-               }
-               if ( cred.bv_len == 0 ) {
-                       send_ldap_result( conn, op, LDAP_SUCCESS, NULL, 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, ref ? ref : default_referral, NULL );
+
+                       ber_bvarray_free( ref );
+
                } else {
-                       send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-                           default_referral );
+                       /* noSuchObject is not allowed to be returned by bind */
+                       send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
+                               NULL, NULL, NULL, NULL );
                }
-               return;
+
+               goto cleanup;
        }
 
-       if ( be->be_bind != NULL ) {
-               if ( (*be->be_bind)( be, conn, op, dn, method, &cred ) == 0 ) {
-                       pthread_mutex_lock( &conn->c_dnmutex );
-                       if ( conn->c_dn != NULL ) {
-                               free( conn->c_dn );
+       /* 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 );
+               goto cleanup;
+       }
+
+       conn->c_authz_backend = be;
+
+       if ( be->be_bind ) {
+               int ret;
+
+               /* deref suffix alias if appropriate */
+               suffix_alias( be, &ndn );
+
+               ret = (*be->be_bind)( be, conn, op,
+                       &pdn, &ndn, method, &cred, &edn );
+
+               if ( ret == 0 ) {
+                       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+
+                       if(edn.bv_len) {
+                               conn->c_dn = edn;
+                       } else {
+                               ber_dupbv( &conn->c_dn, &pdn );
+                       }
+                       conn->c_cdn = pdn;
+                       pdn.bv_val = NULL;
+                       pdn.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_sockbuf_ctrl( conn->c_sb,
+                                       LBER_SB_OPT_SET_MAX_INCOMING, &max );
                        }
-                       conn->c_dn = strdup( dn );
-                       pthread_mutex_unlock( &conn->c_dnmutex );
+
+#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.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.bv_val, conn->c_dn.bv_val );
+#endif
+
+                       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.bv_val != NULL) {
+                       free( edn.bv_val );
                }
+
        } else {
-               send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "Function not implemented" );
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "operation not supported within namingContext",
+                       NULL, NULL );
        }
 
-       free( dn );
-       if ( cred.bv_val != NULL ) {
-               free( cred.bv_val );
+cleanup:
+       if( pdn.bv_val != NULL ) {
+               free( pdn.bv_val );
        }
+       if( ndn.bv_val != NULL ) {
+               free( ndn.bv_val );
+       }
+       if ( mech.bv_val != NULL ) {
+               free( mech.bv_val );
+       }
+
+       return rc;
 }