s3:ntlmssp Don't use talloc_tos() for NTLMSSP blobs for now
[amitay/samba.git] / source3 / libsmb / ntlmssp.c
index a0e54ce769bc7738807fb9b2de3bd768da306dae..920bf94df8e38b1beb453411fd71b3f25a476d78 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"
-
-static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, 
+#include "../libcli/auth/ntlmssp.h"
+#include "../libcli/auth/ntlmssp_private.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_ntlmssp.h"
+#include "../libcli/auth/ntlmssp_ndr.h"
+#include "../lib/crypto/md5.h"
+#include "../lib/crypto/arcfour.h"
+#include "../lib/crypto/hmacmd5.h"
+
+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, 
+       enum ntlmssp_role role;
+       enum ntlmssp_message_type ntlmssp_command;
+       NTSTATUS (*fn)(struct ntlmssp_state *ntlmssp_state,
                       DATA_BLOB in, DATA_BLOB *out);
 } ntlmssp_callbacks[] = {
        {NTLMSSP_CLIENT, NTLMSSP_INITIAL, ntlmssp_client_initial},
@@ -52,77 +60,23 @@ static const struct ntlmssp_callbacks {
 };
 
 
-/**
- * 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) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_UNICODE\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_OEM) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_OEM\n"));
-       if (neg_flags & NTLMSSP_REQUEST_TARGET) 
-               DEBUGADD(4, ("  NTLMSSP_REQUEST_TARGET\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_SIGN) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_SIGN\n"));
-       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) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_LM_KEY\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NETWARE) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NETWARE\n"));
-       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) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL\n"));
-       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) 
-               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_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) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_KEY_EXCH\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_56)
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_56\n"));
-}
-
 /**
  * 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 NTSTATUS get_challenge(const struct ntlmssp_state *ntlmssp_state,
+                             uint8_t chal[8])
+{
+       generate_random_buffer(chal, 8);
+       return NT_STATUS_OK;
 }
 
 /**
  * Default 'we can set the challenge to anything we like' implementation
  *
  */
-   
+
 static bool may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
 {
        return True;
@@ -134,39 +88,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(struct 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]) 
+NTSTATUS ntlmssp_set_hashes(struct ntlmssp_state *ntlmssp_state,
+                           const uint8_t lm_hash[16],
+                           const uint8_t nt_hash[16])
 {
-       ntlmssp_state->lm_hash = (unsigned char *)
-               TALLOC_MEMDUP(ntlmssp_state->mem_ctx, lm_hash, 16);
-       ntlmssp_state->nt_hash = (unsigned char *)
-               TALLOC_MEMDUP(ntlmssp_state->mem_ctx, nt_hash, 16);
+       ntlmssp_state->lm_hash = (uint8_t *)
+               TALLOC_MEMDUP(ntlmssp_state, lm_hash, 16);
+       ntlmssp_state->nt_hash = (uint8_t *)
+               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);
@@ -175,18 +129,18 @@ 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(struct ntlmssp_state *ntlmssp_state, const char *password)
 {
        if (!password) {
                ntlmssp_state->lm_hash = NULL;
                ntlmssp_state->nt_hash = NULL;
        } else {
-               unsigned char lm_hash[16];
-               unsigned char nt_hash[16];
+               uint8_t lm_hash[16];
+               uint8_t nt_hash[16];
 
                E_deshash(password, lm_hash);
                E_md4hash(password, nt_hash);
@@ -195,52 +149,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(struct 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 
- *
- */
-NTSTATUS ntlmssp_set_workstation(NTLMSSP_STATE *ntlmssp_state, const char *workstation) 
-{
-       ntlmssp_state->workstation = talloc_strdup(ntlmssp_state->mem_ctx, workstation);
-       if (!ntlmssp_state->workstation) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       return NT_STATUS_OK;
-}
-
-/**
- *  Store a DATA_BLOB containing an NTLMSSP response, for use later.
- *  This copies the data blob
- */
-
-NTSTATUS ntlmssp_store_response(NTLMSSP_STATE *ntlmssp_state,
-                               DATA_BLOB response) 
-{
-       ntlmssp_state->stored_response = data_blob_talloc(ntlmssp_state->mem_ctx, 
-                                                         response.data, response.length);
-       return NT_STATUS_OK;
-}
-
 /**
  * Request features for the NTLMSSP negotiation
  *
  * @param ntlmssp_state NTLMSSP state
  * @param feature_list List of space seperated features requested from NTLMSSP.
  */
-void ntlmssp_want_feature_list(NTLMSSP_STATE *ntlmssp_state, char *feature_list)
+void ntlmssp_want_feature_list(struct ntlmssp_state *ntlmssp_state, char *feature_list)
 {
        /*
         * We need to set this to allow a later SetPassword
@@ -256,6 +185,9 @@ void ntlmssp_want_feature_list(NTLMSSP_STATE *ntlmssp_state, char *feature_list)
        if(in_list("NTLMSSP_FEATURE_SEAL", feature_list, True)) {
                ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
        }
+       if (in_list("NTLMSSP_FEATURE_CCACHE", feature_list, true)) {
+               ntlmssp_state->use_ccache = true;
+       }
 }
 
 /**
@@ -264,7 +196,7 @@ void ntlmssp_want_feature_list(NTLMSSP_STATE *ntlmssp_state, char *feature_list)
  * @param ntlmssp_state NTLMSSP state
  * @param feature Bit flag specifying the requested feature
  */
-void ntlmssp_want_feature(NTLMSSP_STATE *ntlmssp_state, uint32 feature)
+void ntlmssp_want_feature(struct ntlmssp_state *ntlmssp_state, uint32_t feature)
 {
        /* As per JRA's comment above */
        if (feature & NTLMSSP_FEATURE_SESSION_KEY) {
@@ -276,22 +208,24 @@ void ntlmssp_want_feature(NTLMSSP_STATE *ntlmssp_state, uint32 feature)
        if (feature & NTLMSSP_FEATURE_SEAL) {
                ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
        }
+       if (feature & NTLMSSP_FEATURE_CCACHE) {
+               ntlmssp_state->use_ccache = true;
+       }
 }
+
 /**
  * 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(struct ntlmssp_state *ntlmssp_state,
+                       const DATA_BLOB input, DATA_BLOB *out)
 {
-       DATA_BLOB input;
-       uint32 ntlmssp_command;
+       uint32_t ntlmssp_command;
        int i;
 
        if (ntlmssp_state->expected_state == NTLMSSP_DONE) {
@@ -302,15 +236,6 @@ NTSTATUS ntlmssp_update(NTLMSSP_STATE *ntlmssp_state,
 
        *out = data_blob_null;
 
-       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 {
-               input = in;
-       }
-
        if (!input.length) {
                switch (ntlmssp_state->role) {
                case NTLMSSP_CLIENT:
@@ -322,7 +247,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"));
@@ -337,170 +262,18 @@ 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);
-       }
-
-       *ntlmssp_state = NULL;
-       return;
-}
-
-/**
- * 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
- * @return The 'target name' string.
- */
-
-static const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
-                                      uint32 neg_flags, uint32 *chal_flags) 
-{
-       if (neg_flags & NTLMSSP_REQUEST_TARGET) {
-               *chal_flags |= NTLMSSP_CHAL_TARGET_INFO;
-               *chal_flags |= NTLMSSP_REQUEST_TARGET;
-               if (ntlmssp_state->server_role == ROLE_STANDALONE) {
-                       *chal_flags |= NTLMSSP_TARGET_TYPE_SERVER;
-                       return ntlmssp_state->get_global_myname();
-               } else {
-                       *chal_flags |= NTLMSSP_TARGET_TYPE_DOMAIN;
-                       return ntlmssp_state->get_domain();
-               };
-       } else {
-               return "";
-       }
-}
-
-static void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
-                                     uint32 neg_flags, bool allow_lm) {
-       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) {
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_OEM;
-               ntlmssp_state->unicode = True;
-       } else {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_UNICODE;
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
-               ntlmssp_state->unicode = False;
-       }
-
-       if ((neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) && allow_lm) {
-               /* other end forcing us to use LM */
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
-               ntlmssp_state->use_ntlmv2 = False;
-       } else {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_NTLM2)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_128)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_128;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_56)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_56;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_KEY_EXCH;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SIGN;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SEAL;
-       }
-
-       /* Woop Woop - unknown flag for Windows compatibility...
-          What does this really do ? JRA. */
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_VERSION)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_VERSION;
-       }
-
-       if ((neg_flags & NTLMSSP_REQUEST_TARGET)) {
-               ntlmssp_state->neg_flags |= NTLMSSP_REQUEST_TARGET;
-       }
-}
-
-/**
- Weaken NTLMSSP keys to cope with down-level clients and servers.
-
- We probably should have some parameters to control this, but as
- it only occours for LM_KEY connections, and this is controlled
- by the client lanman auth/lanman auth parameters, it isn't too bad.
-*/
-
-DATA_BLOB ntlmssp_weaken_keys(NTLMSSP_STATE *ntlmssp_state, TALLOC_CTX *mem_ctx)
-{
-       DATA_BLOB weakened_key = data_blob_talloc(mem_ctx,
-                                       ntlmssp_state->session_key.data,
-                                       ntlmssp_state->session_key.length);
-
-       /* Nothing to weaken.  We certainly don't want to 'extend' the length... */
-       if (weakened_key.length < 16) {
-               /* perhaps there was no key? */
-               return weakened_key;
-       }
-
-       /* Key weakening not performed on the master key for NTLM2
-          and does not occour for NTLM1.  Therefore we only need
-          to do this for the LM_KEY.
-       */
-
-       if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) {
-               /* LM key doesn't support 128 bit crypto, so this is
-                * the best we can do.  If you negotiate 128 bit, but
-                * not 56, you end up with 40 bit... */
-               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_56) {
-                       weakened_key.data[7] = 0xa0;
-               } else { /* forty bits */
-                       weakened_key.data[5] = 0xe5;
-                       weakened_key.data[6] = 0x38;
-                       weakened_key.data[7] = 0xb0;
-               }
-               weakened_key.length = 8;
-       }
-       return weakened_key;
-}
-
 /**
  * Next state function for the Negotiate packet
  *
@@ -511,15 +284,14 @@ 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;
+       uint32_t neg_flags = 0;
+       uint32_t ntlmssp_command, chal_flags;
+       uint8_t cryptkey[8];
        const char *target_name;
+       NTSTATUS status;
 
        /* parse the NTLMSSP packet */
 #if 0
