libcli/auth Move some source3/ NTLMSSP functions to the common code.
[nivanova/samba.git] / source4 / auth / ntlmssp / ntlmssp_server.c
index ddc9d565f79771e9dac9365b79f2854ab70087ee..ce76e3919bb59b6ee4dc0ce0dbca6d12bc77ad3f 100644 (file)
 
 #include "includes.h"
 #include "system/network.h"
+#include "lib/tsocket/tsocket.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "../librpc/gen_ndr/ndr_ntlmssp.h"
+#include "../libcli/auth/ntlmssp_ndr.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/crypto.h"
-#include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
+#include "auth/gensec/gensec_proto.h"
 #include "auth/auth.h"
-#include "auth/ntlm/auth_proto.h"
 #include "param/param.h"
-#include "auth/session_proto.h"
-
-/** 
- * Set a username on an NTLMSSP context - ensures it is talloc()ed 
- *
- */
-
-static NTSTATUS ntlmssp_set_username(struct gensec_ntlmssp_state *gensec_ntlmssp_state, const char *user) 
-{
-       if (!user) {
-               /* it should be at least "" */
-               DEBUG(1, ("NTLMSSP failed to set username - cannot accept NULL username\n"));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-       gensec_ntlmssp_state->user = talloc_strdup(gensec_ntlmssp_state, user);
-       if (!gensec_ntlmssp_state->user) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       return NT_STATUS_OK;
-}
-
-/** 
- * Set a domain on an NTLMSSP context - ensures it is talloc()ed 
- *
- */
-static NTSTATUS ntlmssp_set_domain(struct gensec_ntlmssp_state *gensec_ntlmssp_state, const char *domain) 
-{
-       gensec_ntlmssp_state->domain = talloc_strdup(gensec_ntlmssp_state, domain);
-       if (!gensec_ntlmssp_state->domain) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       return NT_STATUS_OK;
-}
-
-/** 
- * Set a workstation on an NTLMSSP context - ensures it is talloc()ed 
- *
- */
-static NTSTATUS ntlmssp_set_workstation(struct gensec_ntlmssp_state *gensec_ntlmssp_state, const char *workstation) 
-{
-       gensec_ntlmssp_state->workstation = talloc_strdup(gensec_ntlmssp_state, workstation);
-       if (!gensec_ntlmssp_state->workstation) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       return NT_STATUS_OK;
-}
-
-/**
- * Determine correct target name flags for reply, given server role 
- * and negotiated flags
- * 
- * @param gensec_ntlmssp_state NTLMSSP State
- * @param neg_flags The flags from the packet
- * @param chal_flags The flags to be set in the reply packet
- * @return The 'target name' string.
- */
-
-static const char *ntlmssp_target_name(struct gensec_ntlmssp_state *gensec_ntlmssp_state,
-                                      uint32_t neg_flags, uint32_t *chal_flags) 
-{
-       if (neg_flags & NTLMSSP_REQUEST_TARGET) {
-               *chal_flags |= NTLMSSP_CHAL_TARGET_INFO;
-               *chal_flags |= NTLMSSP_REQUEST_TARGET;
-               if (gensec_ntlmssp_state->server_role == ROLE_STANDALONE) {
-                       *chal_flags |= NTLMSSP_TARGET_TYPE_SERVER;
-                       return gensec_ntlmssp_state->server_name;
-               } else {
-                       *chal_flags |= NTLMSSP_TARGET_TYPE_DOMAIN;
-                       return gensec_ntlmssp_state->domain;
-               };
-       } else {
-               return "";
-       }
-}
-
-
 
 /**
  * Next state function for the Negotiate packet
  * 
- * @param gensec_security GENSEC state
+ * @param ntlmssp_state NTLMSSP state
  * @param out_mem_ctx Memory context for *out
  * @param in The request, as a DATA_BLOB.  reply.data must be NULL
  * @param out The reply, as an allocated DATA_BLOB, caller to free.
  * @return Errors or MORE_PROCESSING_REQUIRED if (normal) a reply is required. 
  */
 
-NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, 
+NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
                                  TALLOC_CTX *out_mem_ctx, 
-                                 const DATA_BLOB in, DATA_BLOB *out) 
+                                 const DATA_BLOB request, DATA_BLOB *reply)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
        DATA_BLOB struct_blob;
        uint32_t neg_flags = 0;
        uint32_t ntlmssp_command, chal_flags;
-       const uint8_t *cryptkey;
+       uint8_t cryptkey[8];
        const char *target_name;
+       NTSTATUS status;
 
        /* parse the NTLMSSP packet */
 #if 0
        file_save("ntlmssp_negotiate.dat", request.data, request.length);
 #endif
 
