More printf portability fixes. Got caught out by some gcc'isms last
[tprouty/samba.git] / source / auth / auth_sam.c
index 26b9001bf6383fbf0f0aa48e057628352cd9b602..fb66d53cd4fee0bd8d4df8a00444a5c70c82ed50 100644 (file)
@@ -1,10 +1,10 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    Password and authentication handling
    Copyright (C) Andrew Tridgell              1992-2000
    Copyright (C) Luke Kenneth Casson Leighton 1996-2000
    Copyright (C) Andrew Bartlett              2001
+   Copyright (C) Gerald Carter                2003
    
    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
 
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
+
 /****************************************************************************
 core of smb password checking routine.
 ****************************************************************************/
-static BOOL smb_pwd_check_ntlmv1(const uchar *password,
-                               const uchar *part_passwd,
-                               const uchar *c8,
-                               char user_sess_key[16])
+static BOOL smb_pwd_check_ntlmv1(const DATA_BLOB *nt_response,
+                                const uchar *part_passwd,
+                                const DATA_BLOB *sec_blob,
+                                uint8 user_sess_key[16])
 {
-  /* Finish the encryption of part_passwd. */
-  uchar p24[24];
-
-  if (part_passwd == NULL) {
-         DEBUG(10,("No password set - DISALLOWING access\n"));
-         /* No password set - always false ! */
-         return False;
-  }
+       /* Finish the encryption of part_passwd. */
+       uchar p24[24];
+       
+       if (part_passwd == NULL) {
+               DEBUG(10,("No password set - DISALLOWING access\n"));
+               /* No password set - always false ! */
+               return False;
+       }
+       
+       if (sec_blob->length != 8) {
+               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect challenge size (%lu)\n", (unsigned long)sec_blob->length));
+               return False;
+       }
+       
+       if (nt_response->length != 24) {
+               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect password length (%lu)\n", (unsigned long)nt_response->length));
+               return False;
+       }
 
-  SMBOWFencrypt(part_passwd, c8, p24);
+       SMBOWFencrypt(part_passwd, sec_blob->data, p24);
        if (user_sess_key != NULL)
        {
                SMBsesskeygen_ntv1(part_passwd, NULL, user_sess_key);
        }
-
-
-
+       
+       
+       
 #if DEBUG_PASSWORD
-       DEBUG(100,("Part password (P16) was |"));
+       DEBUG(100,("Part password (P16) was |\n"));
        dump_data(100, part_passwd, 16);
-       DEBUG(100,("Password from client was |"));
-       dump_data(100, password, 24);
-       DEBUG(100,("Given challenge was |"));
-       dump_data(100, c8, 8);
-       DEBUG(100,("Value from encryption was |"));
+       DEBUGADD(100,("Password from client was |\n"));
+       dump_data(100, nt_response->data, nt_response->length);
+       DEBUGADD(100,("Given challenge was |\n"));
+       dump_data(100, sec_blob->data, sec_blob->length);
+       DEBUGADD(100,("Value from encryption was |\n"));
        dump_data(100, p24, 24);
 #endif
-  return (memcmp(p24, password, 24) == 0);
+  return (memcmp(p24, nt_response->data, 24) == 0);
 }
 
+
 /****************************************************************************
-core of smb password checking routine.
+core of smb password checking routine. (NTLMv2, LMv2)
+
+Note:  The same code works with both NTLMv2 and LMv2.
 ****************************************************************************/
