s3:auth: add comment to nulling out stolen sampass
[amitay/samba.git] / source3 / auth / auth_sam.c
index 9a619f81f670969a37eb110934fbdce885de2920..1dd8fc950ea60a86526fa24efaec542ee510e6af 100644 (file)
    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) Andrew Bartlett              2001-2003
+   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
-   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,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "../libcli/auth/libcli_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 
 /****************************************************************************
-core of smb password checking routine.
+ Do a specific test for an smb password being correct, given a smb_password and
+ the lanman and NT responses.
 ****************************************************************************/
-static BOOL smb_pwd_check_ntlmv1(DATA_BLOB nt_response,
-                                const uchar *part_passwd,
-                                DATA_BLOB sec_blob,
-                                uint8 user_sess_key[16])
+
+static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
+                               TALLOC_CTX *mem_ctx,
+                               const char *username,
+                               uint32_t acct_ctrl,
+                               const uint8_t *lm_pw,
+                               const uint8_t *nt_pw,
+                               const struct auth_usersupplied_info *user_info,
+                               DATA_BLOB *user_sess_key, 
+                               DATA_BLOB *lm_sess_key)
 {
-       /* 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;
+       struct samr_Password _lm_hash, _nt_hash, _client_lm_hash, _client_nt_hash;
+       struct samr_Password *lm_hash = NULL;
+       struct samr_Password *nt_hash = NULL;
+       struct samr_Password *client_lm_hash = NULL;
+       struct samr_Password *client_nt_hash = NULL;
+
+       *user_sess_key = data_blob_null;
+       *lm_sess_key = data_blob_null;
+
+       if (acct_ctrl & ACB_PWNOTREQ) {
+               if (lp_null_passwords()) {
+                       DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", username));
+                       return NT_STATUS_OK;
+               } else {
+                       DEBUG(3,("Account for user '%s' has no password and null passwords are NOT allowed.\n", username));
+                       return NT_STATUS_LOGON_FAILURE;
+               }               
        }
-       
-       if (sec_blob.length != 8) {
-               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect challenge size (%d)\n", sec_blob.length));
-               return False;
+
+       if (lm_pw) {
+               memcpy(_lm_hash.hash, lm_pw, sizeof(_lm_hash.hash));
+               lm_hash = &_lm_hash;
        }
-       
-       if (nt_response.length != 24) {
-               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect password length (%d)\n", nt_response.length));
-               return False;
+       if (nt_pw) {
+               memcpy(_nt_hash.hash, nt_pw, sizeof(_nt_hash.hash));
+               nt_hash = &_nt_hash;
        }
-
-       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 |"));
-       dump_data(100, part_passwd, 16);
-       DEBUG(100,("Password from client was |"));
-       dump_data(100, nt_response.data, nt_response.length);
-       DEBUG(100,("Given challenge was |"));
-       dump_data(100, sec_blob.data, sec_blob.length);
-       DEBUG(100,("Value from encryption was |"));
-       dump_data(100, p24, 24);
-#endif
-  return (memcmp(p24, nt_response.data, 24) == 0);
-}
-
-
-/****************************************************************************
-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 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 value_from_encryption[16];
-       uchar client_response[16];
-       DATA_BLOB client_key_data;
-
-       if (part_passwd == NULL)
-       {
-               DEBUG(10,("No password set - DISALLOWING access\n"));
-               /* No password set - always False */
-               return False;
+       if (user_info->lm_interactive_pwd.data && sizeof(_client_lm_hash.hash) == user_info->lm_interactive_pwd.length) {
+               memcpy(_client_lm_hash.hash, user_info->lm_interactive_pwd.data, sizeof(_lm_hash.hash));
+               client_lm_hash = &_client_lm_hash;
        }
-
-       if (ntv2_response.length < 16) {
-               /* We MUST have more than 16 bytes, or the stuff below will go
-                  crazy... */
-               DEBUG(0, ("smb_pwd_check_ntlmv2: incorrect password length (%d)\n", 
-                         ntv2_response.length));
-               return False;
+       if (user_info->nt_interactive_pwd.data && sizeof(_client_nt_hash.hash) == user_info->nt_interactive_pwd.length) {
+               memcpy(_client_nt_hash.hash, user_info->nt_interactive_pwd.data, sizeof(_nt_hash.hash));
+               client_nt_hash = &_client_nt_hash;
        }
 
-       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;
+       if (client_lm_hash || client_nt_hash) {
+               *user_sess_key = data_blob_talloc(mem_ctx, NULL, 16);
+               if (!user_sess_key->data) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               SMBsesskeygen_ntv1(nt_pw, user_sess_key->data);
+               return hash_password_check(mem_ctx, lp_lanman_auth(),
+                                          client_lm_hash,
+                                          client_nt_hash,
+                                          username, 
+                                          lm_hash,
+                                          nt_hash);
+       } else {
+               return ntlm_password_check(mem_ctx, lp_lanman_auth(),
+                                          lp_ntlm_auth(),
+                                          user_info->logon_parameters,
+                                          &auth_context->challenge, 
+                                          &user_info->lm_resp, &user_info->nt_resp, 
+                                          username, 
+                                          user_info->smb_name,
+                                          user_info->client_domain,
+                                          lm_hash,
+                                          nt_hash,
+                                          user_sess_key, lm_sess_key);
        }
-
-       SMBOWFencrypt_ntv2(kr, sec_blob, client_key_data, value_from_encryption);
-       if (user_sess_key != NULL)
-       {
-               SMBsesskeygen_ntv2(kr, value_from_encryption, user_sess_key);
-       }
-
-#if DEBUG_PASSWORD
-       DEBUG(100,("Part password (P16) was |"));
-       dump_data(100, part_passwd, 16);
-       DEBUG(100,("Password from client was |"));
-       dump_data(100, ntv2_response.data, ntv2_response.length);
-       DEBUG(100,("Variable data from client was |"));
-       dump_data(100, client_key_data.data, client_key_data.length);
-       DEBUG(100,("Given challenge was |"));
-       dump_data(100, sec_blob.data, sec_blob.length);
-       DEBUG(100,("Value from encryption was |"));
-       dump_data(100, value_from_encryption, 16);
-#endif
-       data_blob_clear_free(&client_key_data);
-       return (memcmp(value_from_encryption, client_response, 16) == 0);
 }
 
-
 /****************************************************************************
- Do a specific test for an smb password being correct, given a smb_password and
- the lanman and NT responses.
+ Check if a user is allowed to logon at this time. Note this is the
+ servers local time, as logon hours are just specified as a weekly
+ bitmask.
 ****************************************************************************/
-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])
+
+static bool logon_hours_ok(struct samu *sampass)
 {
-       uint16 acct_ctrl;
-       const uint8 *nt_pw, *lm_pw;
-       uint32 auth_flags;
+       /* In logon hours first bit is Sunday from 12AM to 1AM */
+       const uint8 *hours;
+       struct tm *utctime;
+       time_t lasttime;
+       const char *asct;
+       uint8 bitmask, bitpos;
+
+       hours = pdb_get_hours(sampass);
+       if (!hours) {
+               DEBUG(5,("logon_hours_ok: No hours restrictions for user %s\n",pdb_get_username(sampass)));
+               return True;
+       }
 
-       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", 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", pdb_get_username(sampass)));
-                       return(NT_STATUS_LOGON_FAILURE);
-               }               
+       lasttime = time(NULL);
+       utctime = gmtime(&lasttime);
+       if (!utctime) {
+               DEBUG(1, ("logon_hours_ok: failed to get gmtime. Failing logon for user %s\n",
+                       pdb_get_username(sampass) ));
+               return False;
        }
 