-       if (in.length) {
-               if ((in.length < 16) || !msrpc_parse(out_mem_ctx, 
-                                                        &in, "Cdd",
-                                                        "NTLMSSP",
-                                                        &ntlmssp_command,
-                                                        &neg_flags)) {
-                       DEBUG(1, ("ntlmssp_server_negotiate: failed to parse "
-                               "NTLMSSP Negotiate of length %u:\n",
-                               (unsigned int)in.length ));
-                       dump_data(2, in.data, in.length);
+       if (request.length) {
+               if ((request.length < 16) || !msrpc_parse(ntlmssp_state, &request, "Cdd",
+                                                         "NTLMSSP",
+                                                         &ntlmssp_command,
+                                                         &neg_flags)) {
+                       DEBUG(1, ("ntlmssp_server_negotiate: failed to parse NTLMSSP Negotiate of length %u\n",
+                               (unsigned int)request.length));
+                       dump_data(2, request.data, request.length);
                        return NT_STATUS_INVALID_PARAMETER;
                }
                debug_ntlmssp_flags(neg_flags);
+
+               if (DEBUGLEVEL >= 10) {
+                       struct NEGOTIATE_MESSAGE *negotiate = talloc(
+                               ntlmssp_state, struct NEGOTIATE_MESSAGE);
+                       if (negotiate != NULL) {
+                               status = ntlmssp_pull_NEGOTIATE_MESSAGE(
+                                       &request, negotiate, negotiate);
+                               if (NT_STATUS_IS_OK(status)) {
+                                       NDR_PRINT_DEBUG(NEGOTIATE_MESSAGE,
+                                                       negotiate);
+                               }
+                               TALLOC_FREE(negotiate);
+                       }
+               }
        }
        
-       ntlmssp_handle_neg_flags(gensec_ntlmssp_state, neg_flags, gensec_ntlmssp_state->allow_lm_key);
+       ntlmssp_handle_neg_flags(ntlmssp_state, neg_flags, ntlmssp_state->allow_lm_key);
 
        /* Ask our caller what challenge they would like in the packet */
-       cryptkey = gensec_ntlmssp_state->get_challenge(gensec_ntlmssp_state);
-       if (!cryptkey) {
-               DEBUG(1, ("ntlmssp_server_negotiate: backend doesn't give a challenge\n"));
-               return NT_STATUS_INTERNAL_ERROR;
+       status = ntlmssp_state->get_challenge(ntlmssp_state, cryptkey);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("ntlmssp_server_negotiate: backend doesn't give a challenge: %s\n",
+                         nt_errstr(status)));
+               return status;
        }
 
        /* Check if we may set the challenge */
-       if (!gensec_ntlmssp_state->may_set_challenge(gensec_ntlmssp_state)) {
-               gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
+       if (!ntlmssp_state->may_set_challenge(ntlmssp_state)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
        }
 
        /* The flags we send back are not just the negotiated flags,
         * they are also 'what is in this packet'.  Therfore, we
-        * operate on 'chal_flags' from here on 
+        * operate on 'chal_flags' from here on
         */
 
-       chal_flags = gensec_ntlmssp_state->neg_flags;
+       chal_flags = ntlmssp_state->neg_flags;
 
        /* get the right name to fill in as 'target' */
-       target_name = ntlmssp_target_name(gensec_ntlmssp_state, 
-                                         neg_flags, &chal_flags); 
-       if (target_name == NULL) 
+       target_name = ntlmssp_target_name(ntlmssp_state,
+                                         neg_flags, &chal_flags);
+       if (target_name == NULL)
                return NT_STATUS_INVALID_PARAMETER;
 
-       gensec_ntlmssp_state->chal = data_blob_talloc(gensec_ntlmssp_state, cryptkey, 8);
-       gensec_ntlmssp_state->internal_chal = data_blob_talloc(gensec_ntlmssp_state, cryptkey, 8);
+       ntlmssp_state->chal = data_blob_talloc(ntlmssp_state, cryptkey, 8);
+       ntlmssp_state->internal_chal = data_blob_talloc(ntlmssp_state,
+                                                       cryptkey, 8);
 
        /* This creates the 'blob' of names that appears at the end of the packet */
-       if (chal_flags & NTLMSSP_CHAL_TARGET_INFO) {
-               char dnsdomname[MAXHOSTNAMELEN], dnsname[MAXHOSTNAMELEN];
-               const char *target_name_dns = "";
-
-               /* Find out the DNS domain name */
-               dnsdomname[0] = '\0';
-               safe_strcpy(dnsdomname, lp_realm(gensec_security->settings->lp_ctx), sizeof(dnsdomname) - 1);
-               strlower_m(dnsdomname);
-
-               /* Find out the DNS host name */
-               safe_strcpy(dnsname, gensec_ntlmssp_state->server_name, sizeof(dnsname) - 1);
-               if (dnsdomname[0] != '\0') {
-                       safe_strcat(dnsname, ".", sizeof(dnsname) - 1);
-                       safe_strcat(dnsname, dnsdomname, sizeof(dnsname) - 1);
-               }
-               strlower_m(dnsname);
-
-               if (chal_flags |= NTLMSSP_TARGET_TYPE_DOMAIN) {
-                       target_name_dns = dnsdomname;
-               } else if (chal_flags |= NTLMSSP_TARGET_TYPE_SERVER) {
-                       target_name_dns = dnsname;
-               }
-
-               msrpc_gen(out_mem_ctx, 
-                         &struct_blob, "aaaaa",
-                         NTLMSSP_NAME_TYPE_DOMAIN, target_name,
-                         NTLMSSP_NAME_TYPE_SERVER, gensec_ntlmssp_state->server_name,
-                         NTLMSSP_NAME_TYPE_DOMAIN_DNS, dnsdomname,
-                         NTLMSSP_NAME_TYPE_SERVER_DNS, dnsname,
-                         0, "");
+       if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO)
+       {
+               msrpc_gen(ntlmssp_state, &struct_blob, "aaaaa",
+                         MsvAvNbDomainName, target_name,
+                         MsvAvNbComputerName, ntlmssp_state->server.netbios_name,
+                         MsvAvDnsDomainName, ntlmssp_state->server.dns_domain,
+                         MsvAvDnsComputerName, ntlmssp_state->server.dns_name,
+                         MsvAvEOL, "");
        } else {
-               struct_blob = data_blob(NULL, 0);
+               struct_blob = data_blob_null;
        }
 
        {
                /* Marshal the packet in the right format, be it unicode or ASCII */
                const char *gen_string;
-               if (gensec_ntlmssp_state->unicode) {
-                       gen_string = "CdUdbddB";
+               DATA_BLOB version_blob = data_blob_null;
+
+               if (chal_flags & NTLMSSP_NEGOTIATE_VERSION) {
+                       enum ndr_err_code err;
+                       struct VERSION vers;
+
+                       /* "What Windows returns" as a version number. */
+                       ZERO_STRUCT(vers);
+                       vers.ProductMajorVersion = NTLMSSP_WINDOWS_MAJOR_VERSION_6;
+                       vers.ProductMinorVersion = NTLMSSP_WINDOWS_MINOR_VERSION_1;
+                       vers.ProductBuild = 0;
+                       vers.NTLMRevisionCurrent = NTLMSSP_REVISION_W2K3;
+
+                       err = ndr_push_struct_blob(&version_blob,
+                                               ntlmssp_state,
+                                               &vers,
+                                               (ndr_push_flags_fn_t)ndr_push_VERSION);
+
+                       if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
+                               data_blob_free(&struct_blob);
+                               return NT_STATUS_NO_MEMORY;
+                       }
+               }
+
+               if (ntlmssp_state->unicode) {
+                       gen_string = "CdUdbddBb";
                } else {
-                       gen_string = "CdAdbddB";
+                       gen_string = "CdAdbddBb";
+               }
+
+               msrpc_gen(out_mem_ctx, reply, gen_string,
+                       "NTLMSSP",
+                       NTLMSSP_CHALLENGE,
+                       target_name,
+                       chal_flags,
+                       cryptkey, 8,
+                       0, 0,
+                       struct_blob.data, struct_blob.length,
+                       version_blob.data, version_blob.length);
+
+               data_blob_free(&version_blob);
+
+               if (DEBUGLEVEL >= 10) {
+                       struct CHALLENGE_MESSAGE *challenge = talloc(
+                               ntlmssp_state, struct CHALLENGE_MESSAGE);
+                       if (challenge != NULL) {
+                               challenge->NegotiateFlags = chal_flags;
+                               status = ntlmssp_pull_CHALLENGE_MESSAGE(
+                                       reply, challenge, challenge);
+                               if (NT_STATUS_IS_OK(status)) {
+                                       NDR_PRINT_DEBUG(CHALLENGE_MESSAGE,
+                                                       challenge);
+                               }
+                               TALLOC_FREE(challenge);
+                       }
                }
-               
-               msrpc_gen(out_mem_ctx, 
-                         out, gen_string,
-                         "NTLMSSP", 
-                         NTLMSSP_CHALLENGE,
-                         target_name,
-                         chal_flags,
-                         cryptkey, 8,
-                         0, 0,
-                         struct_blob.data, struct_blob.length);
        }
-               
-       gensec_ntlmssp_state->expected_state = NTLMSSP_AUTH;
+
+       data_blob_free(&struct_blob);
+
+       ntlmssp_state->expected_state = NTLMSSP_AUTH;
 
        return NT_STATUS_MORE_PROCESSING_REQUIRED;
 }
 
+struct ntlmssp_server_auth_state {
+       DATA_BLOB user_session_key;
+       DATA_BLOB lm_session_key;
+       /* internal variables used by KEY_EXCH (client-supplied user session key */
+       DATA_BLOB encrypted_session_key;
+       bool doing_ntlm2;
+       /* internal variables used by NTLM2 */
+       uint8_t session_nonce[16];
+};
+
 /**
  * Next state function for the Authenticate packet
  * 
- * @param gensec_ntlmssp_state NTLMSSP State
+ * @param ntlmssp_state NTLMSSP State
  * @param request The request, as a DATA_BLOB
  * @return Errors or NT_STATUS_OK. 
  */
 
-static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlmssp_state,
+static NTSTATUS ntlmssp_server_preauth(struct ntlmssp_state *ntlmssp_state,
+                                      struct ntlmssp_server_auth_state *state,
                                       const DATA_BLOB request) 
 {
        uint32_t ntlmssp_command, auth_flags;
@@ -256,138 +228,131 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms
        uint8_t session_nonce_hash[16];
 
        const char *parse_string;
-       char *domain = NULL;
-       char *user = NULL;
-       char *workstation = NULL;
 
 #if 0
        file_save("ntlmssp_auth.dat", request.data, request.length);
 #endif
 
-       if (gensec_ntlmssp_state->unicode) {
+       if (ntlmssp_state->unicode) {
                parse_string = "CdBBUUUBd";
        } else {
                parse_string = "CdBBAAABd";
        }
 
        /* zero these out */
-       data_blob_free(&gensec_ntlmssp_state->lm_resp);
-       data_blob_free(&gensec_ntlmssp_state->nt_resp);
-       data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
+       data_blob_free(&ntlmssp_state->session_key);
+       data_blob_free(&ntlmssp_state->lm_resp);
+       data_blob_free(&ntlmssp_state->nt_resp);
 
-       gensec_ntlmssp_state->user = NULL;
-       gensec_ntlmssp_state->domain = NULL;
-       gensec_ntlmssp_state->workstation = NULL;
+       ntlmssp_state->user = NULL;
+       ntlmssp_state->domain = NULL;
+       ntlmssp_state->client.netbios_name = NULL;
 
        /* now the NTLMSSP encoded auth hashes */
-       if (!msrpc_parse(gensec_ntlmssp_state, 
-                        &request, parse_string,
-                        "NTLMSSP", 
-                        &ntlmssp_command, 
-                        &gensec_ntlmssp_state->lm_resp,
-                        &gensec_ntlmssp_state->nt_resp,
-                        &domain, 
-                        &user, 
-                        &workstation,
-                        &gensec_ntlmssp_state->encrypted_session_key,
+       if (!msrpc_parse(ntlmssp_state, &request, parse_string,
+                        "NTLMSSP",
+                        &ntlmssp_command,
+                        &ntlmssp_state->lm_resp,
+                        &ntlmssp_state->nt_resp,
+                        &ntlmssp_state->domain,
+                        &ntlmssp_state->user,
+                        &ntlmssp_state->client.netbios_name,
+                        &state->encrypted_session_key,
                         &auth_flags)) {
                DEBUG(10, ("ntlmssp_server_auth: failed to parse NTLMSSP (nonfatal):\n"));
                dump_data(10, request.data, request.length);
 
                /* zero this out */
-               data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
+               data_blob_free(&state->encrypted_session_key);
                auth_flags = 0;
                
                /* Try again with a shorter string (Win9X truncates this packet) */
-               if (gensec_ntlmssp_state->unicode) {
+               if (ntlmssp_state->unicode) {
                        parse_string = "CdBBUUU";
                } else {
                        parse_string = "CdBBAAA";
                }
 
                /* now the NTLMSSP encoded auth hashes */
-               if (!msrpc_parse(gensec_ntlmssp_state, 
-                                &request, parse_string,
-                                "NTLMSSP", 
-                                &ntlmssp_command, 
-                                &gensec_ntlmssp_state->lm_resp,
-                                &gensec_ntlmssp_state->nt_resp,
-                                &domain, 
-                                &user, 
-                                &workstation)) {
-                       DEBUG(1, ("ntlmssp_server_auth: failed to parse NTLMSSP:\n"));
+               if (!msrpc_parse(ntlmssp_state, &request, parse_string,
+                                "NTLMSSP",
+                                &ntlmssp_command,
+                                &ntlmssp_state->lm_resp,
+                                &ntlmssp_state->nt_resp,
+                                &ntlmssp_state->domain,
+                                &ntlmssp_state->user,
+                                &ntlmssp_state->client.netbios_name)) {
+                       DEBUG(1, ("ntlmssp_server_auth: failed to parse NTLMSSP (tried both formats):\n"));
                        dump_data(2, request.data, request.length);
 
                        return NT_STATUS_INVALID_PARAMETER;
                }
        }
 
-       if (auth_flags)
-               ntlmssp_handle_neg_flags(gensec_ntlmssp_state, auth_flags, gensec_ntlmssp_state->allow_lm_key);
+       talloc_steal(state, state->encrypted_session_key.data);
 
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_domain(gensec_ntlmssp_state, domain))) {
-               /* zero this out */
-               data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
-               return nt_status;
-       }
-
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_username(gensec_ntlmssp_state, user))) {
-               /* zero this out */
-               data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
-               return nt_status;
-       }
-
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_workstation(gensec_ntlmssp_state, workstation))) {
-               /* zero this out */
-               data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
-               return nt_status;
+       if (auth_flags)
+               ntlmssp_handle_neg_flags(ntlmssp_state, auth_flags, ntlmssp_state->allow_lm_key);
+
+       if (DEBUGLEVEL >= 10) {
+               struct AUTHENTICATE_MESSAGE *authenticate = talloc(
+                       ntlmssp_state, struct AUTHENTICATE_MESSAGE);
+               if (authenticate != NULL) {
+                       NTSTATUS status;
+                       authenticate->NegotiateFlags = auth_flags;
+                       status = ntlmssp_pull_AUTHENTICATE_MESSAGE(
+                               &request, authenticate, authenticate);
+                       if (NT_STATUS_IS_OK(status)) {
+                               NDR_PRINT_DEBUG(AUTHENTICATE_MESSAGE,
+                                               authenticate);
+                       }
+                       TALLOC_FREE(authenticate);
+               }
        }
 
        DEBUG(3,("Got user=[%s] domain=[%s] workstation=[%s] len1=%lu len2=%lu\n",
-                gensec_ntlmssp_state->user, gensec_ntlmssp_state->domain, gensec_ntlmssp_state->workstation, (unsigned long)gensec_ntlmssp_state->lm_resp.length, (unsigned long)gensec_ntlmssp_state->nt_resp.length));
+                ntlmssp_state->user, ntlmssp_state->domain,
+                ntlmssp_state->client.netbios_name,
+                (unsigned long)ntlmssp_state->lm_resp.length,
+                (unsigned long)ntlmssp_state->nt_resp.length));
 
 #if 0
