r23779: Change from v2 or later to v3 or later.
[kai/samba.git] / source3 / utils / ntlm_auth.c
index 4461f163dd5d01765e1a1a63e50f3801ea5da569..93fc6c9e93d77bb75b13050579b83d03c6aaf034 100644 (file)
@@ -3,13 +3,14 @@
 
    Winbind status program.
 
-   Copyright (C) Tim Potter      2000-2002
-   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2003
+   Copyright (C) Tim Potter      2000-2003
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2003-2004
    Copyright (C) Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it> 2000 
+   Copyright (C) Robert O'Callahan 2006 (added cached credential code).
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   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,
@@ -23,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "utils/ntlm_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
@@ -33,8 +35,11 @@ enum stdio_helper_mode {
        SQUID_2_4_BASIC,
        SQUID_2_5_BASIC,
        SQUID_2_5_NTLMSSP,
+       NTLMSSP_CLIENT_1,
        GSS_SPNEGO,
        GSS_SPNEGO_CLIENT,
+       NTLM_SERVER_1,
+       NTLM_CHANGE_PASSWORD_1,
        NUM_HELPER_MODES
 };
 
@@ -47,12 +52,20 @@ static void manage_squid_basic_request (enum stdio_helper_mode stdio_helper_mode
 static void manage_squid_ntlmssp_request (enum stdio_helper_mode stdio_helper_mode, 
                                          char *buf, int length);
 
+static void manage_client_ntlmssp_request (enum stdio_helper_mode stdio_helper_mode, 
+                                          char *buf, int length);
+
 static void manage_gss_spnego_request (enum stdio_helper_mode stdio_helper_mode, 
                                       char *buf, int length);
 
 static void manage_gss_spnego_client_request (enum stdio_helper_mode stdio_helper_mode, 
                                              char *buf, int length);
 
+static void manage_ntlm_server_1_request (enum stdio_helper_mode stdio_helper_mode, 
+                                         char *buf, int length);
+
+static void manage_ntlm_change_password_1_request(enum stdio_helper_mode helper_mode, char *buf, int length);
+
 static const struct {
        enum stdio_helper_mode mode;
        const char *name;
@@ -61,23 +74,29 @@ static const struct {
        { SQUID_2_4_BASIC, "squid-2.4-basic", manage_squid_basic_request},
        { SQUID_2_5_BASIC, "squid-2.5-basic", manage_squid_basic_request},
        { SQUID_2_5_NTLMSSP, "squid-2.5-ntlmssp", manage_squid_ntlmssp_request},
+       { NTLMSSP_CLIENT_1, "ntlmssp-client-1", manage_client_ntlmssp_request},
        { GSS_SPNEGO, "gss-spnego", manage_gss_spnego_request},
        { GSS_SPNEGO_CLIENT, "gss-spnego-client", manage_gss_spnego_client_request},
+       { NTLM_SERVER_1, "ntlm-server-1", manage_ntlm_server_1_request},
+       { NTLM_CHANGE_PASSWORD_1, "ntlm-change-password-1", manage_ntlm_change_password_1_request},
        { NUM_HELPER_MODES, NULL, NULL}
 };
 
 extern int winbindd_fd;
 
-static const char *opt_username;
-static const char *opt_domain;
-static const char *opt_workstation;
-static const char *opt_password;
+const char *opt_username;
+const char *opt_domain;
+const char *opt_workstation;
+const char *opt_password;
 static DATA_BLOB opt_challenge;
 static DATA_BLOB opt_lm_response;
 static DATA_BLOB opt_nt_response;
 static int request_lm_key;
-static int request_nt_key;
+static int request_user_session_key;
+static int use_cached_creds;
 
+static const char *require_membership_of;
+static const char *require_membership_of_sid;
 
 static char winbind_separator(void)
 {
@@ -92,10 +111,10 @@ static char winbind_separator(void)
 
        /* Send off request */
 
-       if (winbindd_request(WINBINDD_INFO, NULL, &response) !=
+       if (winbindd_request_response(WINBINDD_INFO, NULL, &response) !=
            NSS_STATUS_SUCCESS) {
                d_printf("could not obtain winbind separator!\n");
-               return '\\';
+               return *lp_winbind_separator();
        }
 
        sep = response.data.info.winbind_separator;
@@ -103,13 +122,13 @@ static char winbind_separator(void)
 
        if (!sep) {
                d_printf("winbind separator was NULL!\n");
-               return '\\';
+               return *lp_winbind_separator();
        }
        
        return sep;
 }
 
-static const char *get_winbind_domain(void)
+const char *get_winbind_domain(void)
 {
        struct winbindd_response response;
 
@@ -122,10 +141,10 @@ static const char *get_winbind_domain(void)
 
        /* Send off request */
 
-       if (winbindd_request(WINBINDD_DOMAIN_NAME, NULL, &response) !=
+       if (winbindd_request_response(WINBINDD_DOMAIN_NAME, NULL, &response) !=
            NSS_STATUS_SUCCESS) {
                DEBUG(0, ("could not obtain winbind domain name!\n"));
-               return NULL;
+               return lp_workgroup();
        }
 
        fstrcpy(winbind_domain, response.data.domain_name);
@@ -134,7 +153,7 @@ static const char *get_winbind_domain(void)
 
 }
 
-static const char *get_winbind_netbios_name(void)
+const char *get_winbind_netbios_name(void)
 {
        struct winbindd_response response;
 
@@ -148,10 +167,10 @@ static const char *get_winbind_netbios_name(void)
 
        /* Send off request */
 
-       if (winbindd_request(WINBINDD_NETBIOS_NAME, NULL, &response) !=
+       if (winbindd_request_response(WINBINDD_NETBIOS_NAME, NULL, &response) !=
            NSS_STATUS_SUCCESS) {
                DEBUG(0, ("could not obtain winbind netbios name!\n"));
-               return NULL;
+               return global_myname();
        }
 
        fstrcpy(winbind_netbios_name, response.data.netbios_name);
@@ -160,14 +179,91 @@ static const char *get_winbind_netbios_name(void)
 
 }
 
+DATA_BLOB get_challenge(void) 
+{
+       static DATA_BLOB chal;
+       if (opt_challenge.length)
+               return opt_challenge;
+       
+       chal = data_blob(NULL, 8);
+
+       generate_random_buffer(chal.data, chal.length);
+       return chal;
+}
+
+/* Copy of parse_domain_user from winbindd_util.c.  Parse a string of the
+   form DOMAIN/user into a domain and a user */
+
+static BOOL parse_ntlm_auth_domain_user(const char *domuser, fstring domain, 
+                                    fstring user)
+{
+
+       char *p = strchr(domuser,winbind_separator());
+
+       if (!p) {
+               return False;
+       }
+        
+       fstrcpy(user, p+1);
+       fstrcpy(domain, domuser);
+       domain[PTR_DIFF(p, domuser)] = 0;
+       strupper_m(domain);
+
+       return True;
+}
+
+static BOOL get_require_membership_sid(void) {
+       struct winbindd_request request;
+       struct winbindd_response response;
+
+       if (!require_membership_of) {
+               return True;
+       }
+
+       if (require_membership_of_sid) {
+               return True;
+       }
+
+       /* Otherwise, ask winbindd for the name->sid request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       if (!parse_ntlm_auth_domain_user(require_membership_of, 
+                                        request.data.name.dom_name, 
+                                        request.data.name.name)) {
+               DEBUG(0, ("Could not parse %s into seperate domain/name parts!\n", 
+                         require_membership_of));
+               return False;
+       }
+
+       if (winbindd_request_response(WINBINDD_LOOKUPNAME, &request, &response) !=
+           NSS_STATUS_SUCCESS) {
+               DEBUG(0, ("Winbindd lookupname failed to resolve %s into a SID!\n", 
+                         require_membership_of));
+               return False;
+       }
+
+       require_membership_of_sid = SMB_STRDUP(response.data.sid.sid);
+
+       if (require_membership_of_sid)
+               return True;
+
+       return False;
+}
 /* Authenticate a user with a plaintext password */
 
-static BOOL check_plaintext_auth(const char *user, const char *pass, BOOL stdout_diagnostics)
+static BOOL check_plaintext_auth(const char *user, const char *pass, 
+                                BOOL stdout_diagnostics)
 {
        struct winbindd_request request;
        struct winbindd_response response;
         NSS_STATUS result;
 
+       if (!get_require_membership_sid()) {
+               return False;
+       }
+
        /* Send off request */
 
        ZERO_STRUCT(request);
@@ -175,8 +271,10 @@ static BOOL check_plaintext_auth(const char *user, const char *pass, BOOL stdout
 
        fstrcpy(request.data.auth.user, user);
        fstrcpy(request.data.auth.pass, pass);
+       if (require_membership_of_sid)
+               pstrcpy(request.data.auth.require_membership_of_sid, require_membership_of_sid);
 
-       result = winbindd_request(WINBINDD_PAM_AUTH, &request, &response);
+       result = winbindd_request_response(WINBINDD_PAM_AUTH, &request, &response);
 
        /* Display response */
        
@@ -205,61 +303,60 @@ static BOOL check_plaintext_auth(const char *user, const char *pass, BOOL stdout
 
 /* authenticate a user with an encrypted username/password */
 
-static NTSTATUS contact_winbind_auth_crap(const char *username, 
-                                         const char *domain, 
-                                         const char *workstation,
-                                         const DATA_BLOB *challenge, 
-                                         const DATA_BLOB *lm_response, 
-                                         const DATA_BLOB *nt_response, 
-                                         uint32 flags, 
-                                         uint8 lm_key[8], 
-                                         uint8 nt_key[16], 
-                                         char **error_string) 
+NTSTATUS contact_winbind_auth_crap(const char *username, 
+                                  const char *domain, 
+                                  const char *workstation,
+                                  const DATA_BLOB *challenge, 
+                                  const DATA_BLOB *lm_response, 
+                                  const DATA_BLOB *nt_response, 
+                                  uint32 flags, 
+                                  uint8 lm_key[8], 
+                                  uint8 user_session_key[16], 
+                                  char **error_string, 
+                                  char **unix_name) 
 {
        NTSTATUS nt_status;
         NSS_STATUS result;
        struct winbindd_request request;
        struct winbindd_response response;
 
-       static uint8 zeros[16];
+       if (!get_require_membership_sid()) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
        ZERO_STRUCT(request);
        ZERO_STRUCT(response);
 
        request.flags = flags;
 
-       if (push_utf8_fstring(request.data.auth_crap.user, username) == -1) {
-               *error_string = smb_xstrdup(
-                       "unable to create utf8 string for username");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       request.data.auth_crap.logon_parameters = MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT | MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT;
 
-       if (push_utf8_fstring(request.data.auth_crap.domain, domain) == -1) {
-               *error_string = smb_xstrdup(
-                       "unable to create utf8 string for domain");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       if (require_membership_of_sid)
+               fstrcpy(request.data.auth_crap.require_membership_of_sid, require_membership_of_sid);
 
-       if (push_utf8_fstring(request.data.auth_crap.workstation, 
-                             workstation) == -1) {
-               *error_string = smb_xstrdup(
-                       "unable to create utf8 string for workstation");
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+        fstrcpy(request.data.auth_crap.user, username);
+       fstrcpy(request.data.auth_crap.domain, domain);
+
+       fstrcpy(request.data.auth_crap.workstation, 
+               workstation);
 
        memcpy(request.data.auth_crap.chal, challenge->data, MIN(challenge->length, 8));
 
        if (lm_response && lm_response->length) {
-               memcpy(request.data.auth_crap.lm_resp, lm_response->data, MIN(lm_response->length, sizeof(request.data.auth_crap.lm_resp)));
+               memcpy(request.data.auth_crap.lm_resp, 
+                      lm_response->data, 
+                      MIN(lm_response->length, sizeof(request.data.auth_crap.lm_resp)));
                request.data.auth_crap.lm_resp_len = lm_response->length;
        }
 
        if (nt_response && nt_response->length) {
-               memcpy(request.data.auth_crap.nt_resp, nt_response->data, MIN(nt_response->length, sizeof(request.data.auth_crap.nt_resp)));
+               memcpy(request.data.auth_crap.nt_resp, 
+                      nt_response->data, 
+                      MIN(nt_response->length, sizeof(request.data.auth_crap.nt_resp)));
                 request.data.auth_crap.nt_resp_len = nt_response->length;
        }
        
-       result = winbindd_request(WINBINDD_PAM_AUTH_CRAP, &request, &response);
+       result = winbindd_request_response(WINBINDD_PAM_AUTH_CRAP, &request, &response);
 
        /* Display response */
 
@@ -267,6 +364,7 @@ static NTSTATUS contact_winbind_auth_crap(const char *username,
                nt_status = NT_STATUS_UNSUCCESSFUL;
                if (error_string)
                        *error_string = smb_xstrdup("Reading winbind reply failed!");
+               free_response(&response);
                return nt_status;
        }
        
@@ -274,40 +372,128 @@ static NTSTATUS contact_winbind_auth_crap(const char *username,
        if (!NT_STATUS_IS_OK(nt_status)) {
                if (error_string) 
                        *error_string = smb_xstrdup(response.data.auth.error_string);
+               free_response(&response);
                return nt_status;
        }
 
-       if ((flags & WBFLAG_PAM_LMKEY) && lm_key 
-           && (memcmp(zeros, response.data.auth.first_8_lm_hash, 
-                      sizeof(response.data.auth.first_8_lm_hash)) != 0)) {
+       if ((flags & WBFLAG_PAM_LMKEY) && lm_key) {
                memcpy(lm_key, response.data.auth.first_8_lm_hash, 
-                       sizeof(response.data.auth.first_8_lm_hash));
+                      sizeof(response.data.auth.first_8_lm_hash));
        }
-       if ((flags & WBFLAG_PAM_NTKEY) && nt_key
-                   && (memcmp(zeros, response.data.auth.nt_session_key, 
-                              sizeof(response.data.auth.nt_session_key)) != 0)) {
-               memcpy(nt_key, response.data.auth.nt_session_key, 
-                       sizeof(response.data.auth.nt_session_key));
+       if ((flags & WBFLAG_PAM_USER_SESSION_KEY) && user_session_key) {
+               memcpy(user_session_key, response.data.auth.user_session_key, 
+                       sizeof(response.data.auth.user_session_key));
        }
+
+       if (flags & WBFLAG_PAM_UNIX_NAME) {
+               *unix_name = SMB_STRDUP((char *)response.extra_data.data);
+               if (!*unix_name) {
+                       free_response(&response);
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
+
+       free_response(&response);
        return nt_status;
 }
-                                  
-static NTSTATUS winbind_pw_check(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key) 
+
+/* contact server to change user password using auth crap */
+static NTSTATUS contact_winbind_change_pswd_auth_crap(const char *username,
+                                                     const char *domain,
+                                                     const DATA_BLOB new_nt_pswd,
+                                                     const DATA_BLOB old_nt_hash_enc,
+                                                     const DATA_BLOB new_lm_pswd,
+                                                     const DATA_BLOB old_lm_hash_enc,
+                                                     char  **error_string)
+{
+       NTSTATUS nt_status;
+       NSS_STATUS result;
+       struct winbindd_request request;
+       struct winbindd_response response;
+
+       if (!get_require_membership_sid())
+       {
+               if(error_string)
+                       *error_string = smb_xstrdup("Can't get membership sid.");
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       if(username != NULL)
+               fstrcpy(request.data.chng_pswd_auth_crap.user, username);
+       if(domain != NULL)
+               fstrcpy(request.data.chng_pswd_auth_crap.domain,domain);
+
+       if(new_nt_pswd.length)
+       {
+               memcpy(request.data.chng_pswd_auth_crap.new_nt_pswd, new_nt_pswd.data, sizeof(request.data.chng_pswd_auth_crap.new_nt_pswd));
+               request.data.chng_pswd_auth_crap.new_nt_pswd_len = new_nt_pswd.length;
+       }
+
+       if(old_nt_hash_enc.length)
+       {
+               memcpy(request.data.chng_pswd_auth_crap.old_nt_hash_enc, old_nt_hash_enc.data, sizeof(request.data.chng_pswd_auth_crap.old_nt_hash_enc));
+               request.data.chng_pswd_auth_crap.old_nt_hash_enc_len = old_nt_hash_enc.length;
+       }
+
+       if(new_lm_pswd.length)
+       {
+               memcpy(request.data.chng_pswd_auth_crap.new_lm_pswd, new_lm_pswd.data, sizeof(request.data.chng_pswd_auth_crap.new_lm_pswd));
+               request.data.chng_pswd_auth_crap.new_lm_pswd_len = new_lm_pswd.length;
+       }
+
+       if(old_lm_hash_enc.length)
+       {
+               memcpy(request.data.chng_pswd_auth_crap.old_lm_hash_enc, old_lm_hash_enc.data, sizeof(request.data.chng_pswd_auth_crap.old_lm_hash_enc));
+               request.data.chng_pswd_auth_crap.old_lm_hash_enc_len = old_lm_hash_enc.length;
+       }
+       
+       result = winbindd_request_response(WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP, &request, &response);
+
+       /* Display response */
+
+       if ((result != NSS_STATUS_SUCCESS) && (response.data.auth.nt_status == 0))
+       {
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+               if (error_string)
+                       *error_string = smb_xstrdup("Reading winbind reply failed!");
+               free_response(&response);
+               return nt_status;
+       }
+       
+       nt_status = (NT_STATUS(response.data.auth.nt_status));
+       if (!NT_STATUS_IS_OK(nt_status))
+       {
+               if (error_string) 
+                       *error_string = smb_xstrdup(response.data.auth.error_string);
+               free_response(&response);
+               return nt_status;
+       }
+
+       free_response(&response);
+       
+    return nt_status;
+}
+
+static NTSTATUS winbind_pw_check(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) 
 {
-       static const char zeros[16];
+       static const char zeros[16] = { 0, };
        NTSTATUS nt_status;
        char *error_string;
        uint8 lm_key[8]; 
-       uint8 nt_key[16]; 
-       
+       uint8 user_sess_key[16]; 
+       char *unix_name;
+
        nt_status = contact_winbind_auth_crap(ntlmssp_state->user, ntlmssp_state->domain,
                                              ntlmssp_state->workstation,
                                              &ntlmssp_state->chal,
                                              &ntlmssp_state->lm_resp,
                                              &ntlmssp_state->nt_resp, 
-                                             WBFLAG_PAM_LMKEY | WBFLAG_PAM_NTKEY,
-                                             lm_key, nt_key, 
-                                             &error_string);
+                                             WBFLAG_PAM_LMKEY | WBFLAG_PAM_USER_SESSION_KEY | WBFLAG_PAM_UNIX_NAME,
+                                             lm_key, user_sess_key, 
+                                             &error_string, &unix_name);
 
        if (NT_STATUS_IS_OK(nt_status)) {
                if (memcmp(lm_key, zeros, 8) != 0) {
@@ -316,21 +502,189 @@ static NTSTATUS winbind_pw_check(struct ntlmssp_state *ntlmssp_state, DATA_BLOB
                        memset(lm_session_key->data+8, '\0', 8);
                }
                
-               if (memcmp(nt_key, zeros, 16) != 0) {
-                       *nt_session_key = data_blob(nt_key, 16);
+               if (memcmp(user_sess_key, zeros, 16) != 0) {
+                       *user_session_key = data_blob(user_sess_key, 16);
                }
+               ntlmssp_state->auth_context = talloc_strdup(ntlmssp_state->mem_ctx, unix_name);
+               SAFE_FREE(unix_name);
        } else {
                DEBUG(NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCESS_DENIED) ? 0 : 3, 
                      ("Login for user [%s]\\[%s]@[%s] failed due to [%s]\n", 
-                      ntlmssp_state->domain, ntlmssp_state->user, ntlmssp_state->workstation, error_string ? error_string : "unknown error (NULL)"));
+                      ntlmssp_state->domain, ntlmssp_state->user, 
+                      ntlmssp_state->workstation, 
+                      error_string ? error_string : "unknown error (NULL)"));
+               ntlmssp_state->auth_context = NULL;
+       }
+       return nt_status;
+}
+
+static NTSTATUS local_pw_check(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) 
+{
+       NTSTATUS nt_status;
+       uint8 lm_pw[16], nt_pw[16];
+
+       nt_lm_owf_gen (opt_password, nt_pw, lm_pw);
+       
+       nt_status = ntlm_password_check(ntlmssp_state->mem_ctx, 
+                                       &ntlmssp_state->chal,
+                                       &ntlmssp_state->lm_resp,
+                                       &ntlmssp_state->nt_resp, 
+                                       NULL, NULL,
+                                       ntlmssp_state->user, 
+                                       ntlmssp_state->user, 
+                                       ntlmssp_state->domain,
+                                       lm_pw, nt_pw, user_session_key, lm_session_key);
+       
+       if (NT_STATUS_IS_OK(nt_status)) {
+               ntlmssp_state->auth_context = talloc_asprintf(ntlmssp_state->mem_ctx, 
+                                                             "%s%c%s", ntlmssp_state->domain, 
+                                                             *lp_winbind_separator(), 
+                                                             ntlmssp_state->user);
+       } else {
+               DEBUG(3, ("Login for user [%s]\\[%s]@[%s] failed due to [%s]\n", 
+                         ntlmssp_state->domain, ntlmssp_state->user, ntlmssp_state->workstation, 
+                         nt_errstr(nt_status)));
+               ntlmssp_state->auth_context = NULL;
        }
        return nt_status;
 }
 
+static NTSTATUS ntlm_auth_start_ntlmssp_client(NTLMSSP_STATE **client_ntlmssp_state) 
+{
+       NTSTATUS status;
+       if ( (opt_username == NULL) || (opt_domain == NULL) ) {
+               status = NT_STATUS_UNSUCCESSFUL;
+               DEBUG(1, ("Need username and domain for NTLMSSP\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       status = ntlmssp_client_start(client_ntlmssp_state);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("Could not start NTLMSSP client: %s\n",
+                         nt_errstr(status)));
+               ntlmssp_end(client_ntlmssp_state);
+               return status;
+       }
+
+       status = ntlmssp_set_username(*client_ntlmssp_state, opt_username);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("Could not set username: %s\n",
+                         nt_errstr(status)));
+               ntlmssp_end(client_ntlmssp_state);
+               return status;
+       }
+
+       status = ntlmssp_set_domain(*client_ntlmssp_state, opt_domain);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("Could not set domain: %s\n",
+                         nt_errstr(status)));
+               ntlmssp_end(client_ntlmssp_state);
+               return status;
+       }
+
+       if (opt_password) {
+               status = ntlmssp_set_password(*client_ntlmssp_state, opt_password);
+       
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(1, ("Could not set password: %s\n",
+                                 nt_errstr(status)));
+                       ntlmssp_end(client_ntlmssp_state);
+                       return status;
+               }
+       }
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS ntlm_auth_start_ntlmssp_server(NTLMSSP_STATE **ntlmssp_state) 
+{
+       NTSTATUS status = ntlmssp_server_start(ntlmssp_state);
+       
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("Could not start NTLMSSP server: %s\n",
+                         nt_errstr(status)));
+               return status;
+       }
+
+       /* Have we been given a local password, or should we ask winbind? */
+       if (opt_password) {
+               (*ntlmssp_state)->check_password = local_pw_check;
+               (*ntlmssp_state)->get_domain = lp_workgroup;
+               (*ntlmssp_state)->get_global_myname = global_myname;
+       } else {
+               (*ntlmssp_state)->check_password = winbind_pw_check;
+               (*ntlmssp_state)->get_domain = get_winbind_domain;
+               (*ntlmssp_state)->get_global_myname = get_winbind_netbios_name;
+       }
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ Used by firefox to drive NTLM auth to IIS servers.
+*******************************************************************/
+
+static NTSTATUS do_ccache_ntlm_auth(DATA_BLOB initial_msg, DATA_BLOB challenge_msg,
+                               DATA_BLOB *reply)
+{
+       struct winbindd_request wb_request;
+       struct winbindd_response wb_response;
+       NSS_STATUS result;
+
+       /* get winbindd to do the ntlmssp step on our behalf */
+       ZERO_STRUCT(wb_request);
+       ZERO_STRUCT(wb_response);
+
+       fstr_sprintf(wb_request.data.ccache_ntlm_auth.user,
+               "%s%c%s", opt_domain, winbind_separator(), opt_username);
+       wb_request.data.ccache_ntlm_auth.uid = geteuid();
+       wb_request.data.ccache_ntlm_auth.initial_blob_len = initial_msg.length;
+       wb_request.data.ccache_ntlm_auth.challenge_blob_len = challenge_msg.length;
+       wb_request.extra_len = initial_msg.length + challenge_msg.length;
+
+       if (wb_request.extra_len > 0) {
+               wb_request.extra_data.data = SMB_MALLOC_ARRAY(char, wb_request.extra_len);
+               if (wb_request.extra_data.data == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               memcpy(wb_request.extra_data.data, initial_msg.data, initial_msg.length);
+               memcpy(wb_request.extra_data.data + initial_msg.length,
+                       challenge_msg.data, challenge_msg.length);
+       }
+
+       result = winbindd_request_response(WINBINDD_CCACHE_NTLMAUTH, &wb_request, &wb_response);
+       SAFE_FREE(wb_request.extra_data.data);
+
+       if (result != NSS_STATUS_SUCCESS) {
+               free_response(&wb_response);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (reply) {
+               *reply = data_blob(wb_response.extra_data.data,
+                               wb_response.data.ccache_ntlm_auth.auth_blob_len);
+               if (wb_response.data.ccache_ntlm_auth.auth_blob_len > 0 &&
+                               reply->data == NULL) {
+                       free_response(&wb_response);
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
+
+       free_response(&wb_response);
+       return NT_STATUS_MORE_PROCESSING_REQUIRED;
+}
+
 static void manage_squid_ntlmssp_request(enum stdio_helper_mode stdio_helper_mode, 
                                         char *buf, int length) 
 {
        static NTLMSSP_STATE *ntlmssp_state = NULL;
+       static char* want_feature_list = NULL;
+       static uint32 neg_flags = 0;
+       static BOOL have_session_key = False;
+       static DATA_BLOB session_key;
        DATA_BLOB request, reply;
        NTSTATUS nt_status;
 
@@ -341,11 +695,57 @@ static void manage_squid_ntlmssp_request(enum stdio_helper_mode stdio_helper_mod
        }
 
        if (strlen(buf) > 3) {
+               if(strncmp(buf, "SF ", 3) == 0){
+                       DEBUG(10, ("Setting flags to negotioate\n"));
+                       SAFE_FREE(want_feature_list);
+                       want_feature_list = SMB_STRNDUP(buf+3, strlen(buf)-3);
+                       x_fprintf(x_stdout, "OK\n");
+                       return;
+               }
                request = base64_decode_data_blob(buf + 3);
-       } else if (strcmp(buf, "YR") == 0) {
-               request = data_blob(NULL, 0);
+       } else {
+               request = data_blob_null;
+       }
+
+       if ((strncmp(buf, "PW ", 3) == 0)) {
+               /* The calling application wants us to use a local password (rather than winbindd) */
+
+               opt_password = SMB_STRNDUP((const char *)request.data, request.length);
+
+               if (opt_password == NULL) {
+                       DEBUG(1, ("Out of memory\n"));
+                       x_fprintf(x_stdout, "BH\n");
+                       data_blob_free(&request);
+                       return;
+               }
+
+               x_fprintf(x_stdout, "OK\n");
+               data_blob_free(&request);
+               return;
+       }
+
+       if (strncmp(buf, "YR", 2) == 0) {
                if (ntlmssp_state)
                        ntlmssp_end(&ntlmssp_state);
+       } else if (strncmp(buf, "KK", 2) == 0) {
+               
+       } else if (strncmp(buf, "GF", 2) == 0) {
+               DEBUG(10, ("Requested negotiated NTLMSSP flags\n"));
+               x_fprintf(x_stdout, "GF 0x%08lx\n", have_session_key?neg_flags:0l);
+               data_blob_free(&request);
+               return;
+       } else if (strncmp(buf, "GK", 2) == 0) {
+               DEBUG(10, ("Requested NTLMSSP session key\n"));
+               if(have_session_key) {
+                       char *key64 = base64_encode_data_blob(session_key);
+                       x_fprintf(x_stdout, "GK %s\n", key64?key64:"<NULL>");
+                       SAFE_FREE(key64);
+               } else {
+                       x_fprintf(x_stdout, "BH\n");
+               }
+                       
+               data_blob_free(&request);
+               return;
        } else {
                DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
                x_fprintf(x_stdout, "BH\n");
@@ -353,14 +753,15 @@ static void manage_squid_ntlmssp_request(enum stdio_helper_mode stdio_helper_mod
        }
 
        if (!ntlmssp_state) {
-               ntlmssp_server_start(&ntlmssp_state);
-               ntlmssp_state->check_password = winbind_pw_check;
-               ntlmssp_state->get_domain = get_winbind_domain;
-               ntlmssp_state->get_global_myname = get_winbind_netbios_name;
+               if (!NT_STATUS_IS_OK(nt_status = ntlm_auth_start_ntlmssp_server(&ntlmssp_state))) {
+                       x_fprintf(x_stdout, "BH %s\n", nt_errstr(nt_status));
+                       return;
+               }
+               ntlmssp_want_feature_list(ntlmssp_state, want_feature_list);
        }
 
        DEBUG(10, ("got NTLMSSP packet:\n"));
-       dump_data(10, (const char *)request.data, request.length);
+       dump_data(10, request.data, request.length);
 
        nt_status = ntlmssp_update(ntlmssp_state, request, &reply);
        
@@ -373,55 +774,232 @@ static void manage_squid_ntlmssp_request(enum stdio_helper_mode stdio_helper_mod
        } else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCESS_DENIED)) {
                x_fprintf(x_stdout, "BH %s\n", nt_errstr(nt_status));
                DEBUG(0, ("NTLMSSP BH: %s\n", nt_errstr(nt_status)));
+
+               ntlmssp_end(&ntlmssp_state);
        } else if (!NT_STATUS_IS_OK(nt_status)) {
                x_fprintf(x_stdout, "NA %s\n", nt_errstr(nt_status));
                DEBUG(10, ("NTLMSSP %s\n", nt_errstr(nt_status)));
        } else {
-               x_fprintf(x_stdout, "AF %s\\%s\n", ntlmssp_state->domain, ntlmssp_state->user);
+               x_fprintf(x_stdout, "AF %s\n", (char *)ntlmssp_state->auth_context);
                DEBUG(10, ("NTLMSSP OK!\n"));
+               
+               if(have_session_key)
+                       data_blob_free(&session_key);
+               session_key = data_blob(ntlmssp_state->session_key.data, 
+                               ntlmssp_state->session_key.length);
+               neg_flags = ntlmssp_state->neg_flags;
+               have_session_key = True;
        }
 
        data_blob_free(&request);
 }
 
-static void manage_squid_basic_request(enum stdio_helper_mode stdio_helper_mode, 
-                                      char *buf, int length) 
+static void manage_client_ntlmssp_request(enum stdio_helper_mode stdio_helper_mode, 
+                                        char *buf, int length) 
 {
-       char *user, *pass;      
-       user=buf;
+       /* The statics here are *HORRIBLE* and this entire concept
+          needs to be rewritten. Essentially it's using these statics
+          as the state in a state machine. BLEEEGH ! JRA. */
+
+       static NTLMSSP_STATE *ntlmssp_state = NULL;
+       static DATA_BLOB initial_message;
+       static char* want_feature_list = NULL;
+       static uint32 neg_flags = 0;
+       static BOOL have_session_key = False;
+       static DATA_BLOB session_key;
+       DATA_BLOB request, reply;
+       NTSTATUS nt_status;
+       BOOL first = False;
        
-       pass=memchr(buf,' ',length);
-       if (!pass) {
-               DEBUG(2, ("Password not found. Denying access\n"));
-               x_fprintf(x_stderr, "ERR\n");
-               return;
+       if (!opt_username || !*opt_username) {
+               x_fprintf(x_stderr, "username must be specified!\n\n");
+               exit(1);
        }
-       *pass='\0';
-       pass++;
-       
-       if (stdio_helper_mode == SQUID_2_5_BASIC) {
-               rfc1738_unescape(user);
-               rfc1738_unescape(pass);
+
+       if (strlen(buf) < 2) {
+               DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
+               x_fprintf(x_stdout, "BH\n");
+               return;
        }
-       
-       if (check_plaintext_auth(user, pass, False)) {
-               x_fprintf(x_stdout, "OK\n");
+
+       if (strlen(buf) > 3) {
+               if(strncmp(buf, "SF ", 3) == 0) {
+                       DEBUG(10, ("Looking for flags to negotiate\n"));
+                       SAFE_FREE(want_feature_list);
+                       want_feature_list = SMB_STRNDUP(buf+3, strlen(buf)-3);
+                       x_fprintf(x_stdout, "OK\n");
+                       return;
+               }
+               request = base64_decode_data_blob(buf + 3);
        } else {
-               x_fprintf(x_stdout, "ERR\n");
+               request = data_blob_null;
        }
-}
 
-static void offer_gss_spnego_mechs(void) {
+       if (strncmp(buf, "PW ", 3) == 0) {
+               /* We asked for a password and obviously got it :-) */
 
-       DATA_BLOB token;
-       SPNEGO_DATA spnego;
-       ssize_t len;
-       char *reply_base64;
+               opt_password = SMB_STRNDUP((const char *)request.data, request.length);
 
-       pstring principal;
-       pstring myname_lower;
+               if (opt_password == NULL) {
+                       DEBUG(1, ("Out of memory\n"));
+                       x_fprintf(x_stdout, "BH\n");
+                       data_blob_free(&request);
+                       return;
+               }
 
-       ZERO_STRUCT(spnego);
+               x_fprintf(x_stdout, "OK\n");
+               data_blob_free(&request);
+               return;
+       }
+
+       if (!ntlmssp_state && use_cached_creds) {
+               /* check whether credentials are usable. */
+               DATA_BLOB empty_blob = data_blob_null;
+
+               nt_status = do_ccache_ntlm_auth(empty_blob, empty_blob, NULL);
+               if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+                       /* failed to use cached creds */
+                       use_cached_creds = False;
+               }
+       }
+
+       if (opt_password == NULL && !use_cached_creds) {
+               
+               /* Request a password from the calling process.  After
+                  sending it, the calling process should retry asking for the negotiate. */
+               
+               DEBUG(10, ("Requesting password\n"));
+               x_fprintf(x_stdout, "PW\n");
+               return;
+       }
+
+       if (strncmp(buf, "YR", 2) == 0) {
+               if (ntlmssp_state)
+                       ntlmssp_end(&ntlmssp_state);
+       } else if (strncmp(buf, "TT", 2) == 0) {
+               
+       } else if (strncmp(buf, "GF", 2) == 0) {
+               DEBUG(10, ("Requested negotiated NTLMSSP flags\n"));
+               x_fprintf(x_stdout, "GF 0x%08lx\n", have_session_key?neg_flags:0l);
+               data_blob_free(&request);
+               return;
+       } else if (strncmp(buf, "GK", 2) == 0 ) {
+               DEBUG(10, ("Requested session key\n"));
+
+               if(have_session_key) {
+                       char *key64 = base64_encode_data_blob(session_key);
+                       x_fprintf(x_stdout, "GK %s\n", key64?key64:"<NULL>");
+                       SAFE_FREE(key64);
+               }
+               else {
+                       x_fprintf(x_stdout, "BH\n");
+               }
+
+               data_blob_free(&request);
+               return;
+       } else {
+               DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
+               x_fprintf(x_stdout, "BH\n");
+               return;
+       }
+
+       if (!ntlmssp_state) {
+               if (!NT_STATUS_IS_OK(nt_status = ntlm_auth_start_ntlmssp_client(&ntlmssp_state))) {
+                       x_fprintf(x_stdout, "BH %s\n", nt_errstr(nt_status));
+                       return;
+               }
+               ntlmssp_want_feature_list(ntlmssp_state, want_feature_list);
+               first = True;
+               initial_message = data_blob_null;
+       }
+
+       DEBUG(10, ("got NTLMSSP packet:\n"));
+       dump_data(10, request.data, request.length);
+
+       if (use_cached_creds && !opt_password && !first) {
+               nt_status = do_ccache_ntlm_auth(initial_message, request, &reply);
+       } else {
+               nt_status = ntlmssp_update(ntlmssp_state, request, &reply);
+       }
+       
+       if (NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+               char *reply_base64 = base64_encode_data_blob(reply);
+               if (first) {
+                       x_fprintf(x_stdout, "YR %s\n", reply_base64);
+               } else { 
+                       x_fprintf(x_stdout, "KK %s\n", reply_base64);
+               }
+               SAFE_FREE(reply_base64);
+               if (first) {
+                       initial_message = reply;
+               } else {
+                       data_blob_free(&reply);
+               }
+               DEBUG(10, ("NTLMSSP challenge\n"));
+       } else if (NT_STATUS_IS_OK(nt_status)) {
+               char *reply_base64 = base64_encode_data_blob(reply);
+               x_fprintf(x_stdout, "AF %s\n", reply_base64);
+               SAFE_FREE(reply_base64);
+
+               if(have_session_key)
+                       data_blob_free(&session_key);
+
+               session_key = data_blob(ntlmssp_state->session_key.data, 
+                               ntlmssp_state->session_key.length);
+               neg_flags = ntlmssp_state->neg_flags;
+               have_session_key = True;
+
+               DEBUG(10, ("NTLMSSP OK!\n"));
+               if (ntlmssp_state)
+                       ntlmssp_end(&ntlmssp_state);
+       } else {
+               x_fprintf(x_stdout, "BH %s\n", nt_errstr(nt_status));
+               DEBUG(0, ("NTLMSSP BH: %s\n", nt_errstr(nt_status)));
+               if (ntlmssp_state)
+                       ntlmssp_end(&ntlmssp_state);
+       }
+
+       data_blob_free(&request);
+}
+
+static void manage_squid_basic_request(enum stdio_helper_mode stdio_helper_mode, 
+                                      char *buf, int length) 
+{
+       char *user, *pass;      
+       user=buf;
+       
+       pass=(char *)memchr(buf,' ',length);
+       if (!pass) {
+               DEBUG(2, ("Password not found. Denying access\n"));
+               x_fprintf(x_stdout, "ERR\n");
+               return;
+       }
+       *pass='\0';
+       pass++;
+       
+       if (stdio_helper_mode == SQUID_2_5_BASIC) {
+               rfc1738_unescape(user);
+               rfc1738_unescape(pass);
+       }
+       
+       if (check_plaintext_auth(user, pass, False)) {
+               x_fprintf(x_stdout, "OK\n");
+       } else {
+               x_fprintf(x_stdout, "ERR\n");
+       }
+}
+
+static void offer_gss_spnego_mechs(void) {
+
+       DATA_BLOB token;
+       SPNEGO_DATA spnego;
+       ssize_t len;
+       char *reply_base64;
+
+       pstring principal;
+       pstring myname_lower;
+
+       ZERO_STRUCT(spnego);
 
        pstrcpy(myname_lower, global_myname());
        strlower_m(myname_lower);
@@ -430,7 +1008,7 @@ static void offer_gss_spnego_mechs(void) {
 
        /* Server negTokenInit (mech offerings) */
        spnego.type = SPNEGO_NEG_TOKEN_INIT;
-       spnego.negTokenInit.mechTypes = smb_xmalloc(sizeof(char *) * 3);
+       spnego.negTokenInit.mechTypes = SMB_XMALLOC_ARRAY(const char *, 2);
 #ifdef HAVE_KRB5
        spnego.negTokenInit.mechTypes[0] = smb_xstrdup(OID_KERBEROS5_OLD);
        spnego.negTokenInit.mechTypes[1] = smb_xstrdup(OID_NTLMSSP);
@@ -479,32 +1057,34 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode,
        pstring     reply_argument;
 
        if (strlen(buf) < 2) {
+               DEBUG(1, ("SPENGO query [%s] invalid", buf));
+               x_fprintf(x_stdout, "BH\n");
+               return;
+       }
 
-               if (ntlmssp_state != NULL) {
-                       DEBUG(1, ("Request for initial SPNEGO request where "
-                                 "we already have a state\n"));
-                       x_fprintf(x_stdout, "BH\n");
-                       return;
-               }
-
-               DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
+       if (strncmp(buf, "YR", 2) == 0) {
+               if (ntlmssp_state)
+                       ntlmssp_end(&ntlmssp_state);
+       } else if (strncmp(buf, "KK", 2) == 0) {
+               
+       } else {
+               DEBUG(1, ("SPENGO query [%s] invalid", buf));
                x_fprintf(x_stdout, "BH\n");
                return;
        }
 
-       if ( (strlen(buf) == 2) && (strcmp(buf, "YR") == 0) ) {
+       if ( (strlen(buf) == 2)) {
 
-               /* Initial request, get the negTokenInit offering
+               /* no client data, get the negTokenInit offering
                    mechanisms */
 
                offer_gss_spnego_mechs();
                return;
        }
 
-       /* All subsequent requests are "KK" (Knock, Knock ;)) and have
-          a blob. This might be negTokenInit or negTokenTarg */
+       /* All subsequent requests have a blob. This might be negTokenInit or negTokenTarg */
 
-       if ( (strlen(buf) <= 3) || (strncmp(buf, "KK", 2) != 0) ) {
+       if (strlen(buf) <= 3) {
                DEBUG(1, ("GSS-SPNEGO query [%s] invalid\n", buf));
                x_fprintf(x_stdout, "BH\n");
                return;
@@ -532,6 +1112,7 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode,
                        return;
                }
 
+               status = NT_STATUS_UNSUCCESSFUL;
                if (strcmp(request.negTokenInit.mechTypes[0], OID_NTLMSSP) == 0) {
 
                        if ( request.negTokenInit.mechToken.data == NULL ) {
@@ -548,18 +1129,18 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode,
                                return;
                        }
 
-                       ntlmssp_server_start(&ntlmssp_state);
-                       ntlmssp_state->check_password = winbind_pw_check;
-                       ntlmssp_state->get_domain = get_winbind_domain;
-                       ntlmssp_state->get_global_myname = get_winbind_netbios_name;
+                       if (!NT_STATUS_IS_OK(status = ntlm_auth_start_ntlmssp_server(&ntlmssp_state))) {
+                               x_fprintf(x_stdout, "BH %s\n", nt_errstr(status));
+                               return;
+                       }
 
                        DEBUG(10, ("got NTLMSSP packet:\n"));
-                       dump_data(10, (const char *)request.negTokenInit.mechToken.data,
+                       dump_data(10, request.negTokenInit.mechToken.data,
                                  request.negTokenInit.mechToken.length);
 
                        response.type = SPNEGO_NEG_TOKEN_TARG;
-                       response.negTokenTarg.supportedMech = strdup(OID_NTLMSSP);
-                       response.negTokenTarg.mechListMIC = data_blob(NULL, 0);
+                       response.negTokenTarg.supportedMech = SMB_STRDUP(OID_NTLMSSP);
+                       response.negTokenTarg.mechListMIC = data_blob_null;
 
                        status = ntlmssp_update(ntlmssp_state,
                                                       request.negTokenInit.mechToken,
@@ -569,8 +1150,8 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode,
 #ifdef HAVE_KRB5
                if (strcmp(request.negTokenInit.mechTypes[0], OID_KERBEROS5_OLD) == 0) {
 
+                       TALLOC_CTX *mem_ctx = talloc_init("manage_gss_spnego_request");
                        char *principal;
-                       DATA_BLOB auth_data;
                        DATA_BLOB ap_rep;
                        DATA_BLOB session_key;
 
@@ -581,21 +1162,23 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode,
                        }
 
                        response.type = SPNEGO_NEG_TOKEN_TARG;
-                       response.negTokenTarg.supportedMech = strdup(OID_KERBEROS5_OLD);
-                       response.negTokenTarg.mechListMIC = data_blob(NULL, 0);
-                       response.negTokenTarg.responseToken = data_blob(NULL, 0);
+                       response.negTokenTarg.supportedMech = SMB_STRDUP(OID_KERBEROS5_OLD);
+                       response.negTokenTarg.mechListMIC = data_blob_null;
+                       response.negTokenTarg.responseToken = data_blob_null;
 
-                       status = ads_verify_ticket(lp_realm(),
+                       status = ads_verify_ticket(mem_ctx, lp_realm(), 0,
                                                   &request.negTokenInit.mechToken,
-                                                  &principal, &auth_data, &ap_rep,
-                                                  &session_key);
+                                                  &principal, NULL, &ap_rep,
+                                                  &session_key, True);
+
+                       talloc_destroy(mem_ctx);
 
                        /* Now in "principal" we have the name we are
                            authenticated as. */
 
                        if (NT_STATUS_IS_OK(status)) {
 
-                               domain = strchr(principal, '@');
+                               domain = strchr_m(principal, '@');
 
                                if (domain == NULL) {
                                        DEBUG(1, ("Did not get a valid principal "
@@ -605,11 +1188,10 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode,
                                }
 
                                *domain++ = '\0';
-                               domain = strdup(domain);
-                               user = strdup(principal);
+                               domain = SMB_STRDUP(domain);
+                               user = SMB_STRDUP(principal);
 
                                data_blob_free(&ap_rep);
-                               data_blob_free(&auth_data);
 
                                SAFE_FREE(principal);
                        }
@@ -639,12 +1221,12 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode,
                                               &response.negTokenTarg.responseToken);
 
                response.type = SPNEGO_NEG_TOKEN_TARG;
-               response.negTokenTarg.supportedMech = strdup(OID_NTLMSSP);
-               response.negTokenTarg.mechListMIC = data_blob(NULL, 0);
+               response.negTokenTarg.supportedMech = SMB_STRDUP(OID_NTLMSSP);
+               response.negTokenTarg.mechListMIC = data_blob_null;
 
                if (NT_STATUS_IS_OK(status)) {
-                       user = strdup(ntlmssp_state->user);
-                       domain = strdup(ntlmssp_state->domain);
+                       user = SMB_STRDUP(ntlmssp_state->user);
+                       domain = SMB_STRDUP(ntlmssp_state->domain);
                        ntlmssp_end(&ntlmssp_state);
                }
        }
@@ -694,7 +1276,7 @@ static NTLMSSP_STATE *client_ntlmssp_state = NULL;
 static BOOL manage_client_ntlmssp_init(SPNEGO_DATA spnego)
 {
        NTSTATUS status;
-       DATA_BLOB null_blob = data_blob(NULL, 0);
+       DATA_BLOB null_blob = data_blob_null;
        DATA_BLOB to_server;
        char *to_server_base64;
        const char *my_mechs[] = {OID_NTLMSSP, NULL};
@@ -707,11 +1289,14 @@ static BOOL manage_client_ntlmssp_init(SPNEGO_DATA spnego)
                return False;
        }
 
-       if ( (opt_username == NULL) || (opt_domain == NULL) ) {
-               DEBUG(1, ("Need username and domain for NTLMSSP\n"));
-               return False;
+       if (!client_ntlmssp_state) {
+               if (!NT_STATUS_IS_OK(status = ntlm_auth_start_ntlmssp_client(&client_ntlmssp_state))) {
+                       x_fprintf(x_stdout, "BH %s\n", nt_errstr(status));
+                       return False;
+               }
        }
 
+
        if (opt_password == NULL) {
 
                /* Request a password from the calling process.  After
@@ -723,42 +1308,6 @@ static BOOL manage_client_ntlmssp_init(SPNEGO_DATA spnego)
                return True;
        }
 
-       status = ntlmssp_client_start(&client_ntlmssp_state);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("Could not start NTLMSSP client: %s\n",
-                         nt_errstr(status)));
-               ntlmssp_end(&client_ntlmssp_state);
-               return False;
-       }
-
-       status = ntlmssp_set_username(client_ntlmssp_state, opt_username);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("Could not set username: %s\n",
-                         nt_errstr(status)));
-               ntlmssp_end(&client_ntlmssp_state);
-               return False;
-       }
-
-       status = ntlmssp_set_domain(client_ntlmssp_state, opt_domain);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("Could not set domain: %s\n",
-                         nt_errstr(status)));
-               ntlmssp_end(&client_ntlmssp_state);
-               return False;
-       }
-
-       status = ntlmssp_set_password(client_ntlmssp_state, opt_password);
-       
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("Could not set password: %s\n",
-                         nt_errstr(status)));
-               ntlmssp_end(&client_ntlmssp_state);
-               return False;
-       }
-
        spnego.type = SPNEGO_NEG_TOKEN_INIT;
        spnego.negTokenInit.mechTypes = my_mechs;
        spnego.negTokenInit.reqFlags = 0;
@@ -767,8 +1316,9 @@ static BOOL manage_client_ntlmssp_init(SPNEGO_DATA spnego)
        status = ntlmssp_update(client_ntlmssp_state, null_blob,
                                       &spnego.negTokenInit.mechToken);
 
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               DEBUG(1, ("Expected MORE_PROCESSING_REQUIRED, got: %s\n",
+       if ( !(NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) ||
+                       NT_STATUS_IS_OK(status)) ) {
+               DEBUG(1, ("Expected OK or MORE_PROCESSING_REQUIRED, got: %s\n",
                          nt_errstr(status)));
                ntlmssp_end(&client_ntlmssp_state);
                return False;
@@ -787,7 +1337,7 @@ static BOOL manage_client_ntlmssp_init(SPNEGO_DATA spnego)
 static void manage_client_ntlmssp_targ(SPNEGO_DATA spnego)
 {
        NTSTATUS status;
-       DATA_BLOB null_blob = data_blob(NULL, 0);
+       DATA_BLOB null_blob = data_blob_null;
        DATA_BLOB request;
        DATA_BLOB to_server;
        char *to_server_base64;
@@ -797,7 +1347,6 @@ static void manage_client_ntlmssp_targ(SPNEGO_DATA spnego)
        if (client_ntlmssp_state == NULL) {
                DEBUG(1, ("Got NTLMSSP tArg without a client state\n"));
                x_fprintf(x_stdout, "BH\n");
-               ntlmssp_end(&client_ntlmssp_state);
                return;
        }
 
@@ -829,7 +1378,7 @@ static void manage_client_ntlmssp_targ(SPNEGO_DATA spnego)
 
        spnego.type = SPNEGO_NEG_TOKEN_TARG;
        spnego.negTokenTarg.negResult = SPNEGO_ACCEPT_INCOMPLETE;
-       spnego.negTokenTarg.supportedMech = OID_NTLMSSP;
+       spnego.negTokenTarg.supportedMech = (char *)OID_NTLMSSP;
        spnego.negTokenTarg.responseToken = request;
        spnego.negTokenTarg.mechListMIC = null_blob;
        
@@ -849,9 +1398,10 @@ static BOOL manage_client_krb5_init(SPNEGO_DATA spnego)
 {
        char *principal;
        DATA_BLOB tkt, to_server;
-       DATA_BLOB session_key_krb5;
+       DATA_BLOB session_key_krb5 = data_blob_null;
        SPNEGO_DATA reply;
        char *reply_base64;
+       int retval;
        
        const char *my_mechs[] = {OID_KERBEROS5_OLD, NULL};
        ssize_t len;
@@ -862,7 +1412,8 @@ static BOOL manage_client_krb5_init(SPNEGO_DATA spnego)
                return False;
        }
 
-       principal = malloc(spnego.negTokenInit.mechListMIC.length+1);
+       principal = (char *)SMB_MALLOC(
+               spnego.negTokenInit.mechListMIC.length+1);
 
        if (principal == NULL) {
                DEBUG(1, ("Could not malloc principal\n"));
@@ -873,9 +1424,9 @@ static BOOL manage_client_krb5_init(SPNEGO_DATA spnego)
               spnego.negTokenInit.mechListMIC.length);
        principal[spnego.negTokenInit.mechListMIC.length] = '\0';
 
-       tkt = cli_krb5_get_ticket(principal, 0, &session_key_krb5);
+       retval = cli_krb5_get_ticket(principal, 0, &tkt, &session_key_krb5, 0, NULL, NULL);
 
-       if (tkt.data == NULL) {
+       if (retval) {
 
                pstring user;
 
@@ -890,13 +1441,17 @@ static BOOL manage_client_krb5_init(SPNEGO_DATA spnego)
 
                pstr_sprintf(user, "%s@%s", opt_username, opt_domain);
 
-               if (kerberos_kinit_password(user, opt_password, 0) != 0) {
-                       DEBUG(10, ("Requesting TGT failed\n"));
-                       x_fprintf(x_stdout, "NA\n");
-                       return True;
+               if ((retval = kerberos_kinit_password(user, opt_password, 0, NULL))) {
+                       DEBUG(10, ("Requesting TGT failed: %s\n", error_message(retval)));
+                       return False;
                }
 
-               tkt = cli_krb5_get_ticket(principal, 0, &session_key_krb5);
+               retval = cli_krb5_get_ticket(principal, 0, &tkt, &session_key_krb5, 0, NULL, NULL);
+
+               if (retval) {
+                       DEBUG(10, ("Kinit suceeded, but getting a ticket failed: %s\n", error_message(retval)));
+                       return False;
+               }
        }
 
        data_blob_free(&session_key_krb5);
@@ -907,7 +1462,7 @@ static BOOL manage_client_krb5_init(SPNEGO_DATA spnego)
        reply.negTokenInit.mechTypes = my_mechs;
        reply.negTokenInit.reqFlags = 0;
        reply.negTokenInit.mechToken = tkt;
-       reply.negTokenInit.mechListMIC = data_blob(NULL, 0);
+       reply.negTokenInit.mechListMIC = data_blob_null;
 
        len = write_spnego_data(&to_server, &reply);
        data_blob_free(&tkt);
@@ -956,6 +1511,11 @@ static void manage_gss_spnego_client_request(enum stdio_helper_mode stdio_helper
        SPNEGO_DATA spnego;
        ssize_t len;
 
+       if (!opt_username || !*opt_username) {
+               x_fprintf(x_stderr, "username must be specified!\n\n");
+               exit(1);
+       }
+
        if (strlen(buf) <= 3) {
                DEBUG(1, ("SPNEGO query [%s] too short\n", buf));
                x_fprintf(x_stdout, "BH\n");
@@ -968,8 +1528,8 @@ static void manage_gss_spnego_client_request(enum stdio_helper_mode stdio_helper
 
                /* We asked for a password and obviously got it :-) */
 
-               opt_password = strndup((const char *)request.data, request.length);
-
+               opt_password = SMB_STRNDUP((const char *)request.data, request.length);
+               
                if (opt_password == NULL) {
                        DEBUG(1, ("Out of memory\n"));
                        x_fprintf(x_stdout, "BH\n");
@@ -1007,7 +1567,7 @@ static void manage_gss_spnego_client_request(enum stdio_helper_mode stdio_helper
 
                /* The server offers a list of mechanisms */
 
-               const char **mechType = spnego.negTokenInit.mechTypes;
+               const char **mechType = (const char **)spnego.negTokenInit.mechTypes;
 
                while (*mechType != NULL) {
 
@@ -1082,6 +1642,409 @@ static void manage_gss_spnego_client_request(enum stdio_helper_mode stdio_helper
        return;
 }
 
+static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mode, 
+                                        char *buf, int length) 
+{
+       char *request, *parameter;      
+       static DATA_BLOB challenge;
+       static DATA_BLOB lm_response;
+       static DATA_BLOB nt_response;
+       static char *full_username;
+       static char *username;
+       static char *domain;
+       static char *plaintext_password;
+       static BOOL ntlm_server_1_user_session_key;
+       static BOOL ntlm_server_1_lm_session_key;
+       
+       if (strequal(buf, ".")) {
+               if (!full_username && !username) {      
+                       x_fprintf(x_stdout, "Error: No username supplied!\n");
+               } else if (plaintext_password) {
+                       /* handle this request as plaintext */
+                       if (!full_username) {
+                               if (asprintf(&full_username, "%s%c%s", domain, winbind_separator(), username) == -1) {
+                                       x_fprintf(x_stdout, "Error: Out of memory in asprintf!\n.\n");
+                                       return;
+                               }
+                       }
+                       if (check_plaintext_auth(full_username, plaintext_password, False)) {
+                               x_fprintf(x_stdout, "Authenticated: Yes\n");
+                       } else {
+                               x_fprintf(x_stdout, "Authenticated: No\n");
+                       }
+               } else if (!lm_response.data && !nt_response.data) {
+                       x_fprintf(x_stdout, "Error: No password supplied!\n");
+               } else if (!challenge.data) {   
+                       x_fprintf(x_stdout, "Error: No lanman-challenge supplied!\n");
+               } else {
+                       char *error_string = NULL;
+                       uchar lm_key[8];
+                       uchar user_session_key[16];
+                       uint32 flags = 0;
+
+                       if (full_username && !username) {
+                               fstring fstr_user;
+                               fstring fstr_domain;
+                               
+                               if (!parse_ntlm_auth_domain_user(full_username, fstr_user, fstr_domain)) {
+                                       /* username might be 'tainted', don't print into our new-line deleimianted stream */
+                                       x_fprintf(x_stdout, "Error: Could not parse into domain and username\n");
+                               }
+                               SAFE_FREE(username);
+                               SAFE_FREE(domain);
+                               username = smb_xstrdup(fstr_user);
+                               domain = smb_xstrdup(fstr_domain);
+                       }
+
+                       if (!domain) {
+                               domain = smb_xstrdup(get_winbind_domain());
+                       }
+
+                       if (ntlm_server_1_lm_session_key) 
+                               flags |= WBFLAG_PAM_LMKEY;
+                       
+                       if (ntlm_server_1_user_session_key) 
+                               flags |= WBFLAG_PAM_USER_SESSION_KEY;
+
+                       if (!NT_STATUS_IS_OK(
+                                   contact_winbind_auth_crap(username, 
+                                                             domain, 
+                                                             global_myname(),
+                                                             &challenge, 
+                                                             &lm_response, 
+                                                             &nt_response, 
+                                                             flags, 
+                                                             lm_key, 
+                                                             user_session_key,
+                                                             &error_string,
+                                                             NULL))) {
+
+                               x_fprintf(x_stdout, "Authenticated: No\n");
+                               x_fprintf(x_stdout, "Authentication-Error: %s\n.\n", error_string);
+                               SAFE_FREE(error_string);
+                       } else {
+                               static char zeros[16];
+                               char *hex_lm_key;
+                               char *hex_user_session_key;
+
+                               x_fprintf(x_stdout, "Authenticated: Yes\n");
+
+                               if (ntlm_server_1_lm_session_key 
+                                   && (memcmp(zeros, lm_key, 
+                                              sizeof(lm_key)) != 0)) {
+                                       hex_lm_key = hex_encode(NULL,
+                                                               (const unsigned char *)lm_key,
+                                                               sizeof(lm_key));
+                                       x_fprintf(x_stdout, "LANMAN-Session-Key: %s\n", hex_lm_key);
+                                       TALLOC_FREE(hex_lm_key);
+                               }
+
+                               if (ntlm_server_1_user_session_key 
+                                   && (memcmp(zeros, user_session_key, 
+                                              sizeof(user_session_key)) != 0)) {
+                                       hex_user_session_key = hex_encode(NULL,
+                                                                         (const unsigned char *)user_session_key, 
+                                                                         sizeof(user_session_key));
+                                       x_fprintf(x_stdout, "User-Session-Key: %s\n", hex_user_session_key);
+                                       TALLOC_FREE(hex_user_session_key);
+                               }
+                       }
+               }
+               /* clear out the state */
+               challenge = data_blob_null;
+               nt_response = data_blob_null;
+               lm_response = data_blob_null;
+               SAFE_FREE(full_username);
+               SAFE_FREE(username);
+               SAFE_FREE(domain);
+               SAFE_FREE(plaintext_password);
+               ntlm_server_1_user_session_key = False;
+               ntlm_server_1_lm_session_key = False;
+               x_fprintf(x_stdout, ".\n");
+
+               return;
+       }
+
+       request = buf;
+
+       /* Indicates a base64 encoded structure */
+       parameter = strstr_m(request, ":: ");
+       if (!parameter) {
+               parameter = strstr_m(request, ": ");
+               
+               if (!parameter) {
+                       DEBUG(0, ("Parameter not found!\n"));
+                       x_fprintf(x_stdout, "Error: Parameter not found!\n.\n");
+                       return;
+               }
+               
+               parameter[0] ='\0';
+               parameter++;
+               parameter[0] ='\0';
+               parameter++;
+
+       } else {
+               parameter[0] ='\0';
+               parameter++;
+               parameter[0] ='\0';
+               parameter++;
+               parameter[0] ='\0';
+               parameter++;
+
+               base64_decode_inplace(parameter);
+       }
+
+       if (strequal(request, "LANMAN-Challenge")) {
+               challenge = strhex_to_data_blob(NULL, parameter);
+               if (challenge.length != 8) {
+                       x_fprintf(x_stdout, "Error: hex decode of %s failed! (got %d bytes, expected 8)\n.\n", 
+                                 parameter,
+                                 (int)challenge.length);
+                       challenge = data_blob_null;
+               }
+       } else if (strequal(request, "NT-Response")) {
+               nt_response = strhex_to_data_blob(NULL, parameter);
+               if (nt_response.length < 24) {
+                       x_fprintf(x_stdout, "Error: hex decode of %s failed! (only got %d bytes, needed at least 24)\n.\n", 
+                                 parameter,
+                                 (int)nt_response.length);
+                       nt_response = data_blob_null;
+               }
+       } else if (strequal(request, "LANMAN-Response")) {
+               lm_response = strhex_to_data_blob(NULL, parameter);
+               if (lm_response.length != 24) {
+                       x_fprintf(x_stdout, "Error: hex decode of %s failed! (got %d bytes, expected 24)\n.\n", 
+                                 parameter,
+                                 (int)lm_response.length);
+                       lm_response = data_blob_null;
+               }
+       } else if (strequal(request, "Password")) {
+               plaintext_password = smb_xstrdup(parameter);
+       } else if (strequal(request, "NT-Domain")) {
+               domain = smb_xstrdup(parameter);
+       } else if (strequal(request, "Username")) {
+               username = smb_xstrdup(parameter);
+       } else if (strequal(request, "Full-Username")) {
+               full_username = smb_xstrdup(parameter);
+       } else if (strequal(request, "Request-User-Session-Key")) {
+               ntlm_server_1_user_session_key = strequal(parameter, "Yes");
+       } else if (strequal(request, "Request-LanMan-Session-Key")) {
+               ntlm_server_1_lm_session_key = strequal(parameter, "Yes");
+       } else {
+               x_fprintf(x_stdout, "Error: Unknown request %s\n.\n", request);
+       }
+}
+
+static void manage_ntlm_change_password_1_request(enum stdio_helper_mode helper_mode, char *buf, int length)
+{
+       char *request, *parameter;      
+       static DATA_BLOB new_nt_pswd;
+       static DATA_BLOB old_nt_hash_enc;
+       static DATA_BLOB new_lm_pswd;
+       static DATA_BLOB old_lm_hash_enc;
+       static char *full_username = NULL;
+       static char *username = NULL;
+       static char *domain = NULL;
+       static char *newpswd =  NULL;
+       static char *oldpswd = NULL;
+
+       if (strequal(buf, ".")) {
+               if(newpswd && oldpswd) {
+                       uchar old_nt_hash[16];
+                       uchar old_lm_hash[16];
+                       uchar new_nt_hash[16];
+                       uchar new_lm_hash[16];
+
+                       new_nt_pswd = data_blob(NULL, 516);
+                       old_nt_hash_enc = data_blob(NULL, 16);
+                       
+                       /* Calculate the MD4 hash (NT compatible) of the
+                        * password */
+                       E_md4hash(oldpswd, old_nt_hash);
+                       E_md4hash(newpswd, new_nt_hash);
+
+                       /* E_deshash returns false for 'long'
+                          passwords (> 14 DOS chars).  
+                          
+                          Therefore, don't send a buffer
+                          encrypted with the truncated hash
+                          (it could allow an even easier
+                          attack on the password)
+
+                          Likewise, obey the admin's restriction
+                       */
+
+                       if (lp_client_lanman_auth() &&
+                           E_deshash(newpswd, new_lm_hash) &&
+                           E_deshash(oldpswd, old_lm_hash)) {
+                               new_lm_pswd = data_blob(NULL, 516);
+                               old_lm_hash_enc = data_blob(NULL, 16);
+                               encode_pw_buffer(new_lm_pswd.data, newpswd,
+                                                STR_UNICODE);
+
+                               SamOEMhash(new_lm_pswd.data, old_nt_hash, 516);
+                               E_old_pw_hash(new_nt_hash, old_lm_hash,
+                                             old_lm_hash_enc.data);
+                       } else {
+                               new_lm_pswd.data = NULL;
+                               new_lm_pswd.length = 0;
+                               old_lm_hash_enc.data = NULL;
+                               old_lm_hash_enc.length = 0;
+                       }
+
+                       encode_pw_buffer(new_nt_pswd.data, newpswd,
+                                        STR_UNICODE);
+       
+                       SamOEMhash(new_nt_pswd.data, old_nt_hash, 516);
+                       E_old_pw_hash(new_nt_hash, old_nt_hash,
+                                     old_nt_hash_enc.data);
+               }
+               
+               if (!full_username && !username) {      
+                       x_fprintf(x_stdout, "Error: No username supplied!\n");
+               } else if ((!new_nt_pswd.data || !old_nt_hash_enc.data) &&
+                          (!new_lm_pswd.data || old_lm_hash_enc.data) ) {
+                       x_fprintf(x_stdout, "Error: No NT or LM password "
+                                 "blobs supplied!\n");
+               } else {
+                       char *error_string = NULL;
+                       
+                       if (full_username && !username) {
+                               fstring fstr_user;
+                               fstring fstr_domain;
+                               
+                               if (!parse_ntlm_auth_domain_user(full_username,
+                                                                fstr_user,
+                                                                fstr_domain)) {
+                                       /* username might be 'tainted', don't
+                                        * print into our new-line
+                                        * deleimianted stream */
+                                       x_fprintf(x_stdout, "Error: Could not "
+                                                 "parse into domain and "
+                                                 "username\n");
+                                       SAFE_FREE(username);
+                                       username = smb_xstrdup(full_username);
+                               } else {
+                                       SAFE_FREE(username);
+                                       SAFE_FREE(domain);
+                                       username = smb_xstrdup(fstr_user);
+                                       domain = smb_xstrdup(fstr_domain);
+                               }
+                               
+                       }
+
+                       if(!NT_STATUS_IS_OK(contact_winbind_change_pswd_auth_crap(
+                                                   username, domain,
+                                                   new_nt_pswd,
+                                                   old_nt_hash_enc,
+                                                   new_lm_pswd,
+                                                   old_lm_hash_enc,
+                                                   &error_string))) {
+                               x_fprintf(x_stdout, "Password-Change: No\n");
+                               x_fprintf(x_stdout, "Password-Change-Error: "
+                                         "%s\n.\n", error_string);
+                       } else {
+                               x_fprintf(x_stdout, "Password-Change: Yes\n");
+                       }
+
+                       SAFE_FREE(error_string);
+               }
+               /* clear out the state */
+               new_nt_pswd = data_blob_null;
+               old_nt_hash_enc = data_blob_null;
+               new_lm_pswd = data_blob_null;
+               old_nt_hash_enc = data_blob_null;
+               SAFE_FREE(full_username);
+               SAFE_FREE(username);
+               SAFE_FREE(domain);
+               SAFE_FREE(newpswd);
+               SAFE_FREE(oldpswd);
+               x_fprintf(x_stdout, ".\n");
+
+               return;
+       }
+
+       request = buf;
+
+       /* Indicates a base64 encoded structure */
+       parameter = strstr_m(request, ":: ");
+       if (!parameter) {
+               parameter = strstr_m(request, ": ");
+               
+               if (!parameter) {
+                       DEBUG(0, ("Parameter not found!\n"));
+                       x_fprintf(x_stdout, "Error: Parameter not found!\n.\n");
+                       return;
+               }
+               
+               parameter[0] ='\0';
+               parameter++;
+               parameter[0] ='\0';
+               parameter++;
+       } else {
+               parameter[0] ='\0';
+               parameter++;
+               parameter[0] ='\0';
+               parameter++;
+               parameter[0] ='\0';
+               parameter++;
+
+               base64_decode_inplace(parameter);
+       }
+
+       if (strequal(request, "new-nt-password-blob")) {
+               new_nt_pswd = strhex_to_data_blob(NULL, parameter);
+               if (new_nt_pswd.length != 516) {
+                       x_fprintf(x_stdout, "Error: hex decode of %s failed! "
+                                 "(got %d bytes, expected 516)\n.\n", 
+                                 parameter,
+                                 (int)new_nt_pswd.length);
+                       new_nt_pswd = data_blob_null;
+               }
+       } else if (strequal(request, "old-nt-hash-blob")) {
+               old_nt_hash_enc = strhex_to_data_blob(NULL, parameter);
+               if (old_nt_hash_enc.length != 16) {
+                       x_fprintf(x_stdout, "Error: hex decode of %s failed! "
+                                 "(got %d bytes, expected 16)\n.\n", 
+                                 parameter,
+                                 (int)old_nt_hash_enc.length);
+                       old_nt_hash_enc = data_blob_null;
+               }
+       } else if (strequal(request, "new-lm-password-blob")) {
+               new_lm_pswd = strhex_to_data_blob(NULL, parameter);
+               if (new_lm_pswd.length != 516) {
+                       x_fprintf(x_stdout, "Error: hex decode of %s failed! "
+                                 "(got %d bytes, expected 516)\n.\n", 
+                                 parameter,
+                                 (int)new_lm_pswd.length);
+                       new_lm_pswd = data_blob_null;
+               }
+       }
+       else if (strequal(request, "old-lm-hash-blob")) {
+               old_lm_hash_enc = strhex_to_data_blob(NULL, parameter);
+               if (old_lm_hash_enc.length != 16)
+               {
+                       x_fprintf(x_stdout, "Error: hex decode of %s failed! "
+                                 "(got %d bytes, expected 16)\n.\n", 
+                                 parameter,
+                                 (int)old_lm_hash_enc.length);
+                       old_lm_hash_enc = data_blob_null;
+               }
+       } else if (strequal(request, "nt-domain")) {
+               domain = smb_xstrdup(parameter);
+       } else if(strequal(request, "username")) {
+               username = smb_xstrdup(parameter);
+       } else if(strequal(request, "full-username")) {
+               username = smb_xstrdup(parameter);
+       } else if(strequal(request, "new-password")) {
+               newpswd = smb_xstrdup(parameter);
+       } else if (strequal(request, "old-password")) {
+               oldpswd = smb_xstrdup(parameter);
+       } else {
+               x_fprintf(x_stdout, "Error: Unknown request %s\n.\n", request);
+       }
+}
+
 static void manage_squid_request(enum stdio_helper_mode helper_mode, stdio_helper_function fn) 
 {
        char buf[SQUID_BUFFER_SIZE+1];
@@ -1091,12 +2054,16 @@ static void manage_squid_request(enum stdio_helper_mode helper_mode, stdio_helpe
 
        /* this is not a typo - x_fgets doesn't work too well under squid */
        if (fgets(buf, sizeof(buf)-1, stdin) == NULL) {
-               DEBUG(1, ("fgets() failed! dying..... errno=%d (%s)\n", ferror(stdin),
-                         strerror(ferror(stdin))));
-               exit(1);    /* BIIG buffer */
+               if (ferror(stdin)) {
+                       DEBUG(1, ("fgets() failed! dying..... errno=%d (%s)\n", ferror(stdin),
+                                 strerror(ferror(stdin))));
+                       
+                       exit(1);    /* BIIG buffer */
+               }
+               exit(0);
        }
     
-       c=memchr(buf,'\n',sizeof(buf)-1);
+       c=(char *)memchr(buf,'\n',sizeof(buf)-1);
        if (c) {
                *c = '\0';
                length = c-buf;
@@ -1140,9 +2107,9 @@ static BOOL check_auth_crap(void)
        NTSTATUS nt_status;
        uint32 flags = 0;
        char lm_key[8];
-       char nt_key[16];
+       char user_session_key[16];
        char *hex_lm_key;
-       char *hex_nt_key;
+       char *hex_user_session_key;
        char *error_string;
        static uint8 zeros[16];
 
@@ -1151,8 +2118,10 @@ static BOOL check_auth_crap(void)
        if (request_lm_key) 
                flags |= WBFLAG_PAM_LMKEY;
 
-       if (request_nt_key) 
-               flags |= WBFLAG_PAM_NTKEY;
+       if (request_user_session_key) 
+               flags |= WBFLAG_PAM_USER_SESSION_KEY;
+
+       flags |= WBFLAG_PAM_NT_STATUS_SQUASH;
 
        nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
                                              opt_workstation,
@@ -1161,8 +2130,8 @@ static BOOL check_auth_crap(void)
                                              &opt_nt_response, 
                                              flags,
                                              (unsigned char *)lm_key, 
-                                             (unsigned char *)nt_key, 
-                                             &error_string);
+                                             (unsigned char *)user_session_key, 
+                                             &error_string, NULL);
 
        if (!NT_STATUS_IS_OK(nt_status)) {
                x_fprintf(x_stdout, "%s (0x%x)\n", 
@@ -1175,783 +2144,40 @@ static BOOL check_auth_crap(void)
        if (request_lm_key 
            && (memcmp(zeros, lm_key, 
                       sizeof(lm_key)) != 0)) {
-               hex_encode((const unsigned char *)lm_key,
-                          sizeof(lm_key),
-                          &hex_lm_key);
+               hex_lm_key = hex_encode(NULL, (const unsigned char *)lm_key,
+                                       sizeof(lm_key));
                x_fprintf(x_stdout, "LM_KEY: %s\n", hex_lm_key);
-               SAFE_FREE(hex_lm_key);
+               TALLOC_FREE(hex_lm_key);
        }
-       if (request_nt_key 
-           && (memcmp(zeros, nt_key, 
-                      sizeof(nt_key)) != 0)) {
-               hex_encode((const unsigned char *)nt_key, 
-                          sizeof(nt_key), 
-                          &hex_nt_key);
-               x_fprintf(x_stdout, "NT_KEY: %s\n", hex_nt_key);
-               SAFE_FREE(hex_nt_key);
+       if (request_user_session_key 
+           && (memcmp(zeros, user_session_key, 
+                      sizeof(user_session_key)) != 0)) {
+               hex_user_session_key = hex_encode(NULL, (const unsigned char *)user_session_key, 
+                                                 sizeof(user_session_key));
+               x_fprintf(x_stdout, "NT_KEY: %s\n", hex_user_session_key);
+               TALLOC_FREE(hex_user_session_key);
        }
 
         return True;
 }
 
-/* 
-   Authenticate a user with a challenge/response, checking session key
-   and valid authentication types
-*/
+/* Main program */
 
-static DATA_BLOB get_challenge(void) 
-{
-       static DATA_BLOB chal;
-       if (opt_challenge.length)
-               return opt_challenge;
-       
-       chal = data_blob(NULL, 8);
-
-       generate_random_buffer(chal.data, chal.length, False);
-       return chal;
-}
-
-/* 
- * Test LM authentication, no NT response supplied
- */
-
-static BOOL test_lm(void) 
-{
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB lm_response = data_blob(NULL, 24);
-
-       uchar lm_key[8];
-       uchar nt_key[16];
-       uchar lm_hash[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-       
-       ZERO_STRUCT(lm_key);
-       ZERO_STRUCT(nt_key);
-
-       flags |= WBFLAG_PAM_LMKEY;
-       flags |= WBFLAG_PAM_NTKEY;
-
-       SMBencrypt(opt_password, chall.data, lm_response.data);
-       E_deshash(opt_password, lm_hash); 
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, opt_workstation,
-                                             &chall,
-                                             &lm_response,
-                                             NULL,
-                                             flags,
-                                             lm_key, 
-                                             nt_key,
-                                             &error_string);
-       
-       data_blob_free(&lm_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               return False;
-       }
-
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               DEBUG(1, ("LM Key does not match expectations!\n"));
-               DEBUG(1, ("lm_key:\n"));
-               dump_data(1, (const char *)lm_key, 8);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)lm_hash, 8);
-       }
-       if (memcmp(lm_hash, nt_key, 8) != 0) {
-               DEBUG(1, ("Session Key (first 8, lm hash) does not match expectations!\n"));
-               DEBUG(1, ("nt_key:\n"));
-               dump_data(1, (const char *)nt_key, 8);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)lm_hash, 8);
-       }
-        return True;
-}
-
-/* 
- * Test the normal 'LM and NTLM' combination
- */
-
-static BOOL test_lm_ntlm(void) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB lm_response = data_blob(NULL, 24);
-       DATA_BLOB nt_response = data_blob(NULL, 24);
-       DATA_BLOB session_key = data_blob(NULL, 16);
-
-       uchar lm_key[8];
-       uchar nt_key[16];
-       uchar lm_hash[16];
-       uchar nt_hash[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-       
-       ZERO_STRUCT(lm_key);
-       ZERO_STRUCT(nt_key);
-
-       flags |= WBFLAG_PAM_LMKEY;
-       flags |= WBFLAG_PAM_NTKEY;
-
-       SMBencrypt(opt_password,chall.data,lm_response.data);
-       E_deshash(opt_password, lm_hash); 
-
-       SMBNTencrypt(opt_password,chall.data,nt_response.data);
-
-       E_md4hash(opt_password, nt_hash);
-       SMBsesskeygen_ntv1(nt_hash, NULL, session_key.data);
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             &lm_response,
-                                             &nt_response,
-                                             flags,
-                                             lm_key, 
-                                             nt_key,
-                                             &error_string);
-       
-       data_blob_free(&lm_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               DEBUG(1, ("LM Key does not match expectations!\n"));
-               DEBUG(1, ("lm_key:\n"));
-               dump_data(1, (const char *)lm_key, 8);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)lm_hash, 8);
-               pass = False;
-       }
-       if (memcmp(session_key.data, nt_key, 
-                  sizeof(nt_key)) != 0) {
-               DEBUG(1, ("NT Session Key does not match expectations!\n"));
-               DEBUG(1, ("nt_key:\n"));
-               dump_data(1, (const char *)nt_key, 16);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)session_key.data, session_key.length);
-               pass = False;
-       }
-        return pass;
-}
-
-/* 
- * Test the NTLM response only, no LM.
- */
-
-static BOOL test_ntlm(void) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB nt_response = data_blob(NULL, 24);
-       DATA_BLOB session_key = data_blob(NULL, 16);
-
-       char lm_key[8];
-       char nt_key[16];
-       char lm_hash[16];
-       char nt_hash[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-       
-       ZERO_STRUCT(lm_key);
-       ZERO_STRUCT(nt_key);
-
-       flags |= WBFLAG_PAM_LMKEY;
-       flags |= WBFLAG_PAM_NTKEY;
-
-       SMBNTencrypt(opt_password,chall.data,nt_response.data);
-       E_md4hash(opt_password, (unsigned char *)nt_hash);
-       SMBsesskeygen_ntv1((const unsigned char *)nt_hash, NULL, session_key.data);
-
-       E_deshash(opt_password, (unsigned char *)lm_hash); 
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             NULL,
-                                             &nt_response,
-                                             flags,
-                                             (unsigned char *)lm_key,
-                                             (unsigned char *)nt_key,
-                                             &error_string);
-       
-       data_blob_free(&nt_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               DEBUG(1, ("LM Key does not match expectations!\n"));
-               DEBUG(1, ("lm_key:\n"));
-               dump_data(1, lm_key, 8);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, lm_hash, 8);
-               pass = False;
-       }
-       if (memcmp(session_key.data, nt_key, 
-                  sizeof(nt_key)) != 0) {
-               DEBUG(1, ("NT Session Key does not match expectations!\n"));
-               DEBUG(1, ("nt_key:\n"));
-               dump_data(1, nt_key, 16);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)session_key.data, session_key.length);
-               pass = False;
-       }
-        return pass;
-}
-
-/* 
- * Test the NTLM response only, but in the LM field.
- */
-
-static BOOL test_ntlm_in_lm(void) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB nt_response = data_blob(NULL, 24);
-
-       uchar lm_key[8];
-       uchar lm_hash[16];
-       uchar nt_key[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-       
-       ZERO_STRUCT(nt_key);
-
-       flags |= WBFLAG_PAM_LMKEY;
-       flags |= WBFLAG_PAM_NTKEY;
-
-       SMBNTencrypt(opt_password,chall.data,nt_response.data);
-
-       E_deshash(opt_password, lm_hash); 
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             &nt_response,
-                                             NULL,
-                                             flags,
-                                             lm_key,
-                                             nt_key,
-                                             &error_string);
-       
-       data_blob_free(&nt_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               DEBUG(1, ("LM Key does not match expectations!\n"));
-               DEBUG(1, ("lm_key:\n"));
-               dump_data(1, (const char *)lm_key, 8);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)lm_hash, 8);
-               pass = False;
-       }
-       if (memcmp(lm_hash, nt_key, 8) != 0) {
-               DEBUG(1, ("Session Key (first 8 lm hash) does not match expectations!\n"));
-               DEBUG(1, ("nt_key:\n"));
-               dump_data(1, (const char *)nt_key, 16);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)lm_hash, 8);
-               pass = False;
-       }
-        return pass;
-}
-
-/* 
- * Test the NTLM response only, but in the both the NT and LM fields.
- */
-
-static BOOL test_ntlm_in_both(void) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB nt_response = data_blob(NULL, 24);
-       DATA_BLOB session_key = data_blob(NULL, 16);
-
-       char lm_key[8];
-       char lm_hash[16];
-       char nt_key[16];
-       char nt_hash[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-       
-       ZERO_STRUCT(lm_key);
-       ZERO_STRUCT(nt_key);
-
-       flags |= WBFLAG_PAM_LMKEY;
-       flags |= WBFLAG_PAM_NTKEY;
-
-       SMBNTencrypt(opt_password,chall.data,nt_response.data);
-       E_md4hash(opt_password, (unsigned char *)nt_hash);
-       SMBsesskeygen_ntv1((const unsigned char *)nt_hash, NULL, session_key.data);
-
-       E_deshash(opt_password, (unsigned char *)lm_hash); 
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             &nt_response,
-                                             &nt_response,
-                                             flags,
-                                             (unsigned char *)lm_key,
-                                             (unsigned char *)nt_key,
-                                             &error_string);
-       
-       data_blob_free(&nt_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               DEBUG(1, ("LM Key does not match expectations!\n"));
-               DEBUG(1, ("lm_key:\n"));
-               dump_data(1, lm_key, 8);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, lm_hash, 8);
-               pass = False;
-       }
-       if (memcmp(session_key.data, nt_key, 
-                  sizeof(nt_key)) != 0) {
-               DEBUG(1, ("NT Session Key does not match expectations!\n"));
-               DEBUG(1, ("nt_key:\n"));
-               dump_data(1, nt_key, 16);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)session_key.data, session_key.length);
-               pass = False;
-       }
-
-
-        return pass;
-}
-
-/* 
- * Test the NTLMv2 response only
- */
-
-static BOOL test_ntlmv2(void) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB ntlmv2_response = data_blob(NULL, 0);
-       DATA_BLOB nt_session_key = data_blob(NULL, 0);
-       DATA_BLOB names_blob = NTLMv2_generate_names_blob(get_winbind_netbios_name(), get_winbind_domain());
-
-       uchar nt_key[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-
-       ZERO_STRUCT(nt_key);
-       
-       flags |= WBFLAG_PAM_NTKEY;
-
-       if (!SMBNTLMv2encrypt(opt_username, opt_domain, opt_password, &chall,
-                             &names_blob,
-                             NULL, &ntlmv2_response, 
-                             &nt_session_key)) {
-               data_blob_free(&names_blob);
-               return False;
-       }
-       data_blob_free(&names_blob);
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             NULL, 
-                                             &ntlmv2_response,
-                                             flags,
-                                             NULL, 
-                                             nt_key,
-                                             &error_string);
-       
-       data_blob_free(&ntlmv2_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-       if (memcmp(nt_session_key.data, nt_key, 
-                  sizeof(nt_key)) != 0) {
-               DEBUG(1, ("NT Session Key does not match expectations!\n"));
-               DEBUG(1, ("nt_key:\n"));
-               dump_data(1, (const char *)nt_key, 16);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)nt_session_key.data, nt_session_key.length);
-               pass = False;
-       }
-        return pass;
-}
-
-/* 
- * Test the NTLMv2 and LMv2 responses
- */
-
-static BOOL test_lmv2_ntlmv2(void) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB ntlmv2_response = data_blob(NULL, 0);
-       DATA_BLOB lmv2_response = data_blob(NULL, 0);
-       DATA_BLOB nt_session_key = data_blob(NULL, 0);
-       DATA_BLOB names_blob = NTLMv2_generate_names_blob(get_winbind_netbios_name(), get_winbind_domain());
-
-       uchar nt_key[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-
-       ZERO_STRUCT(nt_key);
-       
-       flags |= WBFLAG_PAM_NTKEY;
-
-       if (!SMBNTLMv2encrypt(opt_username, opt_domain, opt_password, &chall,
-                             &names_blob,
-                             &lmv2_response, &ntlmv2_response, 
-                             &nt_session_key)) {
-               data_blob_free(&names_blob);
-               return False;
-       }
-       data_blob_free(&names_blob);
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             &lmv2_response,
-                                             &ntlmv2_response,
-                                             flags,
-                                             NULL, 
-                                             nt_key,
-                                             &error_string);
-       
-       data_blob_free(&lmv2_response);
-       data_blob_free(&ntlmv2_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-       if (memcmp(nt_session_key.data, nt_key, 
-                  sizeof(nt_key)) != 0) {
-               DEBUG(1, ("NT Session Key does not match expectations!\n"));
-               DEBUG(1, ("nt_key:\n"));
-               dump_data(1, (const char *)nt_key, 16);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)nt_session_key.data, nt_session_key.length);
-               pass = False;
-       }
-        return pass;
-}
-
-/* 
- * Test the LMv2 response only
- */
-
-static BOOL test_lmv2(void) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB lmv2_response = data_blob(NULL, 0);
-
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-
-       if (!SMBNTLMv2encrypt(opt_username, opt_domain, opt_password, &chall,
-                             NULL, 
-                             &lmv2_response, NULL,
-                             NULL)) {
-               return False;
-       }
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             &lmv2_response,
-                                             NULL, 
-                                             flags,
-                                             NULL, 
-                                             NULL,
-                                             &error_string);
-       
-       data_blob_free(&lmv2_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-        return pass;
-}
-
-/* 
- * Test the normal 'LM and NTLM' combination but deliberately break one
- */
-
-static BOOL test_ntlm_broken(BOOL break_lm) 
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB lm_response = data_blob(NULL, 24);
-       DATA_BLOB nt_response = data_blob(NULL, 24);
-       DATA_BLOB session_key = data_blob(NULL, 16);
-
-       uchar lm_key[8];
-       uchar nt_key[16];
-       uchar lm_hash[16];
-       uchar nt_hash[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-       
-       ZERO_STRUCT(lm_key);
-       ZERO_STRUCT(nt_key);
-
-       flags |= WBFLAG_PAM_LMKEY;
-       flags |= WBFLAG_PAM_NTKEY;
-
-       SMBencrypt(opt_password,chall.data,lm_response.data);
-       E_deshash(opt_password, lm_hash); 
-
-       SMBNTencrypt(opt_password,chall.data,nt_response.data);
-
-       E_md4hash(opt_password, nt_hash);
-       SMBsesskeygen_ntv1(nt_hash, NULL, session_key.data);
-
-       if (break_lm)
-               lm_response.data[0]++;
-       else
-               nt_response.data[0]++;
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             &lm_response,
-                                             &nt_response,
-                                             flags,
-                                             lm_key, 
-                                             nt_key,
-                                             &error_string);
-       
-       data_blob_free(&lm_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-       if (memcmp(lm_hash, lm_key, 
-                  sizeof(lm_key)) != 0) {
-               DEBUG(1, ("LM Key does not match expectations!\n"));
-               DEBUG(1, ("lm_key:\n"));
-               dump_data(1, (const char *)lm_key, 8);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)lm_hash, 8);
-               pass = False;
-       }
-       if (memcmp(session_key.data, nt_key, 
-                  sizeof(nt_key)) != 0) {
-               DEBUG(1, ("NT Session Key does not match expectations!\n"));
-               DEBUG(1, ("nt_key:\n"));
-               dump_data(1, (const char *)nt_key, 16);
-               DEBUG(1, ("expected:\n"));
-               dump_data(1, (const char *)session_key.data, session_key.length);
-               pass = False;
-       }
-        return pass;
-}
-
-static BOOL test_ntlm_lm_broken(void) 
-{
-       return test_ntlm_broken(True);
-}
-
-static BOOL test_ntlm_ntlm_broken(void) 
-{
-       return test_ntlm_broken(False);
-}
-
-static BOOL test_ntlmv2_broken(BOOL break_lmv2)
-{
-       BOOL pass = True;
-       NTSTATUS nt_status;
-       uint32 flags = 0;
-       DATA_BLOB ntlmv2_response = data_blob(NULL, 0);
-       DATA_BLOB lmv2_response = data_blob(NULL, 0);
-       DATA_BLOB nt_session_key = data_blob(NULL, 0);
-       DATA_BLOB names_blob = NTLMv2_generate_names_blob(get_winbind_netbios_name(), get_winbind_domain());
-
-       uchar nt_key[16];
-       DATA_BLOB chall = get_challenge();
-       char *error_string;
-
-       ZERO_STRUCT(nt_key);
-       
-       flags |= WBFLAG_PAM_NTKEY;
-        
-       if (!SMBNTLMv2encrypt(opt_username, opt_domain, opt_password, &chall,
-                             &names_blob,
-                             &lmv2_response, &ntlmv2_response, 
-                             &nt_session_key)) {
-               data_blob_free(&names_blob);
-               return False;
-       }
-       data_blob_free(&names_blob);
-
-       /* Heh - this should break the appropriate password hash nicely! */
-
-       if (break_lmv2)
-               lmv2_response.data[0]++;
-       else
-               ntlmv2_response.data[0]++;
-
-       nt_status = contact_winbind_auth_crap(opt_username, opt_domain, 
-                                             opt_workstation,
-                                             &chall,
-                                             &lmv2_response,
-                                             &ntlmv2_response,
-                                             flags,
-                                             NULL,
-                                             nt_key,
-                                             &error_string);
-       
-       data_blob_free(&lmv2_response);
-       data_blob_free(&ntlmv2_response);
-
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               d_printf("%s (0x%x)\n", 
-                        error_string,
-                        NT_STATUS_V(nt_status));
-               SAFE_FREE(error_string);
-               return False;
-       }
-
-        return pass;
-}
-
-static BOOL test_ntlmv2_lmv2_broken(void) 
-{
-       return test_ntlmv2_broken(True);
-}
-
-static BOOL test_ntlmv2_ntlmv2_broken(void) 
-{
-       return test_ntlmv2_broken(False);
-}
-
-/* 
-   Tests:
-   
-   - LM only
-   - NT and LM            
-   - NT
-   - NT in LM field
-   - NT in both fields
-   - NTLMv2
-   - NTLMv2 and LMv2
-   - LMv2
-   
-   check we get the correct session key in each case
-   check what values we get for the LM session key
-   
-*/
-
-struct ntlm_tests {
-       BOOL (*fn)(void);
-       const char *name;
-} test_table[] = {
-       {test_lm, "LM"},
-       {test_lm_ntlm, "LM and NTLM"},
-       {test_ntlm, "NTLM"},
-       {test_ntlm_in_lm, "NTLM in LM"},
-       {test_ntlm_in_both, "NTLM in both"},
-       {test_ntlmv2, "NTLMv2"},
-       {test_lmv2_ntlmv2, "NTLMv2 and LMv2"},
-       {test_lmv2, "LMv2"},
-       {test_ntlmv2_lmv2_broken, "NTLMv2 and LMv2, LMv2 broken"},
-       {test_ntlmv2_ntlmv2_broken, "NTLMv2 and LMv2, NTLMv2 broken"},
-       {test_ntlm_lm_broken, "NTLM and LM, LM broken"},
-       {test_ntlm_ntlm_broken, "NTLM and LM, NTLM broken"}
-};
-
-static BOOL diagnose_ntlm_auth(void)
-{
-       unsigned int i;
-       BOOL pass = True;
-
-       for (i=0; test_table[i].fn; i++) {
-               if (!test_table[i].fn()) {
-                       DEBUG(1, ("Test %s failed!\n", test_table[i].name));
-                       pass = False;
-               }
-       }
-
-        return pass;
-}
-
-/* Main program */
-
-enum {
-       OPT_USERNAME = 1000,
-       OPT_DOMAIN,
-       OPT_WORKSTATION,
-       OPT_CHALLENGE,
-       OPT_RESPONSE,
-       OPT_LM,
-       OPT_NT,
-       OPT_PASSWORD,
-       OPT_LM_KEY,
-       OPT_NT_KEY,
-       OPT_DIAGNOSTICS
-};
+enum {
+       OPT_USERNAME = 1000,
+       OPT_DOMAIN,
+       OPT_WORKSTATION,
+       OPT_CHALLENGE,
+       OPT_RESPONSE,
+       OPT_LM,
+       OPT_NT,
+       OPT_PASSWORD,
+       OPT_LM_KEY,
+       OPT_USER_SESSION_KEY,
+       OPT_DIAGNOSTICS,
+       OPT_REQUIRE_MEMBERSHIP,
+       OPT_USE_CACHED_CREDS
+};
 
  int main(int argc, const char **argv)
 {
@@ -1962,12 +2188,6 @@ enum {
        static const char *hex_challenge;
        static const char *hex_lm_response;
        static const char *hex_nt_response;
-       char *challenge;
-       char *lm_response;
-       char *nt_response;
-       size_t challenge_len;
-       size_t lm_response_len;
-       size_t nt_response_len;
 
        poptContext pc;
 
@@ -1989,21 +2209,24 @@ enum {
                { "lm-response", 0, POPT_ARG_STRING, &hex_lm_response, OPT_LM, "LM Response to the challenge (HEX encoded)"},
                { "nt-response", 0, POPT_ARG_STRING, &hex_nt_response, OPT_NT, "NT or NTLMv2 Response to the challenge (HEX encoded)"},
                { "password", 0, POPT_ARG_STRING, &opt_password, OPT_PASSWORD, "User's plaintext password"},            
-               { "request-lm-key", 0, POPT_ARG_NONE, &request_lm_key, OPT_LM_KEY, "Retreive LM session key"},
-               { "request-nt-key", 0, POPT_ARG_NONE, &request_nt_key, OPT_NT_KEY, "Retreive NT session key"},
+               { "request-lm-key", 0, POPT_ARG_NONE, &request_lm_key, OPT_LM_KEY, "Retrieve LM session key"},
+               { "request-nt-key", 0, POPT_ARG_NONE, &request_user_session_key, OPT_USER_SESSION_KEY, "Retrieve User (NT) session key"},
+               { "use-cached-creds", 0, POPT_ARG_NONE, &use_cached_creds, OPT_USE_CACHED_CREDS, "Use cached credentials if no password is given"},
                { "diagnostics", 0, POPT_ARG_NONE, &diagnostics, OPT_DIAGNOSTICS, "Perform diagnostics on the authentictaion chain"},
+               { "require-membership-of", 0, POPT_ARG_STRING, &require_membership_of, OPT_REQUIRE_MEMBERSHIP, "Require that a user be a member of this group (either name or SID) for authentication to succeed" },
                POPT_COMMON_SAMBA
                POPT_TABLEEND
        };
 
        /* Samba client initialisation */
+       load_case_tables();
 
        dbf = x_stderr;
        
        /* Samba client initialisation */
 
-       if (!lp_load(dyn_CONFIGFILE, True, False, False)) {
-               d_fprintf(stderr, "wbinfo: error opening config file %s. Error was %s\n",
+       if (!lp_load(dyn_CONFIGFILE, True, False, False, True)) {
+               d_fprintf(stderr, "ntlm_auth: error opening config file %s. Error was %s\n",
                        dyn_CONFIGFILE, strerror(errno));
                exit(1);
        }
@@ -2025,44 +2248,70 @@ enum {
        while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_CHALLENGE:
-                       challenge = smb_xmalloc((strlen(hex_challenge))/2+1);
-                       if ((challenge_len = strhex_to_str(challenge, 
-                                                          strlen(hex_challenge), 
-                                                          hex_challenge)) != 8) {
-                               x_fprintf(x_stderr, "hex decode of %s failed (only got %lu bytes)!\n", 
-                                       hex_challenge, (unsigned long)challenge_len);
+                       opt_challenge = strhex_to_data_blob(NULL, hex_challenge);
+                       if (opt_challenge.length != 8) {
+                               x_fprintf(x_stderr, "hex decode of %s failed! (only got %d bytes)\n", 
+                                         hex_challenge,
+                                         (int)opt_challenge.length);
                                exit(1);
                        }
-                       opt_challenge = data_blob(challenge, challenge_len);
-                       SAFE_FREE(challenge);
                        break;
                case OPT_LM: 
-                       lm_response = smb_xmalloc((strlen(hex_lm_response))/2+1);
-                       lm_response_len = strhex_to_str(lm_response,    
-                                                       strlen(hex_lm_response), 
-                                                       hex_lm_response);
-                       if (lm_response_len != 24) {
-                               x_fprintf(x_stderr, "hex decode of %s failed!\n", hex_lm_response);
+                       opt_lm_response = strhex_to_data_blob(NULL, hex_lm_response);
+                       if (opt_lm_response.length != 24) {
+                               x_fprintf(x_stderr, "hex decode of %s failed! (only got %d bytes)\n", 
+                                         hex_lm_response,
+                                         (int)opt_lm_response.length);
                                exit(1);
                        }
-                       opt_lm_response = data_blob(lm_response, lm_response_len);
-                       SAFE_FREE(lm_response);
                        break;
+
                case OPT_NT: 
-                       nt_response = smb_xmalloc((strlen(hex_nt_response)+2)/2+1);
-                       nt_response_len = strhex_to_str(nt_response, 
-                                                       strlen(hex_nt_response), 
-                                                       hex_nt_response);
-                       if (nt_response_len < 24) {
-                               x_fprintf(x_stderr, "hex decode of %s failed!\n", hex_nt_response);
+                       opt_nt_response = strhex_to_data_blob(NULL, hex_nt_response);
+                       if (opt_nt_response.length < 24) {
+                               x_fprintf(x_stderr, "hex decode of %s failed! (only got %d bytes)\n", 
+                                         hex_nt_response,
+                                         (int)opt_nt_response.length);
                                exit(1);
                        }
-                       opt_nt_response = data_blob(nt_response, nt_response_len);
-                       SAFE_FREE(nt_response);
                        break;
+
+                case OPT_REQUIRE_MEMBERSHIP:
+                       if (StrnCaseCmp("S-", require_membership_of, 2) == 0) {
+                               require_membership_of_sid = require_membership_of;
+                       }
+                       break;
+               }
+       }
+
+       if (opt_username) {
+               char *domain = SMB_STRDUP(opt_username);
+               char *p = strchr_m(domain, *lp_winbind_separator());
+               if (p) {
+                       opt_username = p+1;
+                       *p = '\0';
+                       if (opt_domain && !strequal(opt_domain, domain)) {
+                               x_fprintf(x_stderr, "Domain specified in username (%s) "
+                                       "doesn't match specified domain (%s)!\n\n",
+                                       domain, opt_domain);
+                               poptPrintHelp(pc, stderr, 0);
+                               exit(1);
+                       }
+                       opt_domain = domain;
+               } else {
+                       SAFE_FREE(domain);
                }
        }
 
+       /* Note: if opt_domain is "" then send no domain */
+       if (opt_domain == NULL) {
+               opt_domain = get_winbind_domain();
+       }
+
+       if (opt_workstation == NULL) {
+               opt_workstation = "";
+       }
+
        if (helper_protocol) {
                int i;
                for (i=0; i<NUM_HELPER_MODES; i++) {
@@ -2071,24 +2320,21 @@ enum {
                                exit(0);
                        }
                }
-               x_fprintf(x_stderr, "unknown helper protocol [%s]\n", helper_protocol);
+               x_fprintf(x_stderr, "unknown helper protocol [%s]\n\nValid helper protools:\n\n", helper_protocol);
+
+               for (i=0; i<NUM_HELPER_MODES; i++) {
+                       x_fprintf(x_stderr, "%s\n", stdio_helper_protocols[i].name);
+               }
+
                exit(1);
        }
 
-       if (!opt_username) {
+       if (!opt_username || !*opt_username) {
                x_fprintf(x_stderr, "username must be specified!\n\n");
                poptPrintHelp(pc, stderr, 0);
                exit(1);
        }
 
-       if (opt_domain == NULL) {
-               opt_domain = get_winbind_domain();
-       }
-
-       if (opt_workstation == NULL) {
-               opt_workstation = "";
-       }
-
        if (opt_challenge.length) {
                if (!check_auth_crap()) {
                        exit(1);
@@ -2102,14 +2348,14 @@ enum {
 
        if (diagnostics) {
                if (!diagnose_ntlm_auth()) {
-                       exit(1);
+                       return 1;
                }
        } else {
                fstring user;
 
                fstr_sprintf(user, "%s%c%s", opt_domain, winbind_separator(), opt_username);
                if (!check_plaintext_auth(user, opt_password, True)) {
-                       exit(1);
+                       return 1;
                }
        }