@@ -527,22 +299,41 @@ 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) {
+                       struct NEGOTIATE_MESSAGE *negotiate = talloc(
+                               talloc_tos(), 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(ntlmssp_state, neg_flags, lp_lanman_auth());
+       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 = ntlmssp_state->get_challenge(ntlmssp_state);
+       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 (!ntlmssp_state->may_set_challenge(ntlmssp_state)) {
@@ -562,54 +353,81 @@ 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);
-
-       /* This should be a 'netbios domain -> DNS domain' mapping */
-       dnsdomname = get_mydnsdomname(ntlmssp_state->mem_ctx);
-       if (!dnsdomname) {
-               dnsdomname = talloc_strdup(ntlmssp_state->mem_ctx, "");
-       }
-       if (!dnsdomname) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       strlower_m(dnsdomname);
-
-       dnsname = get_mydnsfullname();
-       if (!dnsname) {
-               dnsname = "";
-       }
+       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)
+       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->server.netbios_name,
+                         MsvAvDnsDomainName, ntlmssp_state->server.dns_domain,
+                         MsvAvDnsComputerName, ntlmssp_state->server.dns_name,
+                         MsvAvEOL, "");
        } else {
                struct_blob = data_blob_null;
        }
 
        {
-               /* Marshel the packet in the right format, be it unicode or ASCII */
+               /* Marshal the packet in the right format, be it unicode or ASCII */
                const char *gen_string;
+               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)) {
+                               return NT_STATUS_NO_MEMORY;
+                       }
+               }
+
                if (ntlmssp_state->unicode) {
-                       gen_string = "CdUdbddB";
+                       gen_string = "CdUdbddBb";
                } else {
-                       gen_string = "CdAdbddB";
+                       gen_string = "CdAdbddBb";
                }
 