-       file_save("nthash1.dat",  &gensec_ntlmssp_state->nt_resp.data,  &gensec_ntlmssp_state->nt_resp.length);
-       file_save("lmhash1.dat",  &gensec_ntlmssp_state->lm_resp.data,  &gensec_ntlmssp_state->lm_resp.length);
+       file_save("nthash1.dat",  &ntlmssp_state->nt_resp.data,  &ntlmssp_state->nt_resp.length);
+       file_save("lmhash1.dat",  &ntlmssp_state->lm_resp.data,  &ntlmssp_state->lm_resp.length);
 #endif
 
-       /* NTLM2 uses a 'challenge' that is made of up both the server challenge, and a 
-          client challenge 
-       
+       /* NTLM2 uses a 'challenge' that is made of up both the server challenge, and a
+          client challenge
+
           However, the NTLM2 flag may still be set for the real NTLMv2 logins, be careful.
        */
-       if (gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
-               if (gensec_ntlmssp_state->nt_resp.length == 24 && gensec_ntlmssp_state->lm_resp.length == 24) {
+       if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
+               if (ntlmssp_state->nt_resp.length == 24 && ntlmssp_state->lm_resp.length == 24) {
                        struct MD5Context md5_session_nonce_ctx;
-                       SMB_ASSERT(gensec_ntlmssp_state->internal_chal.data 
-                                  && gensec_ntlmssp_state->internal_chal.length == 8);
-                       
-                       gensec_ntlmssp_state->doing_ntlm2 = true;
+                       state->doing_ntlm2 = true;
 
-                       memcpy(gensec_ntlmssp_state->crypt.ntlm2.session_nonce, gensec_ntlmssp_state->internal_chal.data, 8);
-                       memcpy(&gensec_ntlmssp_state->crypt.ntlm2.session_nonce[8], gensec_ntlmssp_state->lm_resp.data, 8);
+                       memcpy(state->session_nonce, ntlmssp_state->internal_chal.data, 8);
+                       memcpy(&state->session_nonce[8], ntlmssp_state->lm_resp.data, 8);
                        
+                       SMB_ASSERT(ntlmssp_state->internal_chal.data && ntlmssp_state->internal_chal.length == 8);
+
                        MD5Init(&md5_session_nonce_ctx);
-                       MD5Update(&md5_session_nonce_ctx, gensec_ntlmssp_state->crypt.ntlm2.session_nonce, 16);
+                       MD5Update(&md5_session_nonce_ctx, state->session_nonce, 16);
                        MD5Final(session_nonce_hash, &md5_session_nonce_ctx);
-                       
-                       gensec_ntlmssp_state->chal = data_blob_talloc(gensec_ntlmssp_state, 
-                                                              session_nonce_hash, 8);
 
-                       /* LM response is no longer useful, zero it out */
-                       data_blob_free(&gensec_ntlmssp_state->lm_resp);
+                       ntlmssp_state->chal = data_blob_talloc(
+                               ntlmssp_state, session_nonce_hash, 8);
+
+                       /* LM response is no longer useful */
+                       data_blob_free(&ntlmssp_state->lm_resp);
 
                        /* We changed the effective challenge - set it */
-                       if (!NT_STATUS_IS_OK(nt_status = 
-                                            gensec_ntlmssp_state->set_challenge(gensec_ntlmssp_state, 
-                                                                                &gensec_ntlmssp_state->chal))) {
-                               /* zero this out */
-                               data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
+                       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_state->set_challenge(ntlmssp_state, &ntlmssp_state->chal))) {
                                return nt_status;
                        }
 
-                       /* LM Key is incompatible... */
-                       gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+                       /* LM Key is incompatible. */
+                       ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
                }
        }
        return NT_STATUS_OK;