-static BOOL smb_pwd_check_ntlmv2(const uchar *password, size_t pwd_len,
-                               uchar *part_passwd,
-                               uchar const *c8,
-                               const char *user, const char *domain,
-                               char user_sess_key[16])
+static BOOL smb_pwd_check_ntlmv2(const DATA_BLOB *ntv2_response,
+                                const uchar *part_passwd,
+                                const DATA_BLOB *sec_blob,
+                                const char *user, const char *domain,
+                                uint8 user_sess_key[16])
 {
        /* Finish the encryption of part_passwd. */
        uchar kr[16];
-       uchar resp[16];
+       uchar value_from_encryption[16];
+       uchar client_response[16];
+       DATA_BLOB client_key_data;
 
        if (part_passwd == NULL)
        {
@@ -81,25 +99,47 @@ static BOOL smb_pwd_check_ntlmv2(const uchar *password, size_t pwd_len,
                return False;
        }
 
-       ntv2_owf_gen(part_passwd, user, domain, kr);
-       SMBOWFencrypt_ntv2(kr, c8, 8, password+16, pwd_len-16, (char *)resp);
+       if (ntv2_response->length < 24) {
+               /* We MUST have more than 16 bytes, or the stuff below will go
+                  crazy.  No known implementation sends less than the 24 bytes
+                  for LMv2, let alone NTLMv2. */
+               DEBUG(0, ("smb_pwd_check_ntlmv2: incorrect password length (%lu)\n", 
+                         (unsigned long)ntv2_response->length));
+               return False;
+       }
+
+       client_key_data = data_blob(ntv2_response->data+16, ntv2_response->length-16);
+       /* 
+          todo:  should we be checking this for anything?  We can't for LMv2, 
+          but for NTLMv2 it is meant to contain the current time etc.
+       */
+
+       memcpy(client_response, ntv2_response->data, sizeof(client_response));
+
+       if (!ntv2_owf_gen(part_passwd, user, domain, kr)) {
+               return False;
+       }
+
+       SMBOWFencrypt_ntv2(kr, sec_blob, &client_key_data, value_from_encryption);
        if (user_sess_key != NULL)
        {
-               SMBsesskeygen_ntv2(kr, resp, user_sess_key);
+               SMBsesskeygen_ntv2(kr, value_from_encryption, user_sess_key);
        }
 
 #if DEBUG_PASSWORD
-       DEBUG(100,("Part password (P16) was |"));
+       DEBUG(100,("Part password (P16) was |\n"));
        dump_data(100, part_passwd, 16);
-       DEBUG(100,("Password from client was |"));
-       dump_data(100, password, pwd_len);
-       DEBUG(100,("Given challenge was |"));
-       dump_data(100, c8, 8);
-       DEBUG(100,("Value from encryption was |"));
-       dump_data(100, resp, 16);
+       DEBUGADD(100,("Password from client was |\n"));
+       dump_data(100, ntv2_response->data, ntv2_response->length);
+       DEBUGADD(100,("Variable data from client was |\n"));
+       dump_data(100, client_key_data.data, client_key_data.length);
+       DEBUGADD(100,("Given challenge was |\n"));
+       dump_data(100, sec_blob->data, sec_blob->length);
+       DEBUGADD(100,("Value from encryption was |\n"));
+       dump_data(100, value_from_encryption, 16);
 #endif
-
-       return (memcmp(resp, password, 16) == 0);
+       data_blob_clear_free(&client_key_data);
+       return (memcmp(value_from_encryption, client_response, 16) == 0);
 }
 
 
@@ -107,106 +147,185 @@ static BOOL smb_pwd_check_ntlmv2(const uchar *password, size_t pwd_len,
  Do a specific test for an smb password being correct, given a smb_password and
  the lanman and NT responses.
 ****************************************************************************/
-NTSTATUS sam_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_info, char user_sess_key[16])
+static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
+                               TALLOC_CTX *mem_ctx,
+                               SAM_ACCOUNT *sampass, 
+                               const auth_usersupplied_info *user_info, 
+                               uint8 user_sess_key[16])
 {
-       uint8 *nt_pw, *lm_pw;
-       uint16  acct_ctrl = pdb_get_acct_ctrl(sampass);
-       
-       if (!user_info || !sampass) 
-               return NT_STATUS_LOGON_FAILURE;
+       uint16 acct_ctrl;
+       const uint8 *nt_pw, *lm_pw;
+       uint32 auth_flags;
 
+       acct_ctrl = pdb_get_acct_ctrl(sampass);
        if (acct_ctrl & ACB_PWNOTREQ) 
        {
                if (lp_null_passwords()) 
                {
-                       DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", sampass->username));
+                       DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", pdb_get_username(sampass)));
                        return(NT_STATUS_OK);
                } 
                else 
                {
-                       DEBUG(3,("Account for user '%s' has no password and null passwords are NOT allowed.\n", sampass->username));
+                       DEBUG(3,("Account for user '%s' has no password and null passwords are NOT allowed.\n", pdb_get_username(sampass)));
                        return(NT_STATUS_LOGON_FAILURE);
                }               
        }
 
-       nt_pw = pdb_get_nt_passwd(sampass);
-       lm_pw = pdb_get_lanman_passwd(sampass);
+       auth_flags = user_info->auth_flags;
+
+       if (IS_SAM_DEFAULT(sampass, PDB_NTPASSWD)) {
+               DEBUG(3,("sam_password_ok: NO NT password stored for user %s.\n", 
+                        pdb_get_username(sampass)));
+               /* No return, we want to check the LM hash below in this case */
+               auth_flags &= (~(AUTH_FLAG_NTLMv2_RESP |  AUTH_FLAG_NTLM_RESP));
+       }
        
-       if (nt_pw != NULL && user_info->nt_resp.len > 0) {
-               if ((user_info->nt_resp.len > 24 )) {
+       if (auth_flags & AUTH_FLAG_NTLMv2_RESP) {
+               nt_pw = pdb_get_nt_passwd(sampass);
+               /* We have the NT MD4 hash challenge available - see if we can
+                  use it (ie. does it exist in the smbpasswd file).
+               */
+               DEBUG(4,("sam_password_ok: Checking NTLMv2 password with domain [%s]\n", user_info->client_domain.str));
+               if (smb_pwd_check_ntlmv2( &user_info->nt_resp, 
+                                         nt_pw, &auth_context->challenge, 
+                                         user_info->smb_name.str, 
+                                         user_info->client_domain.str,
+                                         user_sess_key))
+               {
+                       return NT_STATUS_OK;
+               }
+
+               DEBUG(4,("sam_password_ok: Checking NTLMv2 password without a domain\n"));
+               if (smb_pwd_check_ntlmv2( &user_info->nt_resp, 
+                                         nt_pw, &auth_context->challenge, 
+                                         user_info->smb_name.str, 
+                                         "",
+                                         user_sess_key))
+                   
+               {
+                       return NT_STATUS_OK;
+               } else {
+                       DEBUG(3,("sam_password_ok: NTLMv2 password check failed\n"));
+                       return NT_STATUS_WRONG_PASSWORD;
+               }
+       } else if (auth_flags & AUTH_FLAG_NTLM_RESP) {
+               if (lp_ntlm_auth()) {           
+                       nt_pw = pdb_get_nt_passwd(sampass);
                        /* We have the NT MD4 hash challenge available - see if we can
                           use it (ie. does it exist in the smbpasswd file).
                        */
-                       DEBUG(4,("smb_password_ok: Checking NTLMv2 password\n"));
-                       if (smb_pwd_check_ntlmv2( user_info->nt_resp.buffer, 
-                                                 user_info->nt_resp.len, 
-                                                 nt_pw, 
-                                                 user_info->chal, user_info->smb_username.str, 
-                                                 user_info->requested_domain.str,
-                                                 user_sess_key))
+                       DEBUG(4,("sam_password_ok: Checking NT MD4 password\n"));
+                       if (smb_pwd_check_ntlmv1(&user_info->nt_resp, 
+                                                nt_pw, &auth_context->challenge,
+                                                user_sess_key)) 
                        {
                                return NT_STATUS_OK;
                        } else {
-                               DEBUG(4,("smb_password_ok: NTLMv2 password check failed\n"));
-                                       return NT_STATUS_WRONG_PASSWORD;
+                               DEBUG(3,("sam_password_ok: NT MD4 password check failed for user %s\n",pdb_get_username(sampass)));
+                               return NT_STATUS_WRONG_PASSWORD;
                        }
-                               
-               } else if (lp_ntlm_auth() && (user_info->nt_resp.len == 24)) {
-                               /* We have the NT MD4 hash challenge available - see if we can
-                                  use it (ie. does it exist in the smbpasswd file).
-                               */
-                       DEBUG(4,("smb_password_ok: Checking NT MD4 password\n"));
-                       if (smb_pwd_check_ntlmv1(user_info->nt_resp.buffer, 
-                                                nt_pw, user_info->chal,
+               } else {
+                       DEBUG(2,("sam_password_ok: NTLMv1 passwords NOT PERMITTED for user %s\n",pdb_get_username(sampass)));                   
+                       /* no return, becouse we might pick up LMv2 in the LM field */
+               }
+       }
+       
+       if (auth_flags & AUTH_FLAG_LM_RESP) {
+               if (user_info->lm_resp.length != 24) {
+                       DEBUG(2,("sam_password_ok: invalid LanMan password length (%lu) for user %s\n", 
+                                (unsigned long)user_info->nt_resp.length, pdb_get_username(sampass)));         
+               }
+               
+               if (!lp_lanman_auth()) {
+                       DEBUG(3,("sam_password_ok: Lanman passwords NOT PERMITTED for user %s\n",pdb_get_username(sampass)));
+               } else if (IS_SAM_DEFAULT(sampass, PDB_LMPASSWD)) {
+                       DEBUG(3,("sam_password_ok: NO LanMan password set for user %s (and no NT password supplied)\n",pdb_get_username(sampass)));
+               } else {
+                       lm_pw = pdb_get_lanman_passwd(sampass);
+                       
+                       DEBUG(4,("sam_password_ok: Checking LM password\n"));
+                       if (smb_pwd_check_ntlmv1(&user_info->lm_resp, 
+                                                lm_pw, &auth_context->challenge,
                                                 user_sess_key)) 
                        {
                                return NT_STATUS_OK;
-                       } else {
-                               DEBUG(4,("smb_password_ok: NT MD4 password check failed\n"));
-                               return NT_STATUS_WRONG_PASSWORD;
                        }
-               } else {
-                       return NT_STATUS_LOGON_FAILURE;
                }
-       } 
 
-       if (lm_pw != NULL && user_info->lm_resp.len == 24) {
-               if (lp_lanman_auth()) {
-                       DEBUG(4,("smb_password_ok: Checking LM password\n"));
-                       if (smb_pwd_check_ntlmv1(user_info->lm_resp.buffer, 
-                                                lm_pw, user_info->chal,
+               if (IS_SAM_DEFAULT(sampass, PDB_NTPASSWD)) {
+                       DEBUG(4,("sam_password_ok: LM password check failed for user, no NT password %s\n",pdb_get_username(sampass)));
+                       return NT_STATUS_WRONG_PASSWORD;
+               } 
+               
+               nt_pw = pdb_get_nt_passwd(sampass);
+
+               /* This is for 'LMv2' authentication.  almost NTLMv2 but limited to 24 bytes.
+                  - related to Win9X, legacy NAS pass-though authentication
+               */
+               DEBUG(4,("sam_password_ok: Checking LMv2 password with domain %s\n", user_info->client_domain.str));
+               if (smb_pwd_check_ntlmv2( &user_info->lm_resp, 
+                                         nt_pw, &auth_context->challenge, 
+                                         user_info->smb_name.str, 
+                                         user_info->client_domain.str,
+                                         user_sess_key))
+               {
+                       return NT_STATUS_OK;
+               }
+
+               DEBUG(4,("sam_password_ok: Checking LMv2 password without a domain\n"));
+               if (smb_pwd_check_ntlmv2( &user_info->lm_resp, 
+                                         nt_pw, &auth_context->challenge, 
+                                         user_info->smb_name.str, 
+                                         "",
+                                         user_sess_key))
+               {
+                       return NT_STATUS_OK;
+               }
+
+               /* Apparently NT accepts NT responses in the LM field
+                  - I think this is related to Win9X pass-though authentication
+               */
+               DEBUG(4,("sam_password_ok: Checking NT MD4 password in LM field\n"));
+               if (lp_ntlm_auth()) 
+               {
+                       if (smb_pwd_check_ntlmv1(&user_info->lm_resp, 
+                                                nt_pw, &auth_context->challenge,
                                                 user_sess_key)) 
                        {
                                return NT_STATUS_OK;
-                       } else {
-                               DEBUG(4,("smb_password_ok: LM password check failed\n"));
-                               return NT_STATUS_WRONG_PASSWORD;
-                       }       
+                       }
+                       DEBUG(3,("sam_password_ok: LM password, NT MD4 password in LM field and LMv2 failed for user %s\n",pdb_get_username(sampass)));
+                       return NT_STATUS_WRONG_PASSWORD;
+               } else {
+                       DEBUG(3,("sam_password_ok: LM password and LMv2 failed for user %s, and NT MD4 password in LM field not permitted\n",pdb_get_username(sampass)));
+                       return NT_STATUS_WRONG_PASSWORD;
                }
+                       
        }
-
-       /* Should not be reached */
-       return NT_STATUS_LOGON_FAILURE;
+               
+       /* Should not be reached, but if they send nothing... */
+       DEBUG(3,("sam_password_ok: NEITHER LanMan nor NT password supplied for user %s\n",pdb_get_username(sampass)));
+       return NT_STATUS_WRONG_PASSWORD;
 }
 
 /****************************************************************************
  Do a specific test for a SAM_ACCOUNT being vaild for this connection 
  (ie not disabled, expired and the like).
 ****************************************************************************/
-NTSTATUS sam_account_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_info)
+static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
+                              SAM_ACCOUNT *sampass, 
+                              const auth_usersupplied_info *user_info)
 {
        uint16  acct_ctrl = pdb_get_acct_ctrl(sampass);
        char *workstation_list;
        time_t kickoff_time;
        
-       if (!user_info || !sampass) 
-               return NT_STATUS_LOGON_FAILURE;
-
-       DEBUG(4,("smb_password_ok: Checking SMB password for user %s\n",sampass->username));
+       DEBUG(4,("sam_account_ok: Checking SMB password for user %s\n",pdb_get_username(sampass)));
 
        /* Quit if the account was disabled. */
        if (acct_ctrl & ACB_DISABLED) {
-               DEBUG(1,("Account for user '%s' was disabled.\n", sampass->username));
+               DEBUG(1,("Account for user '%s' was disabled.\n", pdb_get_username(sampass)));
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
@@ -214,20 +333,38 @@ NTSTATUS sam_account_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user
        
        kickoff_time = pdb_get_kickoff_time(sampass);
        if (kickoff_time != 0 && time(NULL) > kickoff_time) {
-               DEBUG(1,("Account for user '%s' has expried.\n", sampass->username));
+               DEBUG(1,("Account for user '%s' has expired.\n", pdb_get_username(sampass)));
                DEBUG(3,("Account expired at '%ld' unix time.\n", (long)kickoff_time));
                return NT_STATUS_ACCOUNT_EXPIRED;
        }
 
+       if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
+               time_t must_change_time = pdb_get_pass_must_change_time(sampass);
+               time_t last_set_time = pdb_get_pass_last_set_time(sampass);
+
+               /* check for immediate expiry "must change at next logon" */
+               if (must_change_time == 0 && last_set_time != 0) {
+                       DEBUG(1,("Account for user '%s' password must change!.\n", pdb_get_username(sampass)));
+                       return NT_STATUS_PASSWORD_MUST_CHANGE;
+               }
+
+               /* check for expired password */
+               if (must_change_time < time(NULL) && must_change_time != 0) {
+                       DEBUG(1,("Account for user '%s' password expired!.\n", pdb_get_username(sampass)));
+                       DEBUG(1,("Password expired at '%s' (%ld) unix time.\n", http_timestring(must_change_time), (long)must_change_time));
+                       return NT_STATUS_PASSWORD_EXPIRED;
+               }
+       }
+
        /* Test workstation. Workstation list is comma separated. */
 
-       workstation_list = strdup(pdb_get_workstations(sampass));
+       workstation_list = talloc_strdup(mem_ctx, pdb_get_workstations(sampass));
 
        if (!workstation_list) return NT_STATUS_NO_MEMORY;
 
        if (*workstation_list) {
                BOOL invalid_ws = True;
-               char *s = workstation_list;
+               const char *s = workstation_list;
                        
                fstring tok;
                        
@@ -240,43 +377,22 @@ NTSTATUS sam_account_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user
                        }
                }
                
-               SAFE_FREE(workstation_list);            
                if (invalid_ws) 
                        return NT_STATUS_INVALID_WORKSTATION;
-       } else {
-               SAFE_FREE(workstation_list);
-       }
-
-       if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
-               time_t must_change_time = pdb_get_pass_must_change_time(sampass);
-               time_t last_set_time = pdb_get_pass_last_set_time(sampass);
-
-               /* check for immediate expiry "must change at next logon" */
-               if (must_change_time == 0 && last_set_time != 0) {
-                       DEBUG(1,("Account for user '%s' password must change!.\n", sampass->username));
-                       return NT_STATUS_PASSWORD_MUST_CHANGE;
-               }
-
-               /* check for expired password */
-               if (must_change_time < time(NULL) && must_change_time != 0) {
-                       DEBUG(1,("Account for user '%s' password expired!.\n", sampass->username));
-                       DEBUG(1,("Password expired at '%ld' unix time.\n", (long)must_change_time));
-                       return NT_STATUS_PASSWORD_EXPIRED;
-               }
        }
 
        if (acct_ctrl & ACB_DOMTRUST) {
-               DEBUG(2,("session_trust_account: Domain trust account %s denied by server\n", sampass->username));
+               DEBUG(2,("sam_account_ok: Domain trust account %s denied by server\n", pdb_get_username(sampass)));
                return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
        }
        
        if (acct_ctrl & ACB_SVRTRUST) {
-               DEBUG(2,("session_trust_account: Server trust account %s denied by server\n", sampass->username));
+               DEBUG(2,("sam_account_ok: Server trust account %s denied by server\n", pdb_get_username(sampass)));
                return NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT;
        }
        
        if (acct_ctrl & ACB_WSTRUST) {
-               DEBUG(4,("session_trust_account: Wksta trust account %s denied by server\n", sampass->username));
+               DEBUG(4,("sam_account_ok: Wksta trust account %s denied by server\n", pdb_get_username(sampass)));
                return NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT;
        }
        
@@ -290,33 +406,142 @@ SMB hash supplied in the user_info structure
 return an NT_STATUS constant.
 ****************************************************************************/
 
-NTSTATUS check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_serversupplied_info *server_info)
+static NTSTATUS check_sam_security(const struct auth_context *auth_context,
+                                  void *my_private_data, 
+                                  TALLOC_CTX *mem_ctx,
+                                  const auth_usersupplied_info *user_info, 
+                                  auth_serversupplied_info **server_info)
 {
        SAM_ACCOUNT *sampass=NULL;
        BOOL ret;
        NTSTATUS nt_status;
+       uint8 user_sess_key[16];
+       const uint8* lm_hash;
 
-       pdb_init_sam(&sampass);
+       if (!user_info || !auth_context) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       /* Can't use the talloc version here, because the returned struct gets
+          kept on the server_info */
+       if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(&sampass))) {
+               return nt_status;
+       }
 
        /* get the account information */
 
        become_root();
