libcli/auth Make gd's NDR NTLMSSP parsers helpers common
[ira/wip.git] / source3 / libsmb / ntlmssp.c
index 7082ea7e4e782d392748e350ee31141cf247f706..84cba43063b2dd7404ee14a04402cb24a8d1f868 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/Netbios implementation.
    Version 3.0
    handle NLTMSSP, server side
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_ntlmssp.h"
+#include "../libcli/auth/ntlmssp_ndr.h"
 
-static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, 
+static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
                                       DATA_BLOB reply, DATA_BLOB *next_request);
 static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
                                         const DATA_BLOB in, DATA_BLOB *out);
-static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state, 
+static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
                                         const DATA_BLOB reply, DATA_BLOB *next_request);
 static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
                                    const DATA_BLOB request, DATA_BLOB *reply);
 
 /**
  * Callbacks for NTLMSSP - for both client and server operating modes
- * 
+ *
  */
 
 static const struct ntlmssp_callbacks {
        enum NTLMSSP_ROLE role;
        enum NTLM_MESSAGE_TYPE ntlmssp_command;
-       NTSTATUS (*fn)(struct ntlmssp_state *ntlmssp_state, 
+       NTSTATUS (*fn)(struct ntlmssp_state *ntlmssp_state,
                       DATA_BLOB in, DATA_BLOB *out);
 } ntlmssp_callbacks[] = {
        {NTLMSSP_CLIENT, NTLMSSP_INITIAL, ntlmssp_client_initial},
@@ -53,51 +56,51 @@ static const struct ntlmssp_callbacks {
 
 
 /**
- * Print out the NTLMSSP flags for debugging 
+ * Print out the NTLMSSP flags for debugging
  * @param neg_flags The flags from the packet
  */
 
 void debug_ntlmssp_flags(uint32 neg_flags)
 {
        DEBUG(3,("Got NTLMSSP neg_flags=0x%08x\n", neg_flags));
-       
-       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) 
+
+       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_UNICODE\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_OEM) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_OEM)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_OEM\n"));
-       if (neg_flags & NTLMSSP_REQUEST_TARGET) 
+       if (neg_flags & NTLMSSP_REQUEST_TARGET)
                DEBUGADD(4, ("  NTLMSSP_REQUEST_TARGET\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_SIGN) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_SIGN)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_SIGN\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_SEAL) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_SEAL)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_SEAL\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_DATAGRAM_STYLE)
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_DATAGRAM_STYLE\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_DATAGRAM)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_DATAGRAM\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_LM_KEY)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_LM_KEY\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NETWARE) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_NETWARE)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NETWARE\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NTLM\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_ALWAYS_SIGN\n"));
-       if (neg_flags & NTLMSSP_CHAL_ACCEPT_RESPONSE)
-               DEBUGADD(4, ("  NTLMSSP_CHAL_ACCEPT_RESPONSE\n"));
-       if (neg_flags & NTLMSSP_CHAL_NON_NT_SESSION_KEY)
-               DEBUGADD(4, ("  NTLMSSP_CHAL_NON_NT_SESSION_KEY\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM2) 
+       if (neg_flags & NTLMSSP_REQUEST_NON_NT_SESSION_KEY)
+               DEBUGADD(4, ("  NTLMSSP_REQUEST_NON_NT_SESSION_KEY\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM2)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NTLM2\n"));
-       if (neg_flags & NTLMSSP_CHAL_TARGET_INFO) 
-               DEBUGADD(4, ("  NTLMSSP_CHAL_TARGET_INFO\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_128) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_TARGET_INFO)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_TARGET_INFO\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_VERSION)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_VERSION\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_128)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_128\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_KEY_EXCH\n"));
        if (neg_flags & NTLMSSP_NEGOTIATE_56)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_56\n"));
@@ -107,20 +110,18 @@ void debug_ntlmssp_flags(uint32 neg_flags)
  * Default challenge generation code.
  *
  */
-   
-static const uint8 *get_challenge(const struct ntlmssp_state *ntlmssp_state)
-{
-       static uchar chal[8];
-       generate_random_buffer(chal, sizeof(chal));
 
-       return chal;
+static void get_challenge(const struct ntlmssp_state *ntlmssp_state,
+                         uint8_t chal[8])
+{
+       generate_random_buffer(chal, 8);
 }
 
 /**
  * Default 'we can set the challenge to anything we like' implementation
  *
  */
-   
+
 static bool may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
 {
        return True;
@@ -132,39 +133,39 @@ static bool may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
  * Does not actually do anything, as the value is always in the structure anyway.
  *
  */
-   
+
 static NTSTATUS set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge)
 {
        SMB_ASSERT(challenge->length == 8);
        return NT_STATUS_OK;
 }
 
-/** 
- * Set a username on an NTLMSSP context - ensures it is talloc()ed 
+/**
+ * Set a username on an NTLMSSP context - ensures it is talloc()ed
  *
  */
 
-NTSTATUS ntlmssp_set_username(NTLMSSP_STATE *ntlmssp_state, const char *user) 
+NTSTATUS ntlmssp_set_username(NTLMSSP_STATE *ntlmssp_state, const char *user)
 {
-       ntlmssp_state->user = talloc_strdup(ntlmssp_state->mem_ctx, user ? user : "" );
+       ntlmssp_state->user = talloc_strdup(ntlmssp_state, user ? user : "" );
        if (!ntlmssp_state->user) {
                return NT_STATUS_NO_MEMORY;
        }
        return NT_STATUS_OK;
 }
 
-/** 
- * Store NT and LM hashes on an NTLMSSP context - ensures they are talloc()ed 
+/**
+ * Store NT and LM hashes on an NTLMSSP context - ensures they are talloc()ed
  *
  */
 NTSTATUS ntlmssp_set_hashes(NTLMSSP_STATE *ntlmssp_state,
                const unsigned char lm_hash[16],
-               const unsigned char nt_hash[16]) 
+               const unsigned char nt_hash[16])
 {
        ntlmssp_state->lm_hash = (unsigned char *)
-               TALLOC_MEMDUP(ntlmssp_state->mem_ctx, lm_hash, 16);
+               TALLOC_MEMDUP(ntlmssp_state, lm_hash, 16);
        ntlmssp_state->nt_hash = (unsigned char *)
-               TALLOC_MEMDUP(ntlmssp_state->mem_ctx, nt_hash, 16);
+               TALLOC_MEMDUP(ntlmssp_state, nt_hash, 16);
        if (!ntlmssp_state->lm_hash || !ntlmssp_state->nt_hash) {
                TALLOC_FREE(ntlmssp_state->lm_hash);
                TALLOC_FREE(ntlmssp_state->nt_hash);
@@ -173,11 +174,11 @@ NTSTATUS ntlmssp_set_hashes(NTLMSSP_STATE *ntlmssp_state,
        return NT_STATUS_OK;
 }
 
-/** 
+/**
  * Converts a password to the hashes on an NTLMSSP context.
  *
  */
-NTSTATUS ntlmssp_set_password(NTLMSSP_STATE *ntlmssp_state, const char *password) 
+NTSTATUS ntlmssp_set_password(NTLMSSP_STATE *ntlmssp_state, const char *password)
 {
        if (!password) {
                ntlmssp_state->lm_hash = NULL;
@@ -193,26 +194,27 @@ NTSTATUS ntlmssp_set_password(NTLMSSP_STATE *ntlmssp_state, const char *password
        return NT_STATUS_OK;
 }
 
-/** 
- * Set a domain on an NTLMSSP context - ensures it is talloc()ed 
+/**
+ * Set a domain on an NTLMSSP context - ensures it is talloc()ed
  *
  */
-NTSTATUS ntlmssp_set_domain(NTLMSSP_STATE *ntlmssp_state, const char *domain) 
+NTSTATUS ntlmssp_set_domain(NTLMSSP_STATE *ntlmssp_state, const char *domain)
 {
-       ntlmssp_state->domain = talloc_strdup(ntlmssp_state->mem_ctx, domain ? domain : "" );
+       ntlmssp_state->domain = talloc_strdup(ntlmssp_state,
+                                             domain ? domain : "" );
        if (!ntlmssp_state->domain) {
                return NT_STATUS_NO_MEMORY;
        }
        return NT_STATUS_OK;
 }
 
-/** 
- * Set a workstation on an NTLMSSP context - ensures it is talloc()ed 
+/**
+ * Set a workstation on an NTLMSSP context - ensures it is talloc()ed
  *
  */
-NTSTATUS ntlmssp_set_workstation(NTLMSSP_STATE *ntlmssp_state, const char *workstation) 
+NTSTATUS ntlmssp_set_workstation(NTLMSSP_STATE *ntlmssp_state, const char *workstation)
 {
-       ntlmssp_state->workstation = talloc_strdup(ntlmssp_state->mem_ctx, workstation);
+       ntlmssp_state->workstation = talloc_strdup(ntlmssp_state, workstation);
        if (!ntlmssp_state->workstation) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -225,10 +227,11 @@ NTSTATUS ntlmssp_set_workstation(NTLMSSP_STATE *ntlmssp_state, const char *works
  */
 
 NTSTATUS ntlmssp_store_response(NTLMSSP_STATE *ntlmssp_state,
-                               DATA_BLOB response) 
+                               DATA_BLOB response)
 {
-       ntlmssp_state->stored_response = data_blob_talloc(ntlmssp_state->mem_ctx, 
-                                                         response.data, response.length);
+       ntlmssp_state->stored_response = data_blob_talloc(ntlmssp_state,
+                                                         response.data,
+                                                         response.length);
        return NT_STATUS_OK;
 }
 
@@ -275,18 +278,18 @@ void ntlmssp_want_feature(NTLMSSP_STATE *ntlmssp_state, uint32 feature)
                ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
        }
 }
+
 /**
  * Next state function for the NTLMSSP state machine
- * 
+ *
  * @param ntlmssp_state NTLMSSP State
  * @param in The packet in from the NTLMSSP partner, as a DATA_BLOB
  * @param out The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors, NT_STATUS_MORE_PROCESSING_REQUIRED or NT_STATUS_OK. 
+ * @return Errors, NT_STATUS_MORE_PROCESSING_REQUIRED or NT_STATUS_OK.
  */
 
-NTSTATUS ntlmssp_update(NTLMSSP_STATE *ntlmssp_state, 
-                       const DATA_BLOB in, DATA_BLOB *out) 
+NTSTATUS ntlmssp_update(NTLMSSP_STATE *ntlmssp_state,
+                       const DATA_BLOB in, DATA_BLOB *out)
 {
        DATA_BLOB input;
        uint32 ntlmssp_command;
@@ -302,7 +305,7 @@ NTSTATUS ntlmssp_update(NTLMSSP_STATE *ntlmssp_state,
 
        if (!in.length && ntlmssp_state->stored_response.length) {
                input = ntlmssp_state->stored_response;
-               
+
                /* we only want to read the stored response once - overwrite it */
                ntlmssp_state->stored_response = data_blob_null;
        } else {
@@ -320,7 +323,7 @@ NTSTATUS ntlmssp_update(NTLMSSP_STATE *ntlmssp_state,
                        break;
                }
        } else {
-               if (!msrpc_parse(&input, "Cd",
+               if (!msrpc_parse(ntlmssp_state, &input, "Cd",
                                 "NTLMSSP",
                                 &ntlmssp_command)) {
                        DEBUG(1, ("Failed to parse NTLMSSP packet, could not extract NTLMSSP command\n"));
@@ -335,36 +338,33 @@ NTSTATUS ntlmssp_update(NTLMSSP_STATE *ntlmssp_state,
        }
 
        for (i=0; ntlmssp_callbacks[i].fn; i++) {
-               if (ntlmssp_callbacks[i].role == ntlmssp_state->role 
+               if (ntlmssp_callbacks[i].role == ntlmssp_state->role
                    && ntlmssp_callbacks[i].ntlmssp_command == ntlmssp_command) {
                        return ntlmssp_callbacks[i].fn(ntlmssp_state, input, out);
                }
        }
 
-       DEBUG(1, ("failed to find NTLMSSP callback for NTLMSSP mode %u, command %u\n", 
-                 ntlmssp_state->role, ntlmssp_command)); 
+       DEBUG(1, ("failed to find NTLMSSP callback for NTLMSSP mode %u, command %u\n",
+                 ntlmssp_state->role, ntlmssp_command));
 
        return NT_STATUS_INVALID_PARAMETER;
 }
 
 /**
  * End an NTLMSSP state machine
- * 
+ *
  * @param ntlmssp_state NTLMSSP State, free()ed by this function
  */
 
 void ntlmssp_end(NTLMSSP_STATE **ntlmssp_state)
 {
-       TALLOC_CTX *mem_ctx = (*ntlmssp_state)->mem_ctx;
-
        (*ntlmssp_state)->ref_count--;
 
        if ((*ntlmssp_state)->ref_count == 0) {
                data_blob_free(&(*ntlmssp_state)->chal);
                data_blob_free(&(*ntlmssp_state)->lm_resp);
                data_blob_free(&(*ntlmssp_state)->nt_resp);
-
-               talloc_destroy(mem_ctx);
+               TALLOC_FREE(*ntlmssp_state);
        }
 
        *ntlmssp_state = NULL;
@@ -372,9 +372,9 @@ void ntlmssp_end(NTLMSSP_STATE **ntlmssp_state)
 }
 
 /**
- * Determine correct target name flags for reply, given server role 
+ * Determine correct target name flags for reply, given server role
  * and negotiated flags
- * 
+ *
  * @param ntlmssp_state NTLMSSP State
  * @param neg_flags The flags from the packet
  * @param chal_flags The flags to be set in the reply packet
@@ -382,10 +382,10 @@ void ntlmssp_end(NTLMSSP_STATE **ntlmssp_state)
  */
 
 static const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
-                                      uint32 neg_flags, uint32 *chal_flags) 
+                                      uint32 neg_flags, uint32 *chal_flags)
 {
        if (neg_flags & NTLMSSP_REQUEST_TARGET) {
-               *chal_flags |= NTLMSSP_CHAL_TARGET_INFO;
+               *chal_flags |= NTLMSSP_NEGOTIATE_TARGET_INFO;
                *chal_flags |= NTLMSSP_REQUEST_TARGET;
                if (ntlmssp_state->server_role == ROLE_STANDALONE) {
                        *chal_flags |= NTLMSSP_TARGET_TYPE_SERVER;
@@ -449,8 +449,8 @@ static void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
 
        /* Woop Woop - unknown flag for Windows compatibility...
           What does this really do ? JRA. */
-       if (!(neg_flags & NTLMSSP_UNKNOWN_02000000)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_UNKNOWN_02000000;
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_VERSION)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_VERSION;
        }
 
        if ((neg_flags & NTLMSSP_REQUEST_TARGET)) {
@@ -509,15 +509,17 @@ DATA_BLOB ntlmssp_weaken_keys(NTLMSSP_STATE *ntlmssp_state, TALLOC_CTX *mem_ctx)
  */
 
 static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
-                                        const DATA_BLOB request, DATA_BLOB *reply) 
+                                        const DATA_BLOB request, DATA_BLOB *reply)
 {
        DATA_BLOB struct_blob;
        const char *dnsname;
        char *dnsdomname = NULL;
        uint32 neg_flags = 0;
        uint32 ntlmssp_command, chal_flags;
-       const uint8 *cryptkey;
+       uint8_t cryptkey[8];
        const char *target_name;
+       struct NEGOTIATE_MESSAGE negotiate;
+       struct CHALLENGE_MESSAGE challenge;
 
        /* parse the NTLMSSP packet */
 #if 0
@@ -525,22 +527,32 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
 #endif
 
        if (request.length) {
-               if ((request.length < 16) || !msrpc_parse(&request, "Cdd",
-                                                       "NTLMSSP",
-                                                       &ntlmssp_command,
-                                                       &neg_flags)) {
+               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) {
+                       if (NT_STATUS_IS_OK(ntlmssp_pull_NEGOTIATE_MESSAGE(&request,
+                                                      ntlmssp_state,
+                                                      NULL,
+                                                      &negotiate)))
+                       {
+                               NDR_PRINT_DEBUG(NEGOTIATE_MESSAGE, &negotiate);
+                       }
+               }
        }
 
        ntlmssp_handle_neg_flags(ntlmssp_state, neg_flags, lp_lanman_auth());
 
        /* Ask our caller what challenge they would like in the packet */
-       cryptkey = ntlmssp_state->get_challenge(ntlmssp_state);
+       ntlmssp_state->get_challenge(ntlmssp_state, cryptkey);
 
        /* Check if we may set the challenge */
        if (!ntlmssp_state->may_set_challenge(ntlmssp_state)) {
@@ -560,13 +572,14 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
        if (target_name == NULL)
                return NT_STATUS_INVALID_PARAMETER;
 
-       ntlmssp_state->chal = data_blob_talloc(ntlmssp_state->mem_ctx, cryptkey, 8);
-       ntlmssp_state->internal_chal = data_blob_talloc(ntlmssp_state->mem_ctx, cryptkey, 8);
+       ntlmssp_state->chal = data_blob_talloc(ntlmssp_state, cryptkey, 8);
+       ntlmssp_state->internal_chal = data_blob_talloc(ntlmssp_state,
+                                                       cryptkey, 8);
 
        /* This should be a 'netbios domain -> DNS domain' mapping */
-       dnsdomname = get_mydnsdomname(ntlmssp_state->mem_ctx);
+       dnsdomname = get_mydnsdomname(ntlmssp_state);
        if (!dnsdomname) {
-               dnsdomname = talloc_strdup(ntlmssp_state->mem_ctx, "");
+               dnsdomname = talloc_strdup(ntlmssp_state, "");
        }
        if (!dnsdomname) {
                return NT_STATUS_NO_MEMORY;
@@ -579,14 +592,14 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
        }
 
        /* This creates the 'blob' of names that appears at the end of the packet */
-       if (chal_flags & NTLMSSP_CHAL_TARGET_INFO)
+       if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO)
        {
-               msrpc_gen(&struct_blob, "aaaaa",
-                         NTLMSSP_NAME_TYPE_DOMAIN, target_name,
-                         NTLMSSP_NAME_TYPE_SERVER, ntlmssp_state->get_global_myname(),
-                         NTLMSSP_NAME_TYPE_DOMAIN_DNS, dnsdomname,
-                         NTLMSSP_NAME_TYPE_SERVER_DNS, dnsname,
-                         0, "");
+               msrpc_gen(ntlmssp_state, &struct_blob, "aaaaa",
+                         MsvAvNbDomainName, target_name,
+                         MsvAvNbComputerName, ntlmssp_state->get_global_myname(),
+                         MsvAvDnsDomainName, dnsdomname,
+                         MsvAvDnsComputerName, dnsname,
+                         MsvAvEOL, "");
        } else {
                struct_blob = data_blob_null;
        }
@@ -600,7 +613,7 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
                        gen_string = "CdAdbddB";
                }
 
-               msrpc_gen(reply, gen_string,
+               msrpc_gen(ntlmssp_state, reply, gen_string,
                          "NTLMSSP",
                          NTLMSSP_CHALLENGE,
                          target_name,
@@ -608,6 +621,16 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
                          cryptkey, 8,
                          0, 0,
                          struct_blob.data, struct_blob.length);
+
+               if (DEBUGLEVEL >= 10) {
+                       if (NT_STATUS_IS_OK(ntlmssp_pull_CHALLENGE_MESSAGE(reply,
+                                                      ntlmssp_state,
+                                                      NULL,
+                                                      &challenge)))
+                       {
+                               NDR_PRINT_DEBUG(CHALLENGE_MESSAGE, &challenge);
+                       }
+               }
        }
 
        data_blob_free(&struct_blob);
@@ -623,11 +646,11 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
  * @param ntlmssp_state NTLMSSP State
  * @param request The request, as a DATA_BLOB
  * @param request The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or NT_STATUS_OK. 
+ * @return Errors or NT_STATUS_OK.
  */
 
 static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
-                                   const DATA_BLOB request, DATA_BLOB *reply) 
+                                   const DATA_BLOB request, DATA_BLOB *reply)
 {
        DATA_BLOB encrypted_session_key = data_blob_null;
        DATA_BLOB user_session_key = data_blob_null;
@@ -635,6 +658,7 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        DATA_BLOB session_key = data_blob_null;
        uint32 ntlmssp_command, auth_flags;
        NTSTATUS nt_status = NT_STATUS_OK;
+       struct AUTHENTICATE_MESSAGE authenticate;
 
        /* used by NTLM2 */
        bool doing_ntlm2 = False;
@@ -643,9 +667,6 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        uchar session_nonce_hash[16];
 
        const char *parse_string;
-       char *domain = NULL;
-       char *user = NULL;
-       char *workstation = NULL;
 
        /* parse the NTLMSSP packet */
        *reply = data_blob_null;
@@ -668,22 +689,18 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        ntlmssp_state->workstation = NULL;
 
        /* now the NTLMSSP encoded auth hashes */
-       if (!msrpc_parse(&request, parse_string,
-                        "NTLMSSP", 
-                        &ntlmssp_command, 
+       if (!msrpc_parse(ntlmssp_state, &request, parse_string,
+                        "NTLMSSP",
+                        &ntlmssp_command,
                         &ntlmssp_state->lm_resp,
                         &ntlmssp_state->nt_resp,
-                        &domain, 
-                        &user, 
-                        &workstation,
+                        &ntlmssp_state->domain,
+                        &ntlmssp_state->user,
+                        &ntlmssp_state->workstation,
                         &encrypted_session_key,
                         &auth_flags)) {
-               SAFE_FREE(domain);
-               SAFE_FREE(user);
-               SAFE_FREE(workstation);
-               data_blob_free(&encrypted_session_key);
                auth_flags = 0;
-               
+
                /* Try again with a shorter string (Win9X truncates this packet) */
                if (ntlmssp_state->unicode) {
                        parse_string = "CdBBUUU";
@@ -692,19 +709,16 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
                }
 
                /* now the NTLMSSP encoded auth hashes */
-               if (!msrpc_parse(&request, parse_string,
-                                "NTLMSSP", 
-                                &ntlmssp_command, 
+               if (!msrpc_parse(ntlmssp_state, &request, parse_string,
+                                "NTLMSSP",
+                                &ntlmssp_command,
                                 &ntlmssp_state->lm_resp,
                                 &ntlmssp_state->nt_resp,
-                                &domain, 
-                                &user, 
-                                &workstation)) {
+                                &ntlmssp_state->domain,
+                                &ntlmssp_state->user,
+                                &ntlmssp_state->workstation)) {
                        DEBUG(1, ("ntlmssp_server_auth: failed to parse NTLMSSP (tried both formats):\n"));
                        dump_data(2, request.data, request.length);
-                       SAFE_FREE(domain);
-                       SAFE_FREE(user);
-                       SAFE_FREE(workstation);
 
                        return NT_STATUS_INVALID_PARAMETER;
                }
@@ -713,34 +727,16 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        if (auth_flags)
                ntlmssp_handle_neg_flags(ntlmssp_state, auth_flags, lp_lanman_auth());
 
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_domain(ntlmssp_state, domain))) {
-               SAFE_FREE(domain);
-               SAFE_FREE(user);
-               SAFE_FREE(workstation);
-               data_blob_free(&encrypted_session_key);
-               return nt_status;
-       }
-
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_username(ntlmssp_state, user))) {
-               SAFE_FREE(domain);
-               SAFE_FREE(user);
-               SAFE_FREE(workstation);
-               data_blob_free(&encrypted_session_key);
-               return nt_status;
-       }
-
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_workstation(ntlmssp_state, workstation))) {
-               SAFE_FREE(domain);
-               SAFE_FREE(user);
-               SAFE_FREE(workstation);
-               data_blob_free(&encrypted_session_key);
-               return nt_status;
+       if (DEBUGLEVEL >= 10) {
+               if (NT_STATUS_IS_OK(ntlmssp_pull_AUTHENTICATE_MESSAGE(&request,
+                                                 ntlmssp_state,
+                                                 NULL,
+                                                 &authenticate)))
+               {
+                       NDR_PRINT_DEBUG(AUTHENTICATE_MESSAGE, &authenticate);
+               }
        }
 
-       SAFE_FREE(domain);
-       SAFE_FREE(user);
-       SAFE_FREE(workstation);
-
        DEBUG(3,("Got user=[%s] domain=[%s] workstation=[%s] len1=%lu len2=%lu\n",
                 ntlmssp_state->user, ntlmssp_state->domain, ntlmssp_state->workstation, (unsigned long)ntlmssp_state->lm_resp.length, (unsigned long)ntlmssp_state->nt_resp.length));
 
@@ -749,26 +745,27 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        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 (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(ntlmssp_state->internal_chal.data && ntlmssp_state->internal_chal.length == 8);
-                       
+
                        doing_ntlm2 = True;
 
                        memcpy(session_nonce, ntlmssp_state->internal_chal.data, 8);
                        memcpy(&session_nonce[8], ntlmssp_state->lm_resp.data, 8);
-                       
+
                        MD5Init(&md5_session_nonce_ctx);
                        MD5Update(&md5_session_nonce_ctx, session_nonce, 16);
                        MD5Final(session_nonce_hash, &md5_session_nonce_ctx);
-                       
-                       ntlmssp_state->chal = data_blob_talloc(ntlmssp_state->mem_ctx, session_nonce_hash, 8);
+
+                       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);
@@ -793,7 +790,7 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
 
        /* Finally, actually ask if the password is OK */
 
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_state->check_password(ntlmssp_state, 
+       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_state->check_password(ntlmssp_state,
                                                                       &user_session_key, &lm_session_key))) {
                data_blob_free(&encrypted_session_key);
                return nt_status;
@@ -805,12 +802,13 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        /* Handle the different session key derivation for NTLM2 */
        if (doing_ntlm2) {
                if (user_session_key.data && user_session_key.length == 16) {
-                       session_key = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 16);
-                       hmac_md5(user_session_key.data, session_nonce, 
+                       session_key = data_blob_talloc(ntlmssp_state,
+                                                      NULL, 16);
+                       hmac_md5(user_session_key.data, session_nonce,
                                 sizeof(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;
@@ -818,18 +816,19 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) {
                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->mem_ctx, NULL, 16);
+                               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, 
+                               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"));
                        } else {
                                uint8 zeros[24];
                                ZERO_STRUCT(zeros);
                                session_key = data_blob_talloc(
-                                       ntlmssp_state->mem_ctx, NULL, 16);
+                                       ntlmssp_state, NULL, 16);
                                if (session_key.data == NULL) {
                                        return NT_STATUS_NO_MEMORY;
                                }
@@ -856,27 +855,27 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
                session_key = data_blob_null;
        }
 
-       /* 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 (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
                if (!encrypted_session_key.data || encrypted_session_key.length != 16) {
                        data_blob_free(&encrypted_session_key);
-                       DEBUG(1, ("Client-supplied KEY_EXCH session key was of invalid length (%u)!\n", 
+                       DEBUG(1, ("Client-supplied KEY_EXCH session key was of invalid length (%u)!\n",
                                  (unsigned int)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", 
+                       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", encrypted_session_key.data, encrypted_session_key.length);
-                       SamOEMhash(encrypted_session_key.data, 
-                                  session_key.data, 
-                                  encrypted_session_key.length);
-                       ntlmssp_state->session_key = data_blob_talloc(ntlmssp_state->mem_ctx, 
-                                                                     encrypted_session_key.data, 
-                                                                     encrypted_session_key.length);
-                       dump_data_pw("KEY_EXCH session key:\n", encrypted_session_key.data, 
+                       arcfour_crypt_blob(encrypted_session_key.data,
+                                          encrypted_session_key.length,
+                                          &session_key);
+                       ntlmssp_state->session_key = data_blob_talloc(
+                               ntlmssp_state, encrypted_session_key.data,
+                               encrypted_session_key.length);
+                       dump_data_pw("KEY_EXCH session key:\n", encrypted_session_key.data,
                                     encrypted_session_key.length);
                }
        } else {
@@ -890,7 +889,7 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        }
 
        data_blob_free(&encrypted_session_key);
-       
+
        /* Only one authentication allowed per server state. */
        ntlmssp_state->expected_state = NTLMSSP_DONE;
 
@@ -899,26 +898,21 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
 
 /**
  * Create an NTLMSSP state machine
- * 
+ *
  * @param ntlmssp_state NTLMSSP State, allocated by this function
  */
 
 NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
 {
-       TALLOC_CTX *mem_ctx;
-
-       mem_ctx = talloc_init("NTLMSSP context");
-       
-       *ntlmssp_state = TALLOC_ZERO_P(mem_ctx, NTLMSSP_STATE);
+       *ntlmssp_state = TALLOC_ZERO_P(NULL, NTLMSSP_STATE);
        if (!*ntlmssp_state) {
                DEBUG(0,("ntlmssp_server_start: talloc failed!\n"));
-               talloc_destroy(mem_ctx);
+               talloc_destroy(*ntlmssp_state);
                return NT_STATUS_NO_MEMORY;
        }
 
        (*ntlmssp_state)->role = NTLMSSP_SERVER;
 
-       (*ntlmssp_state)->mem_ctx = mem_ctx;
        (*ntlmssp_state)->get_challenge = get_challenge;
        (*ntlmssp_state)->set_challenge = set_challenge;
        (*ntlmssp_state)->may_set_challenge = may_set_challenge;
@@ -931,10 +925,10 @@ NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
 
        (*ntlmssp_state)->ref_count = 1;
 
-       (*ntlmssp_state)->neg_flags = 
+       (*ntlmssp_state)->neg_flags =
                NTLMSSP_NEGOTIATE_128 |
                NTLMSSP_NEGOTIATE_56 |
-               NTLMSSP_UNKNOWN_02000000 |
+               NTLMSSP_NEGOTIATE_VERSION |
                NTLMSSP_NEGOTIATE_ALWAYS_SIGN |
                NTLMSSP_NEGOTIATE_NTLM |
                NTLMSSP_NEGOTIATE_NTLM2 |
@@ -951,34 +945,46 @@ NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
 
 /**
  * Next state function for the Initial packet
- * 
+ *
  * @param ntlmssp_state NTLMSSP State
  * @param request The request, as a DATA_BLOB.  reply.data must be NULL
  * @param request The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or NT_STATUS_OK. 
+ * @return Errors or NT_STATUS_OK.
  */
 
-static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, 
-                                 DATA_BLOB reply, DATA_BLOB *next_request) 
+static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+                                 DATA_BLOB reply, DATA_BLOB *next_request)
 {
+       struct NEGOTIATE_MESSAGE negotiate;
+
        if (ntlmssp_state->unicode) {
                ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
        } else {
                ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
        }
-       
+
        if (ntlmssp_state->use_ntlmv2) {
                ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
        }
 
        /* generate the ntlmssp negotiate packet */
-       msrpc_gen(next_request, "CddAA",
+       msrpc_gen(ntlmssp_state, next_request, "CddAA",
                  "NTLMSSP",
                  NTLMSSP_NEGOTIATE,
                  ntlmssp_state->neg_flags,
-                 ntlmssp_state->get_domain(), 
+                 ntlmssp_state->get_domain(),
                  ntlmssp_state->get_global_myname());
 
+       if (DEBUGLEVEL >= 10) {
+               if (NT_STATUS_IS_OK(ntlmssp_pull_NEGOTIATE_MESSAGE(next_request,
+                                              ntlmssp_state,
+                                              NULL,
+                                              &negotiate)))
+               {
+                       NDR_PRINT_DEBUG(NEGOTIATE_MESSAGE, &negotiate);
+               }
+       }
+
        ntlmssp_state->expected_state = NTLMSSP_CHALLENGE;
 
        return NT_STATUS_MORE_PROCESSING_REQUIRED;
@@ -986,15 +992,15 @@ static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
 
 /**
  * Next state function for the Challenge Packet.  Generate an auth packet.
- * 
+ *
  * @param ntlmssp_state NTLMSSP State
  * @param request The request, as a DATA_BLOB.  reply.data must be NULL
  * @param request The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or NT_STATUS_OK. 
+ * @return Errors or NT_STATUS_OK.
  */
 
-static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state, 
-                                        const DATA_BLOB reply, DATA_BLOB *next_request) 
+static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
+                                        const DATA_BLOB reply, DATA_BLOB *next_request)
 {
        uint32 chal_flags, ntlmssp_command, unkn1, unkn2;
        DATA_BLOB server_domain_blob;
@@ -1008,10 +1014,12 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
        DATA_BLOB session_key = data_blob_null;
        DATA_BLOB encrypted_session_key = data_blob_null;
        NTSTATUS nt_status = NT_STATUS_OK;
+       struct CHALLENGE_MESSAGE challenge;
+       struct AUTHENTICATE_MESSAGE authenticate;
 
-       if (!msrpc_parse(&reply, "CdBd",
+       if (!msrpc_parse(ntlmssp_state, &reply, "CdBd",
                         "NTLMSSP",
-                        &ntlmssp_command, 
+                        &ntlmssp_command,
                         &server_domain_blob,
                         &chal_flags)) {
                DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#1)\n"));
@@ -1019,7 +1027,17 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
 
                return NT_STATUS_INVALID_PARAMETER;
        }
-       
+
+       if (DEBUGLEVEL >= 10) {
+               if (NT_STATUS_IS_OK(ntlmssp_pull_CHALLENGE_MESSAGE(&reply,
+                                              ntlmssp_state,
+                                              NULL,
+                                              &challenge)))
+               {
+                       NDR_PRINT_DEBUG(CHALLENGE_MESSAGE, &challenge);
+               }
+       }
+
        data_blob_free(&server_domain_blob);
 
        DEBUG(3, ("Got challenge flags:\n"));
@@ -1028,14 +1046,14 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
        ntlmssp_handle_neg_flags(ntlmssp_state, chal_flags, lp_client_lanman_auth());
 
        if (ntlmssp_state->unicode) {
-               if (chal_flags & NTLMSSP_CHAL_TARGET_INFO) {
+               if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
                        chal_parse_string = "CdUdbddB";
                } else {
                        chal_parse_string = "CdUdbdd";
                }
                auth_gen_string = "CdBBUUUBd";
        } else {
-               if (chal_flags & NTLMSSP_CHAL_TARGET_INFO) {
+               if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
                        chal_parse_string = "CdAdbddB";
                } else {
                        chal_parse_string = "CdAdbdd";
@@ -1047,9 +1065,9 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
        DEBUG(3, ("NTLMSSP: Set final flags:\n"));
        debug_ntlmssp_flags(ntlmssp_state->neg_flags);
 
-       if (!msrpc_parse(&reply, chal_parse_string,
+       if (!msrpc_parse(ntlmssp_state, &reply, chal_parse_string,
                         "NTLMSSP",
-                        &ntlmssp_command, 
+                        &ntlmssp_command,
                         &server_domain,
                         &chal_flags,
                         &challenge_blob, 8,
@@ -1060,10 +1078,8 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       ntlmssp_state->server_domain = talloc_strdup(ntlmssp_state->mem_ctx,
-                                                    server_domain);
+       ntlmssp_state->server_domain = server_domain;
 
-       SAFE_FREE(server_domain);
        if (challenge_blob.length != 8) {
                data_blob_free(&struct_blob);
                return NT_STATUS_INVALID_PARAMETER;
@@ -1076,12 +1092,11 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
                ZERO_STRUCT(zeros);
 
                /* session key is all zeros */
-               session_key = data_blob_talloc(ntlmssp_state->mem_ctx, zeros, 16);
-               
+               session_key = data_blob_talloc(ntlmssp_state, zeros, 16);
+
                /* not doing NLTM2 without a password */
                ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
        } else if (ntlmssp_state->use_ntlmv2) {
-
                if (!struct_blob.length) {
                        /* be lazy, match win2k - we can't do NTLMv2 without it */
                        DEBUG(1, ("Server did not provide 'target information', required for NTLMv2\n"));
@@ -1090,12 +1105,14 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
 
                /* TODO: if the remote server is standalone, then we should replace 'domain'
                   with the server name as supplied above */
-               
-               if (!SMBNTLMv2encrypt_hash(ntlmssp_state->user, 
-                                     ntlmssp_state->domain, 
-                                     ntlmssp_state->nt_hash, &challenge_blob, 
-                                     &struct_blob, 
-                                     &lm_response, &nt_response, &session_key)) {
+
+               if (!SMBNTLMv2encrypt_hash(ntlmssp_state,
+                                          ntlmssp_state->user,
+                                          ntlmssp_state->domain,
+                                          ntlmssp_state->nt_hash, &challenge_blob,
+                                          &struct_blob,
+                                          &lm_response, &nt_response, NULL,
+                                          &session_key)) {
                        data_blob_free(&challenge_blob);
                        data_blob_free(&struct_blob);
                        return NT_STATUS_NO_MEMORY;
@@ -1105,14 +1122,14 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
                uchar session_nonce[16];
                uchar session_nonce_hash[16];
                uchar user_session_key[16];
-               
-               lm_response = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 24);
+
+               lm_response = data_blob_talloc(ntlmssp_state, NULL, 24);
                generate_random_buffer(lm_response.data, 8);
                memset(lm_response.data+8, 0, 16);
 
                memcpy(session_nonce, challenge_blob.data, 8);
                memcpy(&session_nonce[8], lm_response.data, 8);
-       
+
                MD5Init(&md5_session_nonce_ctx);
                MD5Update(&md5_session_nonce_ctx, challenge_blob.data, 8);
                MD5Update(&md5_session_nonce_ctx, lm_response.data, 8);
@@ -1121,37 +1138,38 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
                DEBUG(5, ("NTLMSSP challenge set by NTLM2\n"));
                DEBUG(5, ("challenge is: \n"));
                dump_data(5, session_nonce_hash, 8);
-               
-               nt_response = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 24);
+
+               nt_response = data_blob_talloc(ntlmssp_state, NULL, 24);
                SMBNTencrypt_hash(ntlmssp_state->nt_hash,
-                            session_nonce_hash,
-                            nt_response.data);
+                                 session_nonce_hash,
+                                 nt_response.data);
 
-               session_key = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 16);
+               session_key = data_blob_talloc(ntlmssp_state, NULL, 16);
 
-               SMBsesskeygen_ntv1(ntlmssp_state->nt_hash, NULL, user_session_key);
+               SMBsesskeygen_ntv1(ntlmssp_state->nt_hash, user_session_key);
                hmac_md5(user_session_key, session_nonce, sizeof(session_nonce), session_key.data);
                dump_data_pw("NTLM2 session key:\n", session_key.data, session_key.length);
        } else {
                /* lanman auth is insecure, it may be disabled */
                if (lp_client_lanman_auth()) {
-                       lm_response = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 24);
+                       lm_response = data_blob_talloc(ntlmssp_state,
+                                                      NULL, 24);
                        SMBencrypt_hash(ntlmssp_state->lm_hash,challenge_blob.data,
                                   lm_response.data);
                }
-               
-               nt_response = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 24);
+
+               nt_response = data_blob_talloc(ntlmssp_state, NULL, 24);
                SMBNTencrypt_hash(ntlmssp_state->nt_hash,challenge_blob.data,
                             nt_response.data);
-               
-               session_key = data_blob_talloc(ntlmssp_state->mem_ctx, NULL, 16);
-               if ((ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) 
+
+               session_key = data_blob_talloc(ntlmssp_state, NULL, 16);
+               if ((ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY)
                    && lp_client_lanman_auth()) {
                        SMBsesskeygen_lm_sess_key(ntlmssp_state->lm_hash, lm_response.data,
                                        session_key.data);
                        dump_data_pw("LM session key\n", session_key.data, session_key.length);
                } else {
-                       SMBsesskeygen_ntv1(ntlmssp_state->nt_hash, NULL, session_key.data);
+                       SMBsesskeygen_ntv1(ntlmssp_state->nt_hash, session_key.data);
                        dump_data_pw("NT session key:\n", session_key.data, session_key.length);
                }
        }
@@ -1167,29 +1185,41 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
                /* Encrypt the new session key with the old one */
                encrypted_session_key = data_blob(client_session_key, sizeof(client_session_key));
                dump_data_pw("KEY_EXCH session key:\n", encrypted_session_key.data, encrypted_session_key.length);
-               SamOEMhash(encrypted_session_key.data, session_key.data, encrypted_session_key.length);
+               arcfour_crypt_blob(encrypted_session_key.data, encrypted_session_key.length, &session_key);
                dump_data_pw("KEY_EXCH session key (enc):\n", encrypted_session_key.data, encrypted_session_key.length);
 
                /* Mark the new session key as the 'real' session key */
                data_blob_free(&session_key);
-               session_key = data_blob_talloc(ntlmssp_state->mem_ctx, client_session_key, sizeof(client_session_key));
+               session_key = data_blob_talloc(ntlmssp_state,
+                                              client_session_key,
+                                              sizeof(client_session_key));
        }
 
        /* this generates the actual auth packet */
-       if (!msrpc_gen(next_request, auth_gen_string, 
-                      "NTLMSSP", 
-                      NTLMSSP_AUTH, 
+       if (!msrpc_gen(ntlmssp_state, next_request, auth_gen_string,
+                      "NTLMSSP",
+                      NTLMSSP_AUTH,
                       lm_response.data, lm_response.length,
                       nt_response.data, nt_response.length,
-                      ntlmssp_state->domain, 
-                      ntlmssp_state->user, 
-                      ntlmssp_state->get_global_myname(), 
+                      ntlmssp_state->domain,
+                      ntlmssp_state->user,
+                      ntlmssp_state->get_global_myname(),
                       encrypted_session_key.data, encrypted_session_key.length,
                       ntlmssp_state->neg_flags)) {
-               
+
                return NT_STATUS_NO_MEMORY;
        }
 
+       if (DEBUGLEVEL >= 10) {
+               if (NT_STATUS_IS_OK(ntlmssp_pull_AUTHENTICATE_MESSAGE(next_request,
+                                                 ntlmssp_state,
+                                                 NULL,
+                                                 &authenticate)))
+               {
+                       NDR_PRINT_DEBUG(AUTHENTICATE_MESSAGE, &authenticate);
+               }
+       }
+
        data_blob_free(&encrypted_session_key);
 
        data_blob_free(&ntlmssp_state->chal);
@@ -1211,21 +1241,15 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
 
 NTSTATUS ntlmssp_client_start(NTLMSSP_STATE **ntlmssp_state)
 {
-       TALLOC_CTX *mem_ctx;
-
-       mem_ctx = talloc_init("NTLMSSP Client context");
-       
-       *ntlmssp_state = TALLOC_ZERO_P(mem_ctx, NTLMSSP_STATE);
+       *ntlmssp_state = TALLOC_ZERO_P(NULL, NTLMSSP_STATE);
        if (!*ntlmssp_state) {
                DEBUG(0,("ntlmssp_client_start: talloc failed!\n"));
-               talloc_destroy(mem_ctx);
+               talloc_destroy(*ntlmssp_state);
                return NT_STATUS_NO_MEMORY;
        }
 
        (*ntlmssp_state)->role = NTLMSSP_CLIENT;
 
-       (*ntlmssp_state)->mem_ctx = mem_ctx;
-
        (*ntlmssp_state)->get_global_myname = global_myname;
        (*ntlmssp_state)->get_domain = lp_workgroup;
 
@@ -1237,7 +1261,7 @@ NTSTATUS ntlmssp_client_start(NTLMSSP_STATE **ntlmssp_state)
 
        (*ntlmssp_state)->ref_count = 1;
 
-       (*ntlmssp_state)->neg_flags = 
+       (*ntlmssp_state)->neg_flags =
                NTLMSSP_NEGOTIATE_128 |
                NTLMSSP_NEGOTIATE_ALWAYS_SIGN |
                NTLMSSP_NEGOTIATE_NTLM |