@@ -397,142 +362,132 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms
  * Next state function for the Authenticate packet 
  * (after authentication - figures out the session keys etc)
  * 
- * @param gensec_ntlmssp_state NTLMSSP State
+ * @param ntlmssp_state NTLMSSP State
  * @return Errors or NT_STATUS_OK. 
  */
 
-static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, 
-                                       DATA_BLOB *user_session_key, 
-                                       DATA_BLOB *lm_session_key) 
+static NTSTATUS ntlmssp_server_postauth(struct ntlmssp_state *ntlmssp_state,
+                                       struct ntlmssp_server_auth_state *state)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
+       DATA_BLOB user_session_key = state->user_session_key;
+       DATA_BLOB lm_session_key = state->lm_session_key;
        NTSTATUS nt_status;
        DATA_BLOB session_key = data_blob(NULL, 0);
 
-       if (user_session_key)
-               dump_data_pw("USER session key:\n", user_session_key->data, user_session_key->length);
-
-       if (lm_session_key) 
-               dump_data_pw("LM first-8:\n", lm_session_key->data, lm_session_key->length);
+       dump_data_pw("NT session key:\n", user_session_key.data, user_session_key.length);
+       dump_data_pw("LM first-8:\n", lm_session_key.data, lm_session_key.length);
 
        /* Handle the different session key derivation for NTLM2 */