-       ret = pdb_getsampwnam(sampass, user_info->unix_username.str);
+       ret = pdb_getsampwnam(sampass, user_info->internal_username.str);
        unbecome_root();
 
        if (ret == False)
        {
-               DEBUG(1,("Couldn't find user '%s' in passdb file.\n", user_info->unix_username.str));
+               DEBUG(3,("Couldn't find user '%s' in passdb file.\n", user_info->internal_username.str));
                pdb_free_sam(&sampass);
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       nt_status = sam_password_ok(sampass, user_info, server_info->session_key);
+       nt_status = sam_password_ok(auth_context, mem_ctx, sampass, user_info, user_sess_key);
+       
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               pdb_free_sam(&sampass);
+               return nt_status;
+       }
+
+       nt_status = sam_account_ok(mem_ctx, sampass, user_info);
+
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               pdb_free_sam(&sampass);
+               return nt_status;
+       }
+
+       if (!NT_STATUS_IS_OK(nt_status = make_server_info_sam(server_info, sampass))) {         
+               DEBUG(0,("check_sam_security: make_server_info_sam() failed with '%s'\n", nt_errstr(nt_status)));
+               return nt_status;
+       }
 
-       if NT_STATUS_IS_OK(nt_status) {
-               nt_status = sam_account_ok(sampass, user_info);
+       lm_hash = pdb_get_lanman_passwd((*server_info)->sam_account);
+       if (lm_hash) {
+               memcpy((*server_info)->first_8_lm_hash, lm_hash, 8);
        }
+       
+       memcpy((*server_info)->session_key, user_sess_key, sizeof(user_sess_key));
 
-       pdb_free_sam(&sampass);
        return nt_status;
 }