-               msrpc_gen(reply, gen_string,
-                         "NTLMSSP",
-                         NTLMSSP_CHALLENGE,
-                         target_name,
-                         chal_flags,
-                         cryptkey, 8,
-                         0, 0,
-                         struct_blob.data, struct_blob.length);
+               msrpc_gen(ntlmssp_state, 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);
+                       }
+               }
        }
 
        data_blob_free(&struct_blob);
@@ -625,29 +443,26 @@ 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;
        DATA_BLOB lm_session_key = data_blob_null;
        DATA_BLOB session_key = data_blob_null;
-       uint32 ntlmssp_command, auth_flags;
+       uint32_t ntlmssp_command, auth_flags;
        NTSTATUS nt_status = NT_STATUS_OK;
 
        /* used by NTLM2 */
        bool doing_ntlm2 = False;
 
-       uchar session_nonce[16];
-       uchar session_nonce_hash[16];
+       uint8_t session_nonce[16];
+       uint8_t 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;
@@ -667,25 +482,20 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
 
        ntlmssp_state->user = NULL;
        ntlmssp_state->domain = NULL;
-       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->client.netbios_name,
                         &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";
@@ -694,83 +504,72 @@ 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->client.netbios_name)) {
                        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;
                }
        }
 
        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;
+               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);
+               }
        }
 