-       if (gensec_ntlmssp_state->doing_ntlm2) {
-               if (user_session_key && user_session_key->data && user_session_key->length == 16) {
-                       session_key = data_blob_talloc(gensec_ntlmssp_state, NULL, 16);
-                       hmac_md5(user_session_key->data, gensec_ntlmssp_state->crypt.ntlm2.session_nonce, 
-                                sizeof(gensec_ntlmssp_state->crypt.ntlm2.session_nonce), session_key.data);
+       if (state->doing_ntlm2) {
+               if (user_session_key.data && user_session_key.length == 16) {
+                       session_key = data_blob_talloc(ntlmssp_state,
+                                                      NULL, 16);
+                       hmac_md5(user_session_key.data, state->session_nonce,
+                                sizeof(state->session_nonce), session_key.data);
                        DEBUG(10,("ntlmssp_server_auth: Created NTLM2 session key.\n"));
                        dump_data_pw("NTLM2 session key:\n", session_key.data, session_key.length);
-                       
+
                } else {
                        DEBUG(10,("ntlmssp_server_auth: Failed to create NTLM2 session key.\n"));
-                       session_key = data_blob(NULL, 0);
+                       session_key = data_blob_null;
                }
-       } else if ((gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) 
+       } else if ((ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY)
                /* Ensure we can never get here on NTLMv2 */
-               && (gensec_ntlmssp_state->nt_resp.length == 0 || gensec_ntlmssp_state->nt_resp.length == 24)) {
-
-               if (lm_session_key && lm_session_key->data && lm_session_key->length >= 8) {
-                       if (gensec_ntlmssp_state->lm_resp.data && gensec_ntlmssp_state->lm_resp.length == 24) {
-                               session_key = data_blob_talloc(gensec_ntlmssp_state, NULL, 16);
-                               SMBsesskeygen_lm_sess_key(lm_session_key->data, gensec_ntlmssp_state->lm_resp.data, 
+               && (ntlmssp_state->nt_resp.length == 0 || ntlmssp_state->nt_resp.length == 24)) {
+
+               if (lm_session_key.data && lm_session_key.length >= 8) {
+                       if (ntlmssp_state->lm_resp.data && ntlmssp_state->lm_resp.length == 24) {
+                               session_key = data_blob_talloc(ntlmssp_state,
+                                                              NULL, 16);
+                               if (session_key.data == NULL) {
+                                       return NT_STATUS_NO_MEMORY;
+                               }
+                               SMBsesskeygen_lm_sess_key(lm_session_key.data, ntlmssp_state->lm_resp.data,
                                                          session_key.data);
                                DEBUG(10,("ntlmssp_server_auth: Created NTLM session key.\n"));
-                               dump_data_pw("LM session key:\n", session_key.data, session_key.length);
-                       } else {
-                               
-                               /* When there is no LM response, just use zeros */
-                               static const uint8_t zeros[24];
-                               session_key = data_blob_talloc(gensec_ntlmssp_state, NULL, 16);
+                       } else {
+                               static const uint8_t zeros[24] = {0, };
+                               session_key = data_blob_talloc(
+                                       ntlmssp_state, NULL, 16);
+                               if (session_key.data == NULL) {
+                                       return NT_STATUS_NO_MEMORY;
+                               }
                                SMBsesskeygen_lm_sess_key(zeros, zeros, 
                                                          session_key.data);
                                DEBUG(10,("ntlmssp_server_auth: Created NTLM session key.\n"));
-                               dump_data_pw("LM session key:\n", session_key.data, session_key.length);
                        }
+                       dump_data_pw("LM session key:\n", session_key.data,
+                                    session_key.length);
                } else {
                        /* LM Key not selected */
-                       gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+                       ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
 
                        DEBUG(10,("ntlmssp_server_auth: Failed to create NTLM session key.\n"));
-                       session_key = data_blob(NULL, 0);
+                       session_key = data_blob_null;
                }
 
-       } else if (user_session_key && user_session_key->data) {
-               session_key = *user_session_key;
+       } else if (user_session_key.data) {
+               session_key = user_session_key;
                DEBUG(10,("ntlmssp_server_auth: Using unmodified nt session key.\n"));
                dump_data_pw("unmodified session key:\n", session_key.data, session_key.length);
 
                /* LM Key not selected */
-               gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
 
-       } else if (lm_session_key && lm_session_key->data) {
+       } else if (lm_session_key.data) {
                /* Very weird to have LM key, but no user session key, but anyway.. */
-               session_key = *lm_session_key;
+               session_key = lm_session_key;
                DEBUG(10,("ntlmssp_server_auth: Using unmodified lm session key.\n"));
                dump_data_pw("unmodified session key:\n", session_key.data, session_key.length);
 
                /* LM Key not selected */
-               gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
 
        } else {
                DEBUG(10,("ntlmssp_server_auth: Failed to create unmodified session key.\n"));
-               session_key = data_blob(NULL, 0);
+               session_key = data_blob_null;
 
                /* LM Key not selected */
-               gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
        }
 
-       /* With KEY_EXCH, the client supplies the proposed session key, 
+       /* With KEY_EXCH, the client supplies the proposed session key,
           but encrypts it with the long-term key */
-       if (gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
-               if (!gensec_ntlmssp_state->encrypted_session_key.data 
-                   || gensec_ntlmssp_state->encrypted_session_key.length != 16) {
-                       data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
+       if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
+               if (!state->encrypted_session_key.data
+                   || state->encrypted_session_key.length != 16) {
+                       data_blob_free(&state->encrypted_session_key);
                        DEBUG(1, ("Client-supplied KEY_EXCH session key was of invalid length (%u)!\n", 
-                                 (unsigned)gensec_ntlmssp_state->encrypted_session_key.length));
+                                 (unsigned)state->encrypted_session_key.length));
                        return NT_STATUS_INVALID_PARAMETER;
                } else if (!session_key.data || session_key.length != 16) {
-                       DEBUG(5, ("server session key is invalid (len == %u), cannot do KEY_EXCH!\n", 
-                                 (unsigned)session_key.length));
-                       gensec_ntlmssp_state->session_key = session_key;
+                       DEBUG(5, ("server session key is invalid (len == %u), cannot do KEY_EXCH!\n",
+                                 (unsigned int)session_key.length));
+                       ntlmssp_state->session_key = session_key;
                } else {
                        dump_data_pw("KEY_EXCH session key (enc):\n", 
-                                    gensec_ntlmssp_state->encrypted_session_key.data, 
-                                    gensec_ntlmssp_state->encrypted_session_key.length);
-                       arcfour_crypt(gensec_ntlmssp_state->encrypted_session_key.data, 
+                                    state->encrypted_session_key.data,
+                                    state->encrypted_session_key.length);
+                       arcfour_crypt(state->encrypted_session_key.data,
                                      session_key.data, 
-                                     gensec_ntlmssp_state->encrypted_session_key.length);
-                       gensec_ntlmssp_state->session_key = data_blob_talloc(gensec_ntlmssp_state, 
-                                                                     gensec_ntlmssp_state->encrypted_session_key.data, 
-                                                                     gensec_ntlmssp_state->encrypted_session_key.length);
-                       dump_data_pw("KEY_EXCH session key:\n", gensec_ntlmssp_state->encrypted_session_key.data, 
-                                    gensec_ntlmssp_state->encrypted_session_key.length);
+                                     state->encrypted_session_key.length);
+                       ntlmssp_state->session_key = data_blob_talloc(ntlmssp_state,
+                                                                     state->encrypted_session_key.data,
+                                                                     state->encrypted_session_key.length);
+                       dump_data_pw("KEY_EXCH session key:\n",
+                                    state->encrypted_session_key.data,
+                                    state->encrypted_session_key.length);
+                       talloc_free(session_key.data);
                }
        } else {
-               gensec_ntlmssp_state->session_key = session_key;
+               ntlmssp_state->session_key = session_key;
        }
 
-       /* keep the session key around on the new context */
-       talloc_steal(gensec_ntlmssp_state, session_key.data);
-
-       if ((gensec_security->want_features & GENSEC_FEATURE_SIGN)
-           || (gensec_security->want_features & GENSEC_FEATURE_SEAL)) {
-               nt_status = ntlmssp_sign_init(gensec_ntlmssp_state);
-       } else {
-               nt_status = NT_STATUS_OK;
+       if (ntlmssp_state->session_key.length) {
+               nt_status = ntlmssp_sign_init(ntlmssp_state);
        }
 
-       data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
-       
-       /* allow arbitarily many authentications, but watch that this will cause a 
-          memory leak, until the gensec_ntlmssp_state is shutdown 
-       */
-
-       if (gensec_ntlmssp_state->server_multiple_authentications) {
-               gensec_ntlmssp_state->expected_state = NTLMSSP_AUTH;
-       } else {
-               gensec_ntlmssp_state->expected_state = NTLMSSP_DONE;
-       }
+       ntlmssp_state->expected_state = NTLMSSP_DONE;
 
        return nt_status;
 }
@@ -548,25 +503,24 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security,
  * @return Errors or NT_STATUS_OK if authentication sucessful
  */
 
-NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security, 
+NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
                             TALLOC_CTX *out_mem_ctx, 
                             const DATA_BLOB in, DATA_BLOB *out) 
 {      
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
-       DATA_BLOB user_session_key = data_blob(NULL, 0);
-       DATA_BLOB lm_session_key = data_blob(NULL, 0);
+       struct ntlmssp_server_auth_state *state;
        NTSTATUS nt_status;
 
-       TALLOC_CTX *mem_ctx = talloc_new(out_mem_ctx);
-       if (!mem_ctx) {
+       /* zero the outbound NTLMSSP packet */
+       *out = data_blob_null;
+
+       state = talloc_zero(ntlmssp_state, struct ntlmssp_server_auth_state);
+       if (state == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       /* zero the outbound NTLMSSP packet */
-       *out = data_blob_talloc(out_mem_ctx, NULL, 0);
-
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_server_preauth(gensec_ntlmssp_state, in))) {
-               talloc_free(mem_ctx);
+       nt_status = ntlmssp_server_preauth(ntlmssp_state, state, in);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               TALLOC_FREE(state);
                return nt_status;
        }
 
@@ -578,43 +532,92 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security,
         */
 
        /* Finally, actually ask if the password is OK */
-
-       if (!NT_STATUS_IS_OK(nt_status = gensec_ntlmssp_state->check_password(gensec_ntlmssp_state, mem_ctx,
-                                                                             &user_session_key, &lm_session_key))) {
-               talloc_free(mem_ctx);
+       nt_status = ntlmssp_state->check_password(ntlmssp_state,
+                                                 &state->user_session_key,
+                                                 &state->lm_session_key);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               TALLOC_FREE(state);
                return nt_status;
        }
-       
-       if (gensec_security->want_features
-           & (GENSEC_FEATURE_SIGN|GENSEC_FEATURE_SEAL|GENSEC_FEATURE_SESSION_KEY)) {
-               nt_status = ntlmssp_server_postauth(gensec_security, &user_session_key, &lm_session_key);
-               talloc_free(mem_ctx);
+
+       /* When we get more async in the auth code behind
+          ntlmssp_state->check_password, the ntlmssp_server_postpath
+          can be done in a callback */
+
+       nt_status = ntlmssp_server_postauth(ntlmssp_state, state);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               TALLOC_FREE(state);
                return nt_status;
-       } else {
-               gensec_ntlmssp_state->session_key = data_blob(NULL, 0);
-               talloc_free(mem_ctx);
-               return NT_STATUS_OK;
        }
+
+       TALLOC_FREE(state);
+       return NT_STATUS_OK;
 }
 
+/**
+ * Next state function for the Negotiate packet (GENSEC wrapper)
+ *
+ * @param gensec_security GENSEC state
+ * @param out_mem_ctx Memory context for *out
+ * @param in The request, as a DATA_BLOB.  reply.data must be NULL
+ * @param out The reply, as an allocated DATA_BLOB, caller to free.
+ * @return Errors or MORE_PROCESSING_REQUIRED if (normal) a reply is required.
+ */
+
+NTSTATUS gensec_ntlmssp_server_negotiate(struct gensec_security *gensec_security,
+                                        TALLOC_CTX *out_mem_ctx,
+                                        const DATA_BLOB request, DATA_BLOB *reply)
+{
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
+       return ntlmssp_server_negotiate(ntlmssp_state, out_mem_ctx, request, reply);
+}
+
+/**
+ * Next state function for the Authenticate packet (GENSEC wrapper)
+ *
+ * @param gensec_security GENSEC state
+ * @param out_mem_ctx Memory context for *out
+ * @param in The request, as a DATA_BLOB.  reply.data must be NULL
+ * @param out The reply, as an allocated DATA_BLOB, caller to free.
+ * @return Errors or NT_STATUS_OK if authentication sucessful
+ */
+
+NTSTATUS gensec_ntlmssp_server_auth(struct gensec_security *gensec_security,
+                                   TALLOC_CTX *out_mem_ctx,
+                                   const DATA_BLOB in, DATA_BLOB *out)
+{
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
+       return ntlmssp_server_auth(ntlmssp_state, out_mem_ctx, in, out);
+};
+
 /**
  * Return the challenge as determined by the authentication subsystem 
  * @return an 8 byte random challenge
  */
 
-static const uint8_t *auth_ntlmssp_get_challenge(const struct gensec_ntlmssp_state *gensec_ntlmssp_state)
+static NTSTATUS auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state,
+                                          uint8_t chal[8])
 {
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(ntlmssp_state->callback_private,
+                                     struct gensec_ntlmssp_context);
+       struct auth_context *auth_context = gensec_ntlmssp->auth_context;
        NTSTATUS status;
-       const uint8_t *chal;
 
-       status = gensec_ntlmssp_state->auth_context->get_challenge(gensec_ntlmssp_state->auth_context, &chal);
+       status = auth_context->get_challenge(auth_context, chal);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1, ("auth_ntlmssp_get_challenge: failed to get challenge: %s\n",
                        nt_errstr(status)));
-               return NULL;
+               return status;
        }
 