-       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 (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;
-               }
+       /* find the corresponding byte and bit */
+       bitpos = (utctime->tm_wday * 24 + utctime->tm_hour) % 168;
+       bitmask = 1 << (bitpos % 8);
 
-               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;
+       if (! (hours[bitpos/8] & bitmask)) {
+               struct tm *t = localtime(&lasttime);
+               if (!t) {
+                       asct = "INVALID TIME";
                } 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,("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(3,("sam_password_ok: NT MD4 password check failed for user %s\n",pdb_get_username(sampass)));
-                               return NT_STATUS_WRONG_PASSWORD;
-                       }
-               } 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 feild */
-               }
-       }
-       
-       if (auth_flags & AUTH_FLAG_LM_RESP) {
-               if (user_info->lm_resp.length != 24) {
-                       DEBUG(2,("sam_password_ok: invalid LanMan password length (%d) for user %s\n", 
-                                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;
+                       asct = asctime(t);
+                       if (!asct) {
+                               asct = "INVALID TIME";
                        }
                }
 
-               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(1, ("logon_hours_ok: Account for user %s not allowed to "
+                         "logon at this time (%s).\n",
+                         pdb_get_username(sampass), asct ));
+               return False;
+       }
 
-               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;
-               }
+       asct = asctime(utctime);
+       DEBUG(5,("logon_hours_ok: user %s allowed to logon at this time (%s)\n",
+               pdb_get_username(sampass), asct ? asct : "UNKNOWN TIME" ));
 
-               /* 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;
-                       }
-                       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, 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;
+       return True;
 }
 
 /****************************************************************************
- Do a specific test for a SAM_ACCOUNT being vaild for this connection 
+ Do a specific test for a struct samu being valid for this connection
  (ie not disabled, expired and the like).
 ****************************************************************************/
+
 static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
-                              SAM_ACCOUNT *sampass, 
-                              const auth_usersupplied_info *user_info)
+                              struct samu *sampass, 
+                              const struct auth_usersupplied_info *user_info)
 {
-       uint16  acct_ctrl = pdb_get_acct_ctrl(sampass);
+       uint32  acct_ctrl = pdb_get_acct_ctrl(sampass);
        char *workstation_list;
        time_t kickoff_time;
-       
+
        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", pdb_get_username(sampass)));
+               DEBUG(1,("sam_account_ok: Account for user '%s' was disabled.\n", pdb_get_username(sampass)));
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
+       /* Quit if the account was locked out. */
+       if (acct_ctrl & ACB_AUTOLOCK) {
+               DEBUG(1,("sam_account_ok: Account for user %s was locked out.\n", pdb_get_username(sampass)));
+               return NT_STATUS_ACCOUNT_LOCKED_OUT;
+       }
+
+       /* Quit if the account is not allowed to logon at this time. */
+       if (! logon_hours_ok(sampass)) {
+               return NT_STATUS_INVALID_LOGON_HOURS;
+       }
+
        /* Test account expire time */
-       
+
        kickoff_time = pdb_get_kickoff_time(sampass);
        if (kickoff_time != 0 && time(NULL) > kickoff_time) {
-               DEBUG(1,("Account for user '%s' has expried.\n", pdb_get_username(sampass)));
-               DEBUG(3,("Account expired at '%ld' unix time.\n", (long)kickoff_time));
+               DEBUG(1,("sam_account_ok: Account for user '%s' has expired.\n", pdb_get_username(sampass)));
+               DEBUG(3,("sam_account_ok: Account expired at '%ld' unix time.\n", (long)kickoff_time));
                return NT_STATUS_ACCOUNT_EXPIRED;
        }
 
-       if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
+       if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP) && !(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ)) {
                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)));