-       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));
+                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",  &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 (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);
@@ -795,7 +594,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;
@@ -807,41 +606,48 @@ 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;
                }
-       } else if (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 */
+               && (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->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);
+                               static const uint8_t zeros[24] = {0, };
                                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;
                                }
-                               SMBsesskeygen_lm_sess_key(
-                                       lm_session_key.data, zeros,
-                                       session_key.data);
+                               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);
                } else {
+                       /* LM Key not selected */
+                       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;
                }
@@ -849,36 +655,48 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
                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 */
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+
        } else if (lm_session_key.data) {
+               /* Very weird to have LM key, but no user session key, but anyway.. */
                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 */
+               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;
+
+               /* LM Key not selected */
+               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 (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 {
@@ -892,7 +710,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;
 
@@ -901,39 +719,54 @@ 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)
+NTSTATUS ntlmssp_server_start(TALLOC_CTX *mem_ctx,
+                             bool is_standalone,
+                             const char *netbios_name,
+                             const char *netbios_domain,
+                             const char *dns_name,
+                             const char *dns_domain,
+                             struct ntlmssp_state **_ntlmssp_state)
 {
-       TALLOC_CTX *mem_ctx;
-
-       mem_ctx = talloc_init("NTLMSSP context");
-       
-       *ntlmssp_state = TALLOC_ZERO_P(mem_ctx, NTLMSSP_STATE);
-       if (!*ntlmssp_state) {
-               DEBUG(0,("ntlmssp_server_start: talloc failed!\n"));
-               talloc_destroy(mem_ctx);
+       struct ntlmssp_state *ntlmssp_state;
+
+       if (!netbios_name) {
+               netbios_name = "";
+       }
+
+       if (!netbios_domain) {
+               netbios_domain = "";
+       }
+
+       if (!dns_domain) {
+               dns_domain = "";
+       }
+
+       if (!dns_name) {
+               dns_name = "";
+       }
+
+       ntlmssp_state = talloc_zero(mem_ctx, struct ntlmssp_state);
+       if (!ntlmssp_state) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       (*ntlmssp_state)->role = NTLMSSP_SERVER;
+       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;
+       ntlmssp_state->get_challenge = get_challenge;
+       ntlmssp_state->set_challenge = set_challenge;
+       ntlmssp_state->may_set_challenge = may_set_challenge;
 
-       (*ntlmssp_state)->get_global_myname = global_myname;
-       (*ntlmssp_state)->get_domain = lp_workgroup;
-       (*ntlmssp_state)->server_role = ROLE_DOMAIN_MEMBER; /* a good default */
+       ntlmssp_state->server.is_standalone = is_standalone;
 
-       (*ntlmssp_state)->expected_state = NTLMSSP_NEGOTIATE;
+       ntlmssp_state->expected_state = NTLMSSP_NEGOTIATE;
 
-       (*ntlmssp_state)->ref_count = 1;
+       ntlmssp_state->allow_lm_key = lp_lanman_auth();
 
-       (*ntlmssp_state)->neg_flags = 
+       ntlmssp_state->neg_flags =
                NTLMSSP_NEGOTIATE_128 |
                NTLMSSP_NEGOTIATE_56 |
                NTLMSSP_NEGOTIATE_VERSION |
@@ -944,6 +777,28 @@ NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
                NTLMSSP_NEGOTIATE_SIGN |
                NTLMSSP_NEGOTIATE_SEAL;
 
+       ntlmssp_state->server.netbios_name = talloc_strdup(ntlmssp_state, netbios_name);
+       if (!ntlmssp_state->server.netbios_name) {
+               talloc_free(ntlmssp_state);
+               return NT_STATUS_NO_MEMORY;
+       }
+       ntlmssp_state->server.netbios_domain = talloc_strdup(ntlmssp_state, netbios_domain);
+       if (!ntlmssp_state->server.netbios_domain) {
+               talloc_free(ntlmssp_state);
+               return NT_STATUS_NO_MEMORY;
+       }
+       ntlmssp_state->server.dns_name = talloc_strdup(ntlmssp_state, dns_name);
+       if (!ntlmssp_state->server.dns_name) {
+               talloc_free(ntlmssp_state);
+               return NT_STATUS_NO_MEMORY;
+       }
+       ntlmssp_state->server.dns_domain = talloc_strdup(ntlmssp_state, dns_domain);
+       if (!ntlmssp_state->server.dns_domain) {
+               talloc_free(ntlmssp_state);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       *_ntlmssp_state = ntlmssp_state;
        return NT_STATUS_OK;
 }
 
@@ -953,33 +808,48 @@ 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)
 {
        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_global_myname());
+                 ntlmssp_state->client.netbios_domain,
+                 ntlmssp_state->client.netbios_name);
+
+       if (DEBUGLEVEL >= 10) {
+               struct NEGOTIATE_MESSAGE *negotiate = talloc(
+                       talloc_tos(), struct NEGOTIATE_MESSAGE);
+               if (negotiate != NULL) {
+                       NTSTATUS status;
+                       status = ntlmssp_pull_NEGOTIATE_MESSAGE(
+                               next_request, negotiate, negotiate);
+                       if (NT_STATUS_IS_OK(status)) {
+                               NDR_PRINT_DEBUG(NEGOTIATE_MESSAGE,
+                                               negotiate);
+                       }
+                       TALLOC_FREE(negotiate);
+               }
+       }
 
        ntlmssp_state->expected_state = NTLMSSP_CHALLENGE;
 
@@ -988,17 +858,17 @@ 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;
+       uint32_t chal_flags, ntlmssp_command, unkn1, unkn2;
        DATA_BLOB server_domain_blob;
        DATA_BLOB challenge_blob;
        DATA_BLOB struct_blob = data_blob_null;
@@ -1011,9 +881,61 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
        DATA_BLOB encrypted_session_key = data_blob_null;
        NTSTATUS nt_status = NT_STATUS_OK;
 
-       if (!msrpc_parse(&reply, "CdBd",
+       if (ntlmssp_state->use_ccache) {
+               struct wbcCredentialCacheParams params;
+               struct wbcCredentialCacheInfo *info = NULL;
+               struct wbcAuthErrorInfo *error = NULL;
+               struct wbcNamedBlob auth_blob;
+               struct wbcBlob *wbc_next = NULL;
+               struct wbcBlob *wbc_session_key = NULL;
+               wbcErr wbc_status;
+               int i;
+
+               params.account_name = ntlmssp_state->user;
+               params.domain_name = ntlmssp_state->domain;
+               params.level = WBC_CREDENTIAL_CACHE_LEVEL_NTLMSSP;
+
+               auth_blob.name = "challenge_blob";
+               auth_blob.flags = 0;
+               auth_blob.blob.data = reply.data;
+               auth_blob.blob.length = reply.length;
+               params.num_blobs = 1;
+               params.blobs = &auth_blob;
+
+               wbc_status = wbcCredentialCache(&params, &info, &error);
+               if (error != NULL) {
+                       wbcFreeMemory(error);
+               }
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       goto noccache;
+               }
+
+               for (i=0; i<info->num_blobs; i++) {
+                       if (strequal(info->blobs[i].name, "auth_blob")) {
+                               wbc_next = &info->blobs[i].blob;
+                       }
+                       if (strequal(info->blobs[i].name, "session_key")) {
+                               wbc_session_key = &info->blobs[i].blob;
+                       }
+               }
+               if ((wbc_next == NULL) || (wbc_session_key == NULL)) {
+                       wbcFreeMemory(info);
+                       goto noccache;
+               }
+
+               *next_request = data_blob(wbc_next->data, wbc_next->length);
+               ntlmssp_state->session_key = data_blob(
+                       wbc_session_key->data, wbc_session_key->length);
+
+               wbcFreeMemory(info);
+               goto done;
+       }
+
+noccache:
+
+       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"));
@@ -1021,7 +943,23 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
 
                return NT_STATUS_INVALID_PARAMETER;
        }
-       
+
+       if (DEBUGLEVEL >= 10) {
+               struct CHALLENGE_MESSAGE *challenge = talloc(
+                       talloc_tos(), struct CHALLENGE_MESSAGE);
+               if (challenge != NULL) {
+                       NTSTATUS status;
+                       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);
+               }
+       }
+
        data_blob_free(&server_domain_blob);
 
        DEBUG(3, ("Got challenge flags:\n"));
@@ -1030,14 +968,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";
@@ -1049,9 +987,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,
@@ -1062,28 +1000,32 @@ 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);
+       if (chal_flags & NTLMSSP_TARGET_TYPE_SERVER) {
+               ntlmssp_state->server.is_standalone = true;
+       } else {
+               ntlmssp_state->server.is_standalone = false;
+       }
+       /* TODO: parse struct_blob and fill in the rest */
+       ntlmssp_state->server.netbios_name = "";
+       ntlmssp_state->server.netbios_domain = server_domain;
+       ntlmssp_state->server.dns_name = "";
+       ntlmssp_state->server.dns_domain = "";
 