-       return chal;
+       return NT_STATUS_OK;
 }
 
 /**
@@ -622,19 +625,27 @@ static const uint8_t *auth_ntlmssp_get_challenge(const struct gensec_ntlmssp_sta
  *
  * @return If the effective challenge used by the auth subsystem may be modified
  */
-static bool auth_ntlmssp_may_set_challenge(const struct gensec_ntlmssp_state *gensec_ntlmssp_state)
+static bool auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
 {
-       return gensec_ntlmssp_state->auth_context->challenge_may_be_modified(gensec_ntlmssp_state->auth_context);
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(ntlmssp_state->callback_private,
+                                     struct gensec_ntlmssp_context);
+       struct auth_context *auth_context = gensec_ntlmssp->auth_context;
+
+       return auth_context->challenge_may_be_modified(auth_context);
 }
 
 /**
  * NTLM2 authentication modifies the effective challenge, 
  * @param challenge The new challenge value
  */
-static NTSTATUS auth_ntlmssp_set_challenge(struct gensec_ntlmssp_state *gensec_ntlmssp_state, DATA_BLOB *challenge)
+static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge)
 {
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(ntlmssp_state->callback_private,
+                                     struct gensec_ntlmssp_context);
+       struct auth_context *auth_context = gensec_ntlmssp->auth_context;
        NTSTATUS nt_status;
-       struct auth_context *auth_context = gensec_ntlmssp_state->auth_context;
        const uint8_t *chal;
 
        if (challenge->length != 8) {
@@ -643,9 +654,9 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct gensec_ntlmssp_state *gensec_n
 
        chal = challenge->data;
 
-       nt_status = gensec_ntlmssp_state->auth_context->set_challenge(auth_context, 
-                                                                     chal, 
-                                                                     "NTLMSSP callback (NTLM2)");
+       nt_status = auth_context->set_challenge(auth_context,
+                                               chal,
+                                               "NTLMSSP callback (NTLM2)");
 
        return nt_status;
 }
@@ -656,12 +667,17 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct gensec_ntlmssp_state *gensec_n
  * Return the session keys used on the connection.
  */
 
-static NTSTATUS auth_ntlmssp_check_password(struct gensec_ntlmssp_state *gensec_ntlmssp_state, 
-                                           TALLOC_CTX *mem_ctx, 
-                                           DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) 
+static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
+                                           DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key)
 {
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(ntlmssp_state->callback_private,
+                                     struct gensec_ntlmssp_context);
+       struct auth_context *auth_context = gensec_ntlmssp->auth_context;
        NTSTATUS nt_status;
-       struct auth_usersupplied_info *user_info = talloc(mem_ctx, struct auth_usersupplied_info);
+       struct auth_usersupplied_info *user_info;
+
+       user_info = talloc(ntlmssp_state, struct auth_usersupplied_info);
        if (!user_info) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -669,43 +685,33 @@ static NTSTATUS auth_ntlmssp_check_password(struct gensec_ntlmssp_state *gensec_
        user_info->logon_parameters = MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT | MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT;
        user_info->flags = 0;
        user_info->mapped_state = false;
-       user_info->client.account_name = gensec_ntlmssp_state->user;
-       user_info->client.domain_name = gensec_ntlmssp_state->domain;
-       user_info->workstation_name = gensec_ntlmssp_state->workstation;
-       user_info->remote_host = gensec_get_peer_addr(gensec_ntlmssp_state->gensec_security);
+       user_info->client.account_name = ntlmssp_state->user;
+       user_info->client.domain_name = ntlmssp_state->domain;
+       user_info->workstation_name = ntlmssp_state->client.netbios_name;
+       user_info->remote_host = gensec_get_remote_address(gensec_ntlmssp->gensec_security);
 
        user_info->password_state = AUTH_PASSWORD_RESPONSE;
-       user_info->password.response.lanman = gensec_ntlmssp_state->lm_resp;
-       user_info->password.response.lanman.data = talloc_steal(user_info, gensec_ntlmssp_state->lm_resp.data);
-       user_info->password.response.nt = gensec_ntlmssp_state->nt_resp;
-       user_info->password.response.nt.data = talloc_steal(user_info, gensec_ntlmssp_state->nt_resp.data);
-
-       nt_status = gensec_ntlmssp_state->auth_context->check_password(gensec_ntlmssp_state->auth_context, 
-                                                                      mem_ctx,
-                                                                      user_info, 
-                                                                      &gensec_ntlmssp_state->server_info);
+       user_info->password.response.lanman = ntlmssp_state->lm_resp;
+       user_info->password.response.lanman.data = talloc_steal(user_info, ntlmssp_state->lm_resp.data);
+       user_info->password.response.nt = ntlmssp_state->nt_resp;
+       user_info->password.response.nt.data = talloc_steal(user_info, ntlmssp_state->nt_resp.data);
+
+       nt_status = auth_context->check_password(auth_context,
+                                                gensec_ntlmssp,
+                                                user_info,
+                                                &gensec_ntlmssp->server_info);
        talloc_free(user_info);
        NT_STATUS_NOT_OK_RETURN(nt_status);
 
-       talloc_steal(gensec_ntlmssp_state, gensec_ntlmssp_state->server_info);
-
-       if (gensec_ntlmssp_state->server_info->user_session_key.length) {
-               DEBUG(10, ("Got NT session key of length %u\n", 
-                          (unsigned)gensec_ntlmssp_state->server_info->user_session_key.length));
-               if (!talloc_reference(mem_ctx, gensec_ntlmssp_state->server_info->user_session_key.data)) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-
-               *user_session_key = gensec_ntlmssp_state->server_info->user_session_key;
+       if (gensec_ntlmssp->server_info->user_session_key.length) {
+               DEBUG(10, ("Got NT session key of length %u\n",
+                          (unsigned)gensec_ntlmssp->server_info->user_session_key.length));
+               *user_session_key = gensec_ntlmssp->server_info->user_session_key;
        }
-       if (gensec_ntlmssp_state->server_info->lm_session_key.length) {
-               DEBUG(10, ("Got LM session key of length %u\n", 
-                          (unsigned)gensec_ntlmssp_state->server_info->lm_session_key.length));
-               if (!talloc_reference(mem_ctx, gensec_ntlmssp_state->server_info->lm_session_key.data)) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-
-               *lm_session_key = gensec_ntlmssp_state->server_info->lm_session_key;
+       if (gensec_ntlmssp->server_info->lm_session_key.length) {
+               DEBUG(10, ("Got LM session key of length %u\n",
+                          (unsigned)gensec_ntlmssp->server_info->lm_session_key.length));
+               *lm_session_key = gensec_ntlmssp->server_info->lm_session_key;
        }
        return nt_status;
 }
@@ -724,14 +730,20 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security,
                                     struct auth_session_info **session_info) 
 {
        NTSTATUS nt_status;
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
-
-       nt_status = auth_generate_session_info(gensec_ntlmssp_state, gensec_security->event_ctx, gensec_security->settings->lp_ctx, gensec_ntlmssp_state->server_info, session_info);
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
+
+       nt_status = gensec_generate_session_info(ntlmssp_state,
+                                                gensec_security,
+                                                gensec_ntlmssp->server_info,
+                                                session_info);
        NT_STATUS_NOT_OK_RETURN(nt_status);
 
        (*session_info)->session_key = data_blob_talloc(*session_info, 
-                                                       gensec_ntlmssp_state->session_key.data,
-                                                       gensec_ntlmssp_state->session_key.length);
+                                                       ntlmssp_state->session_key.data,
+                                                       ntlmssp_state->session_key.length);
 
        return NT_STATUS_OK;
 }
@@ -743,68 +755,95 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security,
 NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security)
 {
        NTSTATUS nt_status;
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state;
+       struct ntlmssp_state *ntlmssp_state;
+       struct gensec_ntlmssp_context *gensec_ntlmssp;
 
        nt_status = gensec_ntlmssp_start(gensec_security);
        NT_STATUS_NOT_OK_RETURN(nt_status);
 
-       gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
-
-       gensec_ntlmssp_state->role = NTLMSSP_SERVER;
-
-       gensec_ntlmssp_state->workstation = NULL;
-       gensec_ntlmssp_state->server_name = lp_netbios_name(gensec_security->settings->lp_ctx);
+       gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data,
+                                              struct gensec_ntlmssp_context);
+       ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
 