+               /* check for immediate expiry "must change at next logon" 
+                * for a user account. */
+               if (((acct_ctrl & (ACB_WSTRUST|ACB_SVRTRUST)) == 0) && (last_set_time == 0)) {
+                       DEBUG(1,("sam_account_ok: 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));
+                       DEBUG(1,("sam_account_ok: Account for user '%s' password expired!\n", pdb_get_username(sampass)));
+                       DEBUG(1,("sam_account_ok: Password expired at '%s' (%ld) unix time.\n", http_timestring(talloc_tos(), must_change_time), (long)must_change_time));
                        return NT_STATUS_PASSWORD_EXPIRED;
                }
        }
@@ -356,25 +224,39 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
        /* Test workstation. Workstation list is comma separated. */
 
        workstation_list = talloc_strdup(mem_ctx, pdb_get_workstations(sampass));
-
-       if (!workstation_list) return NT_STATUS_NO_MEMORY;
+       if (!workstation_list)
+               return NT_STATUS_NO_MEMORY;
 
        if (*workstation_list) {
-               BOOL invalid_ws = True;
+               bool invalid_ws = True;
+               char *tok = NULL;
                const char *s = workstation_list;
-                       
-               fstring tok;
-                       
-               while (next_token(&s, tok, ",", sizeof(tok))) {
-                       DEBUG(10,("checking for workstation match %s and %s (len=%d)\n",
-                                 tok, user_info->wksta_name.str, user_info->wksta_name.len));
-                       if(strequal(tok, user_info->wksta_name.str)) {
+               char *machine_name = talloc_asprintf(mem_ctx, "%s$", user_info->wksta_name);
+
+               if (machine_name == NULL)
+                       return NT_STATUS_NO_MEMORY;
+
+               while (next_token_talloc(mem_ctx, &s, &tok, ",")) {
+                       DEBUG(10,("sam_account_ok: checking for workstation match %s and %s\n",
+                                 tok, user_info->wksta_name));
+                       if(strequal(tok, user_info->wksta_name)) {
                                invalid_ws = False;
                                break;
                        }
+                       if (tok[0] == '+') {
+                               DEBUG(10,("sam_account_ok: checking for workstation %s in group: %s\n", 
+                                       machine_name, tok + 1));
+                               if (user_in_group(machine_name, tok + 1)) {
+                                       invalid_ws = False;
+                                       break;
+                               }
+                       }
+                       TALLOC_FREE(tok);
                }
-               
-               if (invalid_ws) 
+               TALLOC_FREE(tok);
+               TALLOC_FREE(machine_name);
+
+               if (invalid_ws)
                        return NT_STATUS_INVALID_WORKSTATION;
        }
 
@@ -382,20 +264,91 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                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,("sam_account_ok: Server trust account %s denied by server\n", pdb_get_username(sampass)));
-               return NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT;
+               if (!(user_info->logon_parameters & MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT)) {
+                       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,("sam_account_ok: Wksta trust account %s denied by server\n", pdb_get_username(sampass)));
-               return NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT;
+               if (!(user_info->logon_parameters & MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT)) {
+                       DEBUG(2,("sam_account_ok: Wksta trust account %s denied by server\n", pdb_get_username(sampass)));
+                       return NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT;
+               }
        }
-       
        return NT_STATUS_OK;
 }
 