-       SAFE_FREE(server_domain);
        if (challenge_blob.length != 8) {
                data_blob_free(&struct_blob);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        if (!ntlmssp_state->nt_hash || !ntlmssp_state->lm_hash) {
-               uchar zeros[16];
+               static const uint8_t zeros[16] = {0, };
                /* do nothing - blobs are zero length */
 
-               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"));
@@ -1092,29 +1034,31 @@ 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;
                }
        } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
                struct MD5Context md5_session_nonce_ctx;
-               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);
+               uint8_t session_nonce[16];
+               uint8_t session_nonce_hash[16];
+               uint8_t user_session_key[16];
+
+               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);
@@ -1123,37 +1067,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);
                }
        }
@@ -1163,35 +1108,54 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
           the password-derived key */
        if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
                /* Make up a new session key */
-               uint8 client_session_key[16];
+               uint8_t client_session_key[16];
                generate_random_buffer(client_session_key, sizeof(client_session_key));
 
                /* 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->client.netbios_name,
                       encrypted_session_key.data, encrypted_session_key.length,
                       ntlmssp_state->neg_flags)) {
-               
+
                return NT_STATUS_NO_MEMORY;
        }
 
+       if (DEBUGLEVEL >= 10) {
+               struct AUTHENTICATE_MESSAGE *authenticate = talloc(
+                       talloc_tos(), struct AUTHENTICATE_MESSAGE);
+               if (authenticate != NULL) {
+                       NTSTATUS status;
+                       authenticate->NegotiateFlags =
+                               ntlmssp_state->neg_flags;
+                       status = ntlmssp_pull_AUTHENTICATE_MESSAGE(
+                               next_request, authenticate, authenticate);
+                       if (NT_STATUS_IS_OK(status)) {
+                               NDR_PRINT_DEBUG(AUTHENTICATE_MESSAGE,
+                                               authenticate);
+                       }
+                       TALLOC_FREE(authenticate);
+               }
+       }
+
        data_blob_free(&encrypted_session_key);
 
        data_blob_free(&ntlmssp_state->chal);
@@ -1202,6 +1166,8 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
        ntlmssp_state->lm_resp = lm_response;
        ntlmssp_state->nt_resp = nt_response;
 
+done:
+
        ntlmssp_state->expected_state = NTLMSSP_DONE;
 
        if (!NT_STATUS_IS_OK(nt_status = ntlmssp_sign_init(ntlmssp_state))) {
@@ -1211,35 +1177,36 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
        return nt_status;
 }
 
-NTSTATUS ntlmssp_client_start(NTLMSSP_STATE **ntlmssp_state)
+NTSTATUS ntlmssp_client_start(TALLOC_CTX *mem_ctx,
+                             const char *netbios_name,
+                             const char *netbios_domain,
+                             bool use_ntlmv2,
+                             struct ntlmssp_state **_ntlmssp_state)
 {
-       TALLOC_CTX *mem_ctx;
-
-       mem_ctx = talloc_init("NTLMSSP Client context");
-       
-       *ntlmssp_state = TALLOC_ZERO_P(mem_ctx, NTLMSSP_STATE);
-       if (!*ntlmssp_state) {
-               DEBUG(0,("ntlmssp_client_start: talloc failed!\n"));
-               talloc_destroy(mem_ctx);
-               return NT_STATUS_NO_MEMORY;
-       }
+       struct ntlmssp_state *ntlmssp_state;
 
-       (*ntlmssp_state)->role = NTLMSSP_CLIENT;
+       if (!netbios_name) {
+               netbios_name = "";
+       }
 
-       (*ntlmssp_state)->mem_ctx = mem_ctx;
+       if (!netbios_domain) {
+               netbios_domain = "";
+       }
 
-       (*ntlmssp_state)->get_global_myname = global_myname;
-       (*ntlmssp_state)->get_domain = lp_workgroup;
+       ntlmssp_state = talloc_zero(mem_ctx, struct ntlmssp_state);
+       if (!ntlmssp_state) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       (*ntlmssp_state)->unicode = True;
+       ntlmssp_state->role = NTLMSSP_CLIENT;
 
-       (*ntlmssp_state)->use_ntlmv2 = lp_client_ntlmv2_auth();
+       ntlmssp_state->unicode = True;
 
-       (*ntlmssp_state)->expected_state = NTLMSSP_INITIAL;
+       ntlmssp_state->use_ntlmv2 = use_ntlmv2;
 
-       (*ntlmssp_state)->ref_count = 1;
+       ntlmssp_state->expected_state = NTLMSSP_INITIAL;
 
-       (*ntlmssp_state)->neg_flags = 
+       ntlmssp_state->neg_flags =
                NTLMSSP_NEGOTIATE_128 |
                NTLMSSP_NEGOTIATE_ALWAYS_SIGN |
                NTLMSSP_NEGOTIATE_NTLM |
@@ -1247,5 +1214,17 @@ NTSTATUS ntlmssp_client_start(NTLMSSP_STATE **ntlmssp_state)
                NTLMSSP_NEGOTIATE_KEY_EXCH |
                NTLMSSP_REQUEST_TARGET;
 
+       ntlmssp_state->client.netbios_name = talloc_strdup(ntlmssp_state, netbios_name);
+       if (!ntlmssp_state->client.netbios_name) {
+               talloc_free(ntlmssp_state);
+               return NT_STATUS_NO_MEMORY;
+       }
+       ntlmssp_state->client.netbios_domain = talloc_strdup(ntlmssp_state, netbios_domain);
+       if (!ntlmssp_state->client.netbios_domain) {
+               talloc_free(ntlmssp_state);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       *_ntlmssp_state = ntlmssp_state;
        return NT_STATUS_OK;
 }