s4:ldap_server: avoid pointless check arround LDAP_INVALID_CREDENTIALS
[sfrench/samba-autobuild/.git] / source4 / ldap_server / ldap_bind.c
index f3f843b920c3edceb9a5344dc3fd1002c8cca99f..06b52fe9510c2c797e501c5699571408155b414c 100644 (file)
 #include "includes.h"
 #include "ldap_server/ldap_server.h"
 #include "auth/auth.h"
-#include "libcli/ldap/ldap.h"
 #include "smbd/service.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
+#include "../lib/util/dlinklist.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/gensec/gensec.h"
+#include "auth/gensec/gensec_tstream.h"
 #include "param/param.h"
+#include "../lib/util/tevent_ntstatus.h"
 
-static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
+static char *ldapsrv_bind_error_msg(TALLOC_CTX *mem_ctx,
+                                   HRESULT hresult,
+                                   uint32_t DSID,
+                                   NTSTATUS status)
 {
-       struct ldap_BindRequest *req = &call->request->r.BindRequest;
-       struct ldapsrv_reply *reply;
-       struct ldap_BindResponse *resp;
+       WERROR werr;
+       char *msg = NULL;
 
-       int result;
-       const char *errstr;
-       const char *nt4_domain, *nt4_account;
+       status = nt_status_squash(status);
+       werr = ntstatus_to_werror(status);
+
+       /*
+        * There are 4 lower case hex digits following 'v' at the end,
+        * but different Windows Versions return different values:
+        *
+        * Windows 2008R2 uses 'v1db1'
+        * Windows 2012R2 uses 'v2580'
+        *
+        * We just match Windows 2008R2 as that's what was referenced
+        * in https://bugzilla.samba.org/show_bug.cgi?id=9048
+        */
+       msg = talloc_asprintf(mem_ctx, "%08X: LdapErr: DSID-%08X, comment: "
+                             "AcceptSecurityContext error, data %x, v1db1",
+                             (unsigned)HRES_ERROR_V(hresult),
+                             (unsigned)DSID,
+                             (unsigned)W_ERROR_V(werr));
 
-       struct auth_session_info *session_info;
+       return msg;
+}
 
+struct ldapsrv_bind_wait_context {
+       struct ldapsrv_reply *reply;
+       struct tevent_req *req;
        NTSTATUS status;
+       bool done;
+};
 
-       DEBUG(10, ("BindSimple dn: %s\n",req->dn));
+struct ldapsrv_bind_wait_state {
+       uint8_t dummy;
+};
 