-       gensec_ntlmssp_state->domain = lp_workgroup(gensec_security->settings->lp_ctx);
+       ntlmssp_state->role = NTLMSSP_SERVER;
 
-       gensec_ntlmssp_state->expected_state = NTLMSSP_NEGOTIATE;
+       ntlmssp_state->expected_state = NTLMSSP_NEGOTIATE;
 
-       gensec_ntlmssp_state->allow_lm_key = (lp_lanman_auth(gensec_security->settings->lp_ctx) 
+       ntlmssp_state->allow_lm_key = (lpcfg_lanman_auth(gensec_security->settings->lp_ctx)
                                          && gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "allow_lm_key", false));
 
-       gensec_ntlmssp_state->server_multiple_authentications = false;
-       
-       gensec_ntlmssp_state->neg_flags = 
-               NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_UNKNOWN_02000000;
+       ntlmssp_state->neg_flags =
+               NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_VERSION;
 
-       gensec_ntlmssp_state->lm_resp = data_blob(NULL, 0);
-       gensec_ntlmssp_state->nt_resp = data_blob(NULL, 0);
-       gensec_ntlmssp_state->encrypted_session_key = data_blob(NULL, 0);
+       ntlmssp_state->lm_resp = data_blob(NULL, 0);
+       ntlmssp_state->nt_resp = data_blob(NULL, 0);
 
        if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "128bit", true)) {
-               gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128;               
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128;
        }
 
        if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "56bit", true)) {
-               gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56;                
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56;
        }
 
        if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "keyexchange", true)) {
-               gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH;          
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH;
        }
 
        if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "alwayssign", true)) {
-               gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN;               
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
        }
 
        if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "ntlm2", true)) {
-               gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;             
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
        }
 
        if (gensec_security->want_features & GENSEC_FEATURE_SIGN) {
-               gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
        }
        if (gensec_security->want_features & GENSEC_FEATURE_SEAL) {
-               gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
+       }
+
+       gensec_ntlmssp->auth_context = gensec_security->auth_context;
+
+       ntlmssp_state->get_challenge = auth_ntlmssp_get_challenge;
+       ntlmssp_state->may_set_challenge = auth_ntlmssp_may_set_challenge;
+       ntlmssp_state->set_challenge = auth_ntlmssp_set_challenge;
+       ntlmssp_state->check_password = auth_ntlmssp_check_password;
+       if (lpcfg_server_role(gensec_security->settings->lp_ctx) == ROLE_STANDALONE) {
+               ntlmssp_state->server.is_standalone = true;
+       } else {
+               ntlmssp_state->server.is_standalone = false;
        }
 