+
+/* module initialisation */
+static NTSTATUS auth_init_sam_ignoredomain(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+{
+       if (!make_auth_methods(auth_context, auth_method)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       (*auth_method)->auth = check_sam_security;      
+       (*auth_method)->name = "sam_ignoredomain";
+       return NT_STATUS_OK;
+}
+
+
+/****************************************************************************
+Check SAM security (above) but with a few extra checks.
+****************************************************************************/
+
+static NTSTATUS check_samstrict_security(const struct auth_context *auth_context,
+                                        void *my_private_data, 
+                                        TALLOC_CTX *mem_ctx,
+                                        const auth_usersupplied_info *user_info, 
+                                        auth_serversupplied_info **server_info)
+{
+       BOOL is_local_name, is_my_domain;
+
+       if (!user_info || !auth_context) {
+               return NT_STATUS_LOGON_FAILURE;
+       }
+
+       is_local_name = is_myname(user_info->domain.str);
+       is_my_domain  = strequal(user_info->domain.str, lp_workgroup());
+
+       /* check whether or not we service this domain/workgroup name */
+       
+       switch ( lp_server_role() ) {
+               case ROLE_STANDALONE:
+               case ROLE_DOMAIN_MEMBER:
+                       if ( !is_local_name ) {
+                               DEBUG(6,("check_samstrict_security: %s is not one of my local names (%s)\n",
+                                       user_info->domain.str, (lp_server_role() == ROLE_DOMAIN_MEMBER 
+                                       ? "ROLE_DOMAIN_MEMBER" : "ROLE_STANDALONE") ));
+                               return NT_STATUS_NOT_IMPLEMENTED;
+                       }
+               case ROLE_DOMAIN_PDC:
+               case ROLE_DOMAIN_BDC:
+                       if ( !is_local_name && !is_my_domain ) {
+                               DEBUG(6,("check_samstrict_security: %s is not one of my local names or domain name (DC)\n",
+                                       user_info->domain.str));
+                               return NT_STATUS_NOT_IMPLEMENTED;
+                       }
+               default: /* name is ok */
+                       break;
+       }
+       
+       return check_sam_security(auth_context, my_private_data, mem_ctx, user_info, server_info);
+}
+
+/* module initialisation */
+static NTSTATUS auth_init_sam(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+{
+       if (!make_auth_methods(auth_context, auth_method)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       (*auth_method)->auth = check_samstrict_security;
+       (*auth_method)->name = "sam";
+       return NT_STATUS_OK;
+}
+
+NTSTATUS auth_sam_init(void)
+{
+       smb_register_auth(AUTH_INTERFACE_VERSION, "sam", auth_init_sam);
+       smb_register_auth(AUTH_INTERFACE_VERSION, "sam_ignoredomain", auth_init_sam_ignoredomain);
+       return NT_STATUS_OK;
+}