+/**
+ * Check whether the given password is one of the last two
+ * password history entries. If so, the bad pwcount should
+ * not be incremented even thought the actual password check
+ * failed.
+ */
+static bool need_to_increment_bad_pw_count(
+       const struct auth_context *auth_context,
+       struct samu* sampass,
+       const struct auth_usersupplied_info *user_info)
+{
+       uint8_t i;
+       const uint8_t *pwhistory;
+       uint32_t pwhistory_len;
+       uint32_t policy_pwhistory_len;
+       uint32_t acct_ctrl;
+       const char *username;
+       TALLOC_CTX *mem_ctx = talloc_stackframe();
+       bool result = true;
+
+       pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY,
+                              &policy_pwhistory_len);
+       if (policy_pwhistory_len == 0) {
+               goto done;
+       }
+
+       pwhistory = pdb_get_pw_history(sampass, &pwhistory_len);
+       if (!pwhistory || pwhistory_len == 0) {
+               goto done;
+       }
+
+       acct_ctrl = pdb_get_acct_ctrl(sampass);
+       username = pdb_get_username(sampass);
+
+       for (i=1; i < MIN(MIN(3, policy_pwhistory_len), pwhistory_len); i++) {
+               static const uint8_t zero16[SALTED_MD5_HASH_LEN];
+               const uint8_t *salt;
+               const uint8_t *nt_pw;
+               NTSTATUS status;
+               DATA_BLOB user_sess_key = data_blob_null;
+               DATA_BLOB lm_sess_key = data_blob_null;
+
+               salt = &pwhistory[i*PW_HISTORY_ENTRY_LEN];
+               nt_pw = salt + PW_HISTORY_SALT_LEN;
+
+               if (memcmp(zero16, nt_pw, NT_HASH_LEN) == 0) {
+                       /* skip zero password hash */
+                       continue;
+               }
+
+               if (memcmp(zero16, salt, PW_HISTORY_SALT_LEN) != 0) {
+                       /* skip nonzero salt (old format entry) */
+                       continue;
+               }
+
+               status = sam_password_ok(auth_context, mem_ctx,
+                                        username, acct_ctrl, NULL, nt_pw,
+                                        user_info, &user_sess_key, &lm_sess_key);
+               if (NT_STATUS_IS_OK(status)) {
+                       result = false;
+                       break;
+               }
+       }
+
+done:
+       TALLOC_FREE(mem_ctx);
+       return result;
+}
 
 /****************************************************************************
 check if a username/password is OK assuming the password is a 24 byte
@@ -406,76 +359,172 @@ return an NT_STATUS constant.
 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)
+                                  const struct auth_usersupplied_info *user_info,
+                                  struct auth_serversupplied_info **server_info)
 {
-       SAM_ACCOUNT *sampass=NULL;
-       BOOL ret;
+       struct samu *sampass=NULL;
+       bool ret;
        NTSTATUS nt_status;
-       uint8 user_sess_key[16];
-       const uint8* lm_hash;
+       NTSTATUS update_login_attempts_status;
+       DATA_BLOB user_sess_key = data_blob_null;
+       DATA_BLOB lm_sess_key = data_blob_null;
+       bool updated_autolock = False, updated_badpw = False;
+       uint32_t acct_ctrl;
+       const char *username;
+       const uint8_t *nt_pw;
+       const uint8_t *lm_pw;
 
        if (!user_info || !auth_context) {
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       /* Can't use the talloc version here, becouse the returned struct gets
-          kept on the server_info */
-       if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam(&sampass))) {
-               return nt_status;
+       /* the returned struct gets kept on the server_info, by means
+          of a steal further down */
+
+       sampass = samu_new(mem_ctx);
+       if (sampass == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
        /* get the account information */
 
        become_root();
-       ret = pdb_getsampwnam(sampass, user_info->internal_username.str);
+       ret = pdb_getsampwnam(sampass, user_info->internal_username);
        unbecome_root();
 
-       if (ret == False)
-       {
-               DEBUG(3,("Couldn't find user '%s' in passdb file.\n", user_info->internal_username.str));
-               pdb_free_sam(&sampass);
+       if (ret == False) {
+               DEBUG(3,("check_sam_security: Couldn't find user '%s' in "
+                        "passdb.\n", user_info->internal_username));
+               TALLOC_FREE(sampass);
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       nt_status = sam_account_ok(mem_ctx, sampass, user_info);
-       
+       acct_ctrl = pdb_get_acct_ctrl(sampass);
+       username = pdb_get_username(sampass);
+       nt_pw = pdb_get_nt_passwd(sampass);
+       lm_pw = pdb_get_lanman_passwd(sampass);
+
+       /* see if autolock flag needs to be updated */
+       if (acct_ctrl & ACB_NORMAL)
+               pdb_update_autolock_flag(sampass, &updated_autolock);
+       /* Quit if the account was locked out. */
+       if (acct_ctrl & ACB_AUTOLOCK) {
+               DEBUG(3,("check_sam_security: Account for user %s was locked out.\n", username));
+               return NT_STATUS_ACCOUNT_LOCKED_OUT;
+       }
+
+       nt_status = sam_password_ok(auth_context, mem_ctx,
+                                   username, acct_ctrl, lm_pw, nt_pw,
+                                   user_info, &user_sess_key, &lm_sess_key);
+
+       /* Notify passdb backend of login success/failure. If not 
+          NT_STATUS_OK the backend doesn't like the login */
+
+       update_login_attempts_status = pdb_update_login_attempts(sampass, NT_STATUS_IS_OK(nt_status));
+
        if (!NT_STATUS_IS_OK(nt_status)) {
-               pdb_free_sam(&sampass);
-               return nt_status;
+               bool increment_bad_pw_count = false;
+
+               if (NT_STATUS_EQUAL(nt_status,NT_STATUS_WRONG_PASSWORD) && 
+                   acct_ctrl & ACB_NORMAL &&
+                   NT_STATUS_IS_OK(update_login_attempts_status)) 
+               {
+                       increment_bad_pw_count =
+                               need_to_increment_bad_pw_count(auth_context,
+                                                              sampass,
+                                                              user_info);
+               }
+
+               if (increment_bad_pw_count) {
+                       pdb_increment_bad_password_count(sampass);
+                       updated_badpw = True;
+               } else {
+                       pdb_update_bad_password_count(sampass, 
+                                                     &updated_badpw);
+               }
+               if (updated_autolock || updated_badpw){
+                       NTSTATUS status;
+
+                       become_root();
+                       status = pdb_update_sam_account(sampass);
+                       unbecome_root();
+
+                       if (!NT_STATUS_IS_OK(status)) {
+                               DEBUG(1, ("Failed to modify entry: %s\n",
+                                         nt_errstr(status)));
+                       }
+               }
+               goto done;
+       }
+
+       if ((acct_ctrl & ACB_NORMAL) &&
+           (pdb_get_bad_password_count(sampass) > 0)){
+               pdb_set_bad_password_count(sampass, 0, PDB_CHANGED);
+               pdb_set_bad_password_time(sampass, 0, PDB_CHANGED);
+               updated_badpw = True;
        }
 
-       nt_status = sam_password_ok(auth_context, mem_ctx, sampass, user_info, user_sess_key);
+       if (updated_autolock || updated_badpw){
+               NTSTATUS status;
+
+               become_root();
+               status = pdb_update_sam_account(sampass);
+               unbecome_root();
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(1, ("Failed to modify entry: %s\n",
+                                 nt_errstr(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;
+               goto done;
        }
 
-       if (!NT_STATUS_IS_OK(nt_status = make_server_info_sam(server_info, sampass))) {         
+       become_root();
+       nt_status = make_server_info_sam(server_info, sampass);
+       unbecome_root();
+       /*
+        * sampass has been stolen to server_info.
+        * So NULL it out to prevent segfaults.
+        */
+       sampass = NULL;
+
+       if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0,("check_sam_security: make_server_info_sam() failed with '%s'\n", nt_errstr(nt_status)));
-               return nt_status;
+               goto done;
        }
 
-       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));
+       (*server_info)->user_session_key =
+               data_blob_talloc(*server_info, user_sess_key.data,
+                                user_sess_key.length);
+       data_blob_free(&user_sess_key);
+
+       (*server_info)->lm_session_key =
+               data_blob_talloc(*server_info, lm_sess_key.data,
+                                lm_sess_key.length);
+       data_blob_free(&lm_sess_key);
+
+       (*server_info)->nss_token |= user_info->was_mapped;
 
+done:
+       TALLOC_FREE(sampass);
+       data_blob_free(&user_sess_key);
+       data_blob_free(&lm_sess_key);
        return nt_status;
 }
 
 /* module initialisation */
-NTSTATUS auth_init_sam(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+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";
+       (*auth_method)->name = "sam_ignoredomain";
        return NT_STATUS_OK;
 }
 
@@ -487,40 +536,58 @@ 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)
+                                        const struct auth_usersupplied_info *user_info,
+                                        struct auth_serversupplied_info **server_info)
 {
+       bool is_local_name, is_my_domain;
 
        if (!user_info || !auth_context) {
                return NT_STATUS_LOGON_FAILURE;
        }
 
-       /* If we are a domain member, we must not 
-          attempt to check the password locally,
-          unless it is one of our aliases. */
-       
-       if (!is_myname(user_info->domain.str)) {
-               return NT_STATUS_NO_SUCH_USER;
+       is_local_name = is_myname(user_info->domain);
+       is_my_domain  = strequal(user_info->domain, 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, (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));
+                               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 */
-NTSTATUS auth_init_samstrict(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+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 = "samstrict";
+       (*auth_method)->name = "sam";
        return NT_STATUS_OK;
 }
 
 NTSTATUS auth_sam_init(void)
 {
-       smb_register_auth(AUTH_INTERFACE_VERSION, "samstrict", auth_init_samstrict);
        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;
 }