-       gensec_ntlmssp_state->auth_context = gensec_security->auth_context;
+       ntlmssp_state->server.netbios_name = lpcfg_netbios_name(gensec_security->settings->lp_ctx);
+
+       ntlmssp_state->server.netbios_domain = lpcfg_workgroup(gensec_security->settings->lp_ctx);
 
-       gensec_ntlmssp_state->get_challenge = auth_ntlmssp_get_challenge;
-       gensec_ntlmssp_state->may_set_challenge = auth_ntlmssp_may_set_challenge;
-       gensec_ntlmssp_state->set_challenge = auth_ntlmssp_set_challenge;
-       gensec_ntlmssp_state->check_password = auth_ntlmssp_check_password;
-       gensec_ntlmssp_state->server_role = lp_server_role(gensec_security->settings->lp_ctx);
+       {
+               char dnsdomname[MAXHOSTNAMELEN], dnsname[MAXHOSTNAMELEN];
+
+               /* Find out the DNS domain name */
+               dnsdomname[0] = '\0';
+               safe_strcpy(dnsdomname, lpcfg_dnsdomain(gensec_security->settings->lp_ctx), sizeof(dnsdomname) - 1);
+
+               /* Find out the DNS host name */
+               safe_strcpy(dnsname, ntlmssp_state->server.netbios_name, sizeof(dnsname) - 1);
+               if (dnsdomname[0] != '\0') {
+                       safe_strcat(dnsname, ".", sizeof(dnsname) - 1);
+                       safe_strcat(dnsname, dnsdomname, sizeof(dnsname) - 1);
+               }
+               strlower_m(dnsname);
+
+               ntlmssp_state->server.dns_name = talloc_strdup(ntlmssp_state,
+                                                                     dnsname);
+               NT_STATUS_HAVE_NO_MEMORY(ntlmssp_state->server.dns_name);
+
+               ntlmssp_state->server.dns_domain = talloc_strdup(ntlmssp_state,
+                                                                       dnsdomname);
+               NT_STATUS_HAVE_NO_MEMORY(ntlmssp_state->server.dns_domain);
+       }
 
        return NT_STATUS_OK;
 }