-       status = crack_auto_name_to_nt4_name(call, call->conn->connection->event.ctx, call->conn->lp_ctx, req->dn, &nt4_domain, &nt4_account);
-       if (NT_STATUS_IS_OK(status)) {
-               status = authenticate_username_pw(call,
-                                                 call->conn->connection->event.ctx,
-                                                 call->conn->connection->msg_ctx,
-                                                 call->conn->lp_ctx,
-                                                 nt4_domain, nt4_account, 
-                                                 req->creds.password,
-                                                 &session_info);
+static struct tevent_req *ldapsrv_bind_wait_send(TALLOC_CTX *mem_ctx,
+                                                struct tevent_context *ev,
+                                                void *private_data)
+{
+       struct ldapsrv_bind_wait_context *bind_wait =
+               talloc_get_type_abort(private_data,
+               struct ldapsrv_bind_wait_context);
+       struct tevent_req *req;
+       struct ldapsrv_bind_wait_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct ldapsrv_bind_wait_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       bind_wait->req = req;
+
+       tevent_req_defer_callback(req, ev);
+
+       if (!bind_wait->done) {
+               return req;
+       }
+
+       if (tevent_req_nterror(req, bind_wait->status)) {
+               return tevent_req_post(req, ev);
        }
 
+       tevent_req_done(req);
+       return tevent_req_post(req, ev);
+}
+
+static NTSTATUS ldapsrv_bind_wait_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+static NTSTATUS ldapsrv_bind_wait_setup(struct ldapsrv_call *call,
+                                       struct ldapsrv_reply *reply)
+{
+       struct ldapsrv_bind_wait_context *bind_wait = NULL;
+
+       if (call->wait_private != NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       bind_wait = talloc_zero(call, struct ldapsrv_bind_wait_context);
+       if (bind_wait == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       bind_wait->reply = reply;
+
+       call->wait_private = bind_wait;
+       call->wait_send = ldapsrv_bind_wait_send;
+       call->wait_recv = ldapsrv_bind_wait_recv;
+       return NT_STATUS_OK;
+}
+
+static void ldapsrv_bind_wait_finished(struct ldapsrv_call *call,
+                                      NTSTATUS status)
+{
+       struct ldapsrv_bind_wait_context *bind_wait =
+               talloc_get_type_abort(call->wait_private,
+               struct ldapsrv_bind_wait_context);
+
+       bind_wait->done = true;
+       bind_wait->status = status;
+
+       if (bind_wait->req == NULL) {
+               return;
+       }
+
+       if (tevent_req_nterror(bind_wait->req, status)) {
+               return;
+       }
+
+       tevent_req_done(bind_wait->req);
+}
+
+static void ldapsrv_BindSimple_done(struct tevent_req *subreq);
+
+static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
+{
+       struct ldap_BindRequest *req = &call->request->r.BindRequest;
+       struct ldapsrv_reply *reply = NULL;
+       struct ldap_BindResponse *resp = NULL;
+       int result;
+       const char *errstr = NULL;
+       NTSTATUS status;
+       bool using_tls = call->conn->sockets.active == call->conn->sockets.tls;
+       struct tevent_req *subreq = NULL;
+
+       DEBUG(10, ("BindSimple dn: %s\n",req->dn));
+
        reply = ldapsrv_init_reply(call, LDAP_TAG_BindResponse);
        if (!reply) {
                return NT_STATUS_NO_MEMORY;
        }
 
+       if (req->dn != NULL &&
+           strlen(req->dn) != 0 &&
+           call->conn->require_strong_auth > LDAP_SERVER_REQUIRE_STRONG_AUTH_NO &&
+           !using_tls)
+       {
+               status = NT_STATUS_NETWORK_ACCESS_DENIED;
+               result = LDAP_STRONG_AUTH_REQUIRED;
+               errstr = talloc_asprintf(reply,
+                                        "BindSimple: Transport encryption required.");
+               goto do_reply;
+       }
+
+       subreq = authenticate_ldap_simple_bind_send(call,
+                                       call->conn->connection->event.ctx,
+                                       call->conn->connection->msg_ctx,
+                                       call->conn->lp_ctx,
+                                       call->conn->connection->remote_address,
+                                       call->conn->connection->local_address,
+                                       using_tls,
+                                       req->dn,
+                                       req->creds.password);
+       if (subreq == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       tevent_req_set_callback(subreq, ldapsrv_BindSimple_done, call);
+
+       status = ldapsrv_bind_wait_setup(call, reply);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(subreq);
+               return status;
+       }
+
+       /*
+        * The rest will be async.
+        */
+       return NT_STATUS_OK;
+
+do_reply:
+       resp = &reply->msg->r.BindResponse;
+       resp->response.resultcode = result;
+       resp->response.errormessage = errstr;
+       resp->response.dn = NULL;
+       resp->response.referral = NULL;
+       resp->SASL.secblob = NULL;
+
+       ldapsrv_queue_reply(call, reply);
+       return NT_STATUS_OK;
+}
+
+static void ldapsrv_BindSimple_done(struct tevent_req *subreq)
+{
+       struct ldapsrv_call *call =
+               tevent_req_callback_data(subreq,
+               struct ldapsrv_call);
+       struct ldapsrv_bind_wait_context *bind_wait =
+               talloc_get_type_abort(call->wait_private,
+               struct ldapsrv_bind_wait_context);
+       struct ldapsrv_reply *reply = bind_wait->reply;
+       struct auth_session_info *session_info = NULL;
+       NTSTATUS status;
+       struct ldap_BindResponse *resp = NULL;
+       int result;
+       const char *errstr = NULL;
+
+       status = authenticate_ldap_simple_bind_recv(subreq,
+                                                   call,
+                                                   &session_info);
        if (NT_STATUS_IS_OK(status)) {
                result = LDAP_SUCCESS;
                errstr = NULL;
 
-               talloc_free(call->conn->session_info);
-               call->conn->session_info = session_info;
-               talloc_steal(call->conn, session_info);
+               talloc_unlink(call->conn, call->conn->session_info);
+               call->conn->session_info = talloc_steal(call->conn, session_info);
+
+               call->conn->authz_logged = true;
 
                /* don't leak the old LDB */
-               talloc_free(call->conn->ldb);
+               talloc_unlink(call->conn, call->conn->ldb);
 
                status = ldapsrv_backend_Init(call->conn);              
                
@@ -78,10 +255,11 @@ static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
                        errstr = talloc_asprintf(reply, "Simple Bind: Failed to advise ldb new credentials: %s", nt_errstr(status));
                }
        } else {
-               status = auth_nt_status_squash(status);
+               status = nt_status_squash(status);
 
                result = LDAP_INVALID_CREDENTIALS;
-               errstr = talloc_asprintf(reply, "Simple Bind Failed: %s", nt_errstr(status));
+               errstr = ldapsrv_bind_error_msg(reply, HRES_SEC_E_INVALID_TOKEN,
+                                               0x0C0903A9, status);
        }
 
        resp = &reply->msg->r.BindResponse;
@@ -92,23 +270,99 @@ static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
        resp->SASL.secblob = NULL;
 
        ldapsrv_queue_reply(call, reply);
-       return NT_STATUS_OK;
+       ldapsrv_bind_wait_finished(call, NT_STATUS_OK);
 }
 
-struct ldapsrv_sasl_context {
+struct ldapsrv_sasl_postprocess_context {
        struct ldapsrv_connection *conn;
-       struct socket_context *sasl_socket;
+       struct tstream_context *sasl;
 };
 
-static void ldapsrv_set_sasl(void *private_data)
+struct ldapsrv_sasl_postprocess_state {
+       uint8_t dummy;
+};
+
+static struct tevent_req *ldapsrv_sasl_postprocess_send(TALLOC_CTX *mem_ctx,
+                                               struct tevent_context *ev,
+                                               void *private_data)
 {
-       struct ldapsrv_sasl_context *ctx = talloc_get_type(private_data, struct ldapsrv_sasl_context);
-       talloc_steal(ctx->conn->connection, ctx->sasl_socket);
-       talloc_unlink(ctx->conn->connection, ctx->conn->connection->socket);
+       struct ldapsrv_sasl_postprocess_context *context =
+               talloc_get_type_abort(private_data,
+               struct ldapsrv_sasl_postprocess_context);
+       struct tevent_req *req;
+       struct ldapsrv_sasl_postprocess_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct ldapsrv_sasl_postprocess_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       TALLOC_FREE(context->conn->sockets.sasl);
+       context->conn->sockets.sasl = talloc_move(context->conn, &context->sasl);
+       context->conn->sockets.active = context->conn->sockets.sasl;
+
+       tevent_req_done(req);
+       return tevent_req_post(req, ev);
+}
+
+static NTSTATUS ldapsrv_sasl_postprocess_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+static NTSTATUS ldapsrv_setup_gensec(struct ldapsrv_connection *conn,
+                                    const char *sasl_mech,
+                                    struct gensec_security **_gensec_security)
+{
+       NTSTATUS status;
 
-       ctx->conn->sockets.sasl = ctx->sasl_socket;
-       ctx->conn->connection->socket = ctx->sasl_socket;
-       packet_set_socket(ctx->conn->packet, ctx->conn->connection->socket);
+       struct gensec_security *gensec_security;
+
+       status = samba_server_gensec_start(conn,
+                                          conn->connection->event.ctx,
+                                          conn->connection->msg_ctx,
+                                          conn->lp_ctx,
+                                          conn->server_credentials,
+                                          "ldap",
+                                          &gensec_security);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       status = gensec_set_target_service_description(gensec_security,
+                                                      "LDAP");
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       status = gensec_set_remote_address(gensec_security,
+                                          conn->connection->remote_address);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       status = gensec_set_local_address(gensec_security,
+                                         conn->connection->local_address);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       gensec_want_feature(gensec_security, GENSEC_FEATURE_ASYNC_REPLIES);
+       gensec_want_feature(gensec_security, GENSEC_FEATURE_LDAP_STYLE);
+
+       if (conn->sockets.active == conn->sockets.tls) {
+               gensec_want_feature(gensec_security, GENSEC_FEATURE_LDAPS_TRANSPORT);
+       }
+
+       status = gensec_start_mech_by_sasl_name(gensec_security, sasl_mech);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       *_gensec_security = gensec_security;
+       return status;
 }
 
 static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
@@ -120,6 +374,8 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
        int result = 0;
        const char *errstr=NULL;
        NTSTATUS status = NT_STATUS_OK;
+       DATA_BLOB input = data_blob_null;
+       DATA_BLOB output = data_blob_null;
 
        DEBUG(10, ("BindSASL dn: %s\n",req->dn));
 
@@ -128,7 +384,12 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
                return NT_STATUS_NO_MEMORY;
        }
        resp = &reply->msg->r.BindResponse;
-       
+       /* Windows 2000 mmc doesn't like secblob == NULL and reports a decoding error */
+       resp->SASL.secblob = talloc_zero(reply, DATA_BLOB);
+       if (resp->SASL.secblob == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        conn = call->conn;
 
        /* 
@@ -138,111 +399,143 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
         */
 
        if (!conn->gensec) {
-               conn->session_info = NULL;
-
-               status = gensec_server_start(conn,
-                                            conn->connection->event.ctx,
-                                            lp_gensec_settings(conn, conn->lp_ctx),
-                                            conn->connection->msg_ctx,
-                                            &conn->gensec);
+               status = ldapsrv_setup_gensec(conn, req->creds.SASL.mechanism,
+                                             &conn->gensec);
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(1, ("Failed to start GENSEC server code: %s\n", nt_errstr(status)));
+                       DEBUG(1, ("Failed to start GENSEC server for [%s] code: %s\n",
+                                 ldb_binary_encode_string(call, req->creds.SASL.mechanism),
+                                 nt_errstr(status)));
                        result = LDAP_OPERATIONS_ERROR;
                        errstr = talloc_asprintf(reply, "SASL: Failed to start authentication system: %s", 
                                                 nt_errstr(status));
-               } else {
-               
-                       gensec_set_target_service(conn->gensec, "ldap");
-                       
-                       gensec_set_credentials(conn->gensec, conn->server_credentials);
-                       
-                       gensec_want_feature(conn->gensec, GENSEC_FEATURE_SIGN);
-                       gensec_want_feature(conn->gensec, GENSEC_FEATURE_SEAL);
-                       gensec_want_feature(conn->gensec, GENSEC_FEATURE_ASYNC_REPLIES);
-                       
-                       status = gensec_start_mech_by_sasl_name(conn->gensec, req->creds.SASL.mechanism);
-                       
-                       if (!NT_STATUS_IS_OK(status)) {
-                               DEBUG(1, ("Failed to start GENSEC SASL[%s] server code: %s\n", 
-                                         req->creds.SASL.mechanism, nt_errstr(status)));
-                               result = LDAP_OPERATIONS_ERROR;
-                               errstr = talloc_asprintf(reply, "SASL:[%s]: Failed to start authentication backend: %s", 
-                                                        req->creds.SASL.mechanism, nt_errstr(status));
-                       }
+                       goto do_reply;
                }
        }
 
-       if (NT_STATUS_IS_OK(status)) {
-               DATA_BLOB input = data_blob(NULL, 0);
-               DATA_BLOB output = data_blob(NULL, 0);
-
-               if (req->creds.SASL.secblob) {
-                       input = *req->creds.SASL.secblob;
-               }
-
-               status = gensec_update(conn->gensec, reply,
-                                      input, &output);
-
-               /* Windows 2000 mmc doesn't like secblob == NULL and reports a decoding error */
-               resp->SASL.secblob = talloc(reply, DATA_BLOB);
-               NT_STATUS_HAVE_NO_MEMORY(resp->SASL.secblob);
-               *resp->SASL.secblob = output;
-       } else {
-               resp->SASL.secblob = NULL;
+       if (req->creds.SASL.secblob) {
+               input = *req->creds.SASL.secblob;
        }
 
+       status = gensec_update_ev(conn->gensec, reply, conn->connection->event.ctx,
+                                 input, &output);
+       *resp->SASL.secblob = output;
+
        if (NT_STATUS_EQUAL(NT_STATUS_MORE_PROCESSING_REQUIRED, status)) {
                result = LDAP_SASL_BIND_IN_PROGRESS;
                errstr = NULL;
-       } else if (NT_STATUS_IS_OK(status)) {
-               struct auth_session_info *old_session_info=NULL;
-               struct ldapsrv_sasl_context *ctx;
+               goto do_reply;
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               status = nt_status_squash(status);
+               result = LDAP_INVALID_CREDENTIALS;
+               errstr = ldapsrv_bind_error_msg(reply, HRES_SEC_E_LOGON_DENIED,
+                                               0x0C0904DC, status);
+               talloc_unlink(conn, conn->gensec);
+               conn->gensec = NULL;
+               goto do_reply;
+       }
+
+       {
+               struct ldapsrv_sasl_postprocess_context *context = NULL;
 
                result = LDAP_SUCCESS;
                errstr = NULL;
 
-               ctx = talloc(call, struct ldapsrv_sasl_context); 
+               if (gensec_have_feature(conn->gensec, GENSEC_FEATURE_SIGN) ||
+                   gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL)) {
+
+                       context = talloc(call, struct ldapsrv_sasl_postprocess_context);
+
+                       if (!context) {
+                               status = NT_STATUS_NO_MEMORY;
+                       }
+               }
 
-               if (!ctx) {
-                       status = NT_STATUS_NO_MEMORY;
+               if (context && conn->sockets.tls) {
+                       TALLOC_FREE(context);
+                       status = NT_STATUS_NOT_SUPPORTED;
+                       result = LDAP_UNWILLING_TO_PERFORM;
+                       errstr = talloc_asprintf(reply,
+                                                "SASL:[%s]: Sign or Seal are not allowed if TLS is used",
+                                                req->creds.SASL.mechanism);
+                       goto do_reply;
+               }
+
+               if (context && conn->sockets.sasl) {
+                       TALLOC_FREE(context);
+                       status = NT_STATUS_NOT_SUPPORTED;
+                       result = LDAP_UNWILLING_TO_PERFORM;
+                       errstr = talloc_asprintf(reply,
+                                                "SASL:[%s]: Sign or Seal are not allowed if SASL encryption has already been set up",
+                                                req->creds.SASL.mechanism);
+                       goto do_reply;
+               }
+
+               if (context) {
+                       context->conn = conn;
+                       status = gensec_create_tstream(context,
+                                                      context->conn->gensec,
+                                                      context->conn->sockets.raw,
+                                                      &context->sasl);
+                       if (NT_STATUS_IS_OK(status)) {
+                               if (!talloc_reference(context->sasl, conn->gensec)) {
+                                       status = NT_STATUS_NO_MEMORY;
+                               }
+                       }
                } else {
-                       ctx->conn = conn;
-                       status = gensec_socket_init(conn->gensec, 
-                                                   conn->connection,
-                                                   conn->connection->socket,
-                                                   conn->connection->event.ctx, 
-                                                   stream_io_handler_callback,
-                                                   conn->connection,
-                                                   &ctx->sasl_socket);
-               } 
-
-               if (!ctx || !NT_STATUS_IS_OK(status)) {
-                       conn->session_info = old_session_info;
+                       switch (call->conn->require_strong_auth) {
+                       case LDAP_SERVER_REQUIRE_STRONG_AUTH_NO:
+                               break;
+                       case LDAP_SERVER_REQUIRE_STRONG_AUTH_ALLOW_SASL_OVER_TLS:
+                               if (call->conn->sockets.active == call->conn->sockets.tls) {
+                                       break;
+                               }
+                               status = NT_STATUS_NETWORK_ACCESS_DENIED;
+                               result = LDAP_STRONG_AUTH_REQUIRED;
+                               errstr = talloc_asprintf(reply,
+                                               "SASL:[%s]: not allowed if TLS is used.",
+                                                req->creds.SASL.mechanism);
+                               goto do_reply;
+
+                       case LDAP_SERVER_REQUIRE_STRONG_AUTH_YES:
+                               status = NT_STATUS_NETWORK_ACCESS_DENIED;
+                               result = LDAP_STRONG_AUTH_REQUIRED;
+                               errstr = talloc_asprintf(reply,
+                                                "SASL:[%s]: Sign or Seal are required.",
+                                                req->creds.SASL.mechanism);
+                               goto do_reply;
+                       }
+               }
+
+               if (result != LDAP_SUCCESS) {
+               } else if (!NT_STATUS_IS_OK(status)) {
                        result = LDAP_OPERATIONS_ERROR;
                        errstr = talloc_asprintf(reply, 
                                                 "SASL:[%s]: Failed to setup SASL socket: %s", 
                                                 req->creds.SASL.mechanism, nt_errstr(status));
+                       goto do_reply;
                } else {
+                       struct auth_session_info *old_session_info=NULL;
 
-                       call->send_callback = ldapsrv_set_sasl;
-                       call->send_private = ctx;
-               
                        old_session_info = conn->session_info;
                        conn->session_info = NULL;
-                       status = gensec_session_info(conn->gensec, &conn->session_info);
+                       status = gensec_session_info(conn->gensec, conn, &conn->session_info);
                        if (!NT_STATUS_IS_OK(status)) {
                                conn->session_info = old_session_info;
                                result = LDAP_OPERATIONS_ERROR;
                                errstr = talloc_asprintf(reply, 
                                                         "SASL:[%s]: Failed to get session info: %s", 
                                                         req->creds.SASL.mechanism, nt_errstr(status));
+                               goto do_reply;
                        } else {
-                               talloc_free(old_session_info);
-                               talloc_steal(conn, conn->session_info);
+                               talloc_unlink(conn, old_session_info);
                                
                                /* don't leak the old LDB */
-                               talloc_free(conn->ldb);
-                               
+                               talloc_unlink(conn, conn->ldb);
+
+                               call->conn->authz_logged = true;
+
                                status = ldapsrv_backend_Init(conn);            
                                
                                if (!NT_STATUS_IS_OK(status)) {
@@ -251,17 +544,21 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
                                                                 "SASL:[%s]: Failed to advise samdb of new credentials: %s", 
                                                                 req->creds.SASL.mechanism, 
                                                                 nt_errstr(status));
+                                       goto do_reply;
                                }
                        }
                }
-       } else {
-               status = auth_nt_status_squash(status);
-               if (result == 0) {
-                       result = LDAP_INVALID_CREDENTIALS;
-                       errstr = talloc_asprintf(reply, "SASL:[%s]: %s", req->creds.SASL.mechanism, nt_errstr(status));
+
+               if (NT_STATUS_IS_OK(status) && context) {
+                       call->postprocess_send = ldapsrv_sasl_postprocess_send;
+                       call->postprocess_recv = ldapsrv_sasl_postprocess_recv;
+                       call->postprocess_private = context;
                }
+               talloc_unlink(conn, conn->gensec);
+               conn->gensec = NULL;
        }
 
+do_reply:
        resp->response.resultcode = result;
        resp->response.dn = NULL;
        resp->response.errormessage = errstr;
@@ -277,11 +574,25 @@ NTSTATUS ldapsrv_BindRequest(struct ldapsrv_call *call)
        struct ldapsrv_reply *reply;
        struct ldap_BindResponse *resp;
 
+       if (call->conn->pending_calls != NULL) {
+               reply = ldapsrv_init_reply(call, LDAP_TAG_BindResponse);
+               if (!reply) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               resp = &reply->msg->r.BindResponse;
+               resp->response.resultcode = LDAP_BUSY;
+               resp->response.dn = NULL;
+               resp->response.errormessage = talloc_asprintf(reply, "Pending requests on this LDAP session");
+               resp->response.referral = NULL;
+               resp->SASL.secblob = NULL;
+
+               ldapsrv_queue_reply(call, reply);
+               return NT_STATUS_OK;
+       }
+
        /* 
-        * TODO: we should fail the bind request
-        *       if there're any pending requests.
-        *
-        *       also a simple bind should cancel an
+        * TODO: a simple bind should cancel an
         *       inprogress SASL bind.
         *       (see RFC 4513)
         */
@@ -298,7 +609,7 @@ NTSTATUS ldapsrv_BindRequest(struct ldapsrv_call *call)
        }
 
        resp = &reply->msg->r.BindResponse;
-       resp->response.resultcode = 7;
+       resp->response.resultcode = LDAP_AUTH_METHOD_NOT_SUPPORTED;
        resp->response.dn = NULL;
        resp->response.errormessage = talloc_asprintf(reply, "Bad AuthenticationChoice [%d]", req->mechanism);
        resp->response.referral = NULL;
@@ -308,8 +619,73 @@ NTSTATUS ldapsrv_BindRequest(struct ldapsrv_call *call)
        return NT_STATUS_OK;
 }
 
+struct ldapsrv_unbind_wait_context {
+       uint8_t dummy;
+};
+
+struct ldapsrv_unbind_wait_state {
+       uint8_t dummy;
+};
+
+static struct tevent_req *ldapsrv_unbind_wait_send(TALLOC_CTX *mem_ctx,
+                                                struct tevent_context *ev,
+                                                void *private_data)
+{
+       struct ldapsrv_unbind_wait_context *unbind_wait =
+               talloc_get_type_abort(private_data,
+               struct ldapsrv_unbind_wait_context);
+       struct tevent_req *req;
+       struct ldapsrv_unbind_wait_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct ldapsrv_unbind_wait_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       (void)unbind_wait;
+
+       tevent_req_nterror(req, NT_STATUS_LOCAL_DISCONNECT);
+       return tevent_req_post(req, ev);
+}
+
+static NTSTATUS ldapsrv_unbind_wait_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+static NTSTATUS ldapsrv_unbind_wait_setup(struct ldapsrv_call *call)
+{
+       struct ldapsrv_unbind_wait_context *unbind_wait = NULL;
+
+       if (call->wait_private != NULL) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       unbind_wait = talloc_zero(call, struct ldapsrv_unbind_wait_context);
+       if (unbind_wait == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       call->wait_private = unbind_wait;
+       call->wait_send = ldapsrv_unbind_wait_send;
+       call->wait_recv = ldapsrv_unbind_wait_recv;
+       return NT_STATUS_OK;
+}
+
 NTSTATUS ldapsrv_UnbindRequest(struct ldapsrv_call *call)
 {
+       struct ldapsrv_call *c = NULL;
+       struct ldapsrv_call *n = NULL;
+
        DEBUG(10, ("UnbindRequest\n"));
-       return NT_STATUS_OK;
+
+       for (c = call->conn->pending_calls; c != NULL; c = n) {
+               n = c->next;
+
+               DLIST_REMOVE(call->conn->pending_calls, c);
+               TALLOC_FREE(c);
+       }
+
+       return ldapsrv_unbind_wait_setup(call);
 }