r873: converted samba4 to use real 64 bit integers instead of
[jra/samba/.git] / source4 / auth / auth_sam.c
index 35635ea4745012bef737d6dad2c28fc9eee657c8..549b5ab36271a0104728fa2cc2cc475faff1e283 100644 (file)
@@ -1,9 +1,8 @@
 /* 
    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) Andrew Bartlett <abartlet@samba.org> 2001-2004
+   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
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 
-/****************************************************************************
-core of smb password checking routine.
-****************************************************************************/
-static BOOL smb_pwd_check_ntlmv1(DATA_BLOB nt_response,
-                                const uchar *part_passwd,
-                                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;
-       }
-       
-       if (sec_blob.length != 8) {
-               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect challenge size (%d)\n", sec_blob.length));
-               return False;
-       }
-       
-       if (nt_response.length != 24) {
-               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect password length (%d)\n", nt_response.length));
-               return False;
-       }
-
-       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 (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;
-       }
-
-       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, 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.
 ****************************************************************************/
+
 static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                                TALLOC_CTX *mem_ctx,
-                               SAM_ACCOUNT *sampass, 
+                               const char *username,
+                               uint16 acct_flags,
+                               const uint8 lm_pw[16], const uint8 nt_pw[16],
                                const auth_usersupplied_info *user_info, 
-                               uint8 user_sess_key[16])
+                               DATA_BLOB *user_sess_key, 
+                               DATA_BLOB *lm_sess_key)
 {
-       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", 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);
-               }               
-       }
-
-       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;
-               }
-
-               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))
-               {
+       if (acct_flags & 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,("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 */
-               }
+                       DEBUG(3,("Account for user '%s' has no password and null passwords are NOT allowed.\n", 
+                                username));
+                       return NT_STATUS_LOGON_FAILURE;
+               }               
        }
-       
-       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;
-                       }
-               }
-
-               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;
-                       }
-                       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 ntlm_password_check(mem_ctx, &auth_context->challenge, 
+                                  &user_info->lm_resp, &user_info->nt_resp, 
+                                  &user_info->lm_interactive_pwd, 
+                                  &user_info->nt_interactive_pwd,
+                                  username, 
+                                  user_info->smb_name.str, 
+                                  user_info->client_domain.str, 
+                                  lm_pw, nt_pw, user_sess_key, lm_sess_key);
 }
 
+
 /****************************************************************************
  Do a specific test for a SAM_ACCOUNT being vaild for this connection 
  (ie not disabled, expired and the like).
 ****************************************************************************/
+
 static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
-                              SAM_ACCOUNT *sampass, 
+                              const char *username,
+                              uint16 acct_flags,
+                              NTTIME *acct_expiry,
+                              NTTIME *must_change_time,
+                              NTTIME *last_set_time,
+                              const char *workstation_list,
                               const auth_usersupplied_info *user_info)
 {
-       uint16  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)));
+       DEBUG(4,("sam_account_ok: Checking SMB password for user %s\n", username));
 
        /* Quit if the account was disabled. */
-       if (acct_ctrl & ACB_DISABLED) {
-               DEBUG(1,("Account for user '%s' was disabled.\n", pdb_get_username(sampass)));
+       if (acct_flags & ACB_DISABLED) {
+               DEBUG(1,("sam_account_ok: Account for user '%s' was disabled.\n", username));
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
+       /* Quit if the account was locked out. */
+       if (acct_flags & ACB_AUTOLOCK) {
+               DEBUG(1,("sam_account_ok: Account for user %s was locked out.\n", username));
+               return NT_STATUS_ACCOUNT_LOCKED_OUT;
+       }
+
        /* 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));
+       if ((*acct_expiry) != 0 && time(NULL) > nt_time_to_unix(*acct_expiry)) {
+               DEBUG(1,("sam_account_ok: Account for user '%s' has expired.\n", username));
+               DEBUG(3,("sam_account_ok: Account expired at '%s'.\n", 
+                        nt_time_string(mem_ctx, *acct_expiry)));
                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);
+       if (!(acct_flags & ACB_PWNOEXP)) {
 
                /* 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)));
+               if (*must_change_time == 0 && *last_set_time != 0) {
+                       DEBUG(1,("sam_account_ok: Account for user '%s' password must change!.\n", 
+                                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", pdb_get_username(sampass)));
-                       DEBUG(1,("Password expired at '%s' (%ld) unix time.\n", timestring(mem_ctx, must_change_time), (long)must_change_time));
+               if ((*must_change_time) != 0 && nt_time_to_unix(*must_change_time) < time(NULL)) {
+                       DEBUG(1,("sam_account_ok: Account for user '%s' password expired!.\n", 
+                                username));
+                       DEBUG(1,("sam_account_ok: Password expired at '%s' unix time.\n", 
+                                nt_time_string(mem_ctx, *must_change_time)));
                        return NT_STATUS_PASSWORD_EXPIRED;
                }
        }
 
        /* 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) {
+       if (workstation_list && *workstation_list) {
                BOOL invalid_ws = True;
                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",
+                       DEBUG(10,("sam_account_ok: 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)) {
                                invalid_ws = False;
                                break;
@@ -378,25 +139,24 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                        return NT_STATUS_INVALID_WORKSTATION;
        }
 
-       if (acct_ctrl & ACB_DOMTRUST) {
-               DEBUG(2,("sam_account_ok: Domain trust account %s denied by server\n", pdb_get_username(sampass)));
+       if (acct_flags & ACB_DOMTRUST) {
+               DEBUG(2,("sam_account_ok: Domain trust account %s denied by server\n", username));
                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)));
+       if (acct_flags & ACB_SVRTRUST) {
+               DEBUG(2,("sam_account_ok: Server trust account %s denied by server\n", username));
                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)));
+       if (acct_flags & ACB_WSTRUST) {
+               DEBUG(4,("sam_account_ok: Wksta trust account %s denied by server\n", username));
                return NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT;
        }
        
        return NT_STATUS_OK;
 }
 
-
 /****************************************************************************
 check if a username/password is OK assuming the password is a 24 byte
 SMB hash supplied in the user_info structure
@@ -409,73 +169,205 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
                                   const auth_usersupplied_info *user_info, 
                                   auth_serversupplied_info **server_info)
 {
-       SAM_ACCOUNT *sampass=NULL;
-       BOOL ret;
+       struct ldb_message **msgs;
+       struct ldb_message **msgs_domain;
+       void *sam_ctx;
+       char *username = user_info->internal_username.str;
+       uint16 acct_flags;
+       const char *workstation_list;
+       NTTIME acct_expiry;
+       NTTIME must_change_time;
+       NTTIME last_set_time;
+
+       uint_t ret;
+       uint_t ret_domain;
+
+       const char *domain_dn;
+       const char *domain_sid;
+
        NTSTATUS nt_status;
-       uint8 user_sess_key[16];
-       const uint8* lm_hash;
+       DATA_BLOB user_sess_key = data_blob(NULL, 0);
+       DATA_BLOB lm_sess_key = data_blob(NULL, 0);
+       uint8 *lm_pwd, *nt_pwd;
+
+       const char *attrs[] = {"unicodePwd", "lmPwdHash", "ntPwdHash", 
+                              "userAccountControl",
+                              "pwdLastSet",
+                              "accountExpires",
+                              "objectSid",
+                              "userWorkstations",
+                              NULL,
+       };
+
+       const char *domain_attrs[] =  {"name"};
 
        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;
+       
+       sam_ctx = samdb_connect();
+       if (sam_ctx == NULL) {
+               return NT_STATUS_INVALID_SYSTEM_SERVICE;
+       }
+       /* pull the user attributes */
+       ret = samdb_search(sam_ctx, mem_ctx, NULL, &msgs, attrs,
+                          "(&(sAMAccountName=%s)(objectclass=user))", 
+                          username);
+
+       if (ret == 0) {
+               DEBUG(3,("check_sam_security: Couldn't find user [%s] in passdb file.\n", 
+                        username));
+               samdb_close(sam_ctx);
+               return NT_STATUS_NO_SUCH_USER;
        }
 
-       /* get the account information */
+       if (ret > 1) {
+               DEBUG(1,("Found %d records matching user [%s]\n", ret, username));
+               samdb_close(sam_ctx);
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+       
+       domain_sid = samdb_result_sid_prefix(mem_ctx, msgs[0], "objectSid");
+       if (!domain_sid) {
+               samdb_close(sam_ctx);
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
 
-       become_root();
-       ret = pdb_getsampwnam(sampass, user_info->internal_username.str);
-       unbecome_root();
+       /* find the domain's DN */
+       ret_domain = samdb_search(sam_ctx, mem_ctx, NULL, &msgs_domain, domain_attrs,
+                          "(&(objectSid=%s)(objectclass=domain))", 
+                          domain_sid);
 
-       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_domain == 0) {
+               DEBUG(3,("check_sam_security: Couldn't find domain [%s] in passdb file.\n", 
+                        domain_sid));
+               samdb_close(sam_ctx);
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       nt_status = sam_account_ok(mem_ctx, sampass, user_info);
+       if (ret_domain > 1) {
+               DEBUG(1,("Found %d records matching domain [%s]\n", 
+                        ret_domain, domain_sid));
+               samdb_close(sam_ctx);
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       domain_dn = msgs_domain[0]->dn;
+       
+       acct_flags = samdb_result_acct_flags(msgs[0], "sAMAcctFlags");
+       
+       /* Quit if the account was locked out. */
+       if (acct_flags & ACB_AUTOLOCK) {
+               DEBUG(3,("check_sam_security: Account for user %s was locked out.\n", 
+                        username));
+               samdb_close(sam_ctx);
+               return NT_STATUS_ACCOUNT_LOCKED_OUT;
+       }
+
+       if (!NT_STATUS_IS_OK(nt_status = samdb_result_passwords(mem_ctx, msgs[0], 
+                                                               &lm_pwd, &nt_pwd))) {
+               return nt_status;
+       }
+
+       nt_status = sam_password_ok(auth_context, mem_ctx, 
+                                   username, acct_flags, 
+                                   lm_pwd, nt_pwd,
+                                   user_info, &user_sess_key, &lm_sess_key);
        
        if (!NT_STATUS_IS_OK(nt_status)) {
-               pdb_free_sam(&sampass);
+               samdb_close(sam_ctx);
                return nt_status;
        }
 
-       nt_status = sam_password_ok(auth_context, mem_ctx, sampass, user_info, user_sess_key);
+       acct_expiry = samdb_result_nttime(msgs[0], "accountExpires", 0);
+       must_change_time = samdb_result_force_pwd_change(sam_ctx, mem_ctx, 
+                                                        domain_dn, msgs[0], "pwdLastSet");
+       last_set_time = samdb_result_nttime(msgs[0], "pwdLastSet", 0);
+
+       workstation_list = samdb_result_string(msgs[0], "userWorkstations", NULL);
+
+       nt_status = sam_account_ok(mem_ctx, username, acct_flags, 
+                                  &acct_expiry, 
+                                  &must_change_time, 
+                                  &last_set_time, 
+                                  workstation_list,
+                                  user_info);
 
        if (!NT_STATUS_IS_OK(nt_status)) {
-               pdb_free_sam(&sampass);
+               samdb_close(sam_ctx);
                return nt_status;
        }
 
-       if (!NT_STATUS_IS_OK(nt_status = make_server_info_sam(server_info, sampass))) {         
+       if (!NT_STATUS_IS_OK(nt_status = make_server_info(server_info, username))) {            
                DEBUG(0,("check_sam_security: make_server_info_sam() failed with '%s'\n", nt_errstr(nt_status)));
+               samdb_close(sam_ctx);
                return nt_status;
        }
 
-       lm_hash = pdb_get_lanman_passwd((*server_info)->sam_account);
-       if (lm_hash) {
-               memcpy((*server_info)->first_8_lm_hash, lm_hash, 8);
+       {
+               struct ldb_message **group_msgs;
+               char *dn = msgs[0]->dn;
+               int group_ret;
+               const char *group_attrs[3] = { "sAMAccountType", "objectSid", NULL }; 
+               /* find list of sids */
+               struct dom_sid **groupSIDs = NULL;
+               struct dom_sid *user_sid;
+               struct dom_sid *group_sid;
+               const char *sidstr;
+               int i;
+
+               group_ret = samdb_search(sam_ctx,
+                                        mem_ctx, NULL, &group_msgs, group_attrs,
+                                        "(&(member=%s)(sAMAccountType=*))", 
+                                        dn);
+               
+               if (!(groupSIDs = talloc_realloc_p((*server_info)->mem_ctx, groupSIDs, 
+                                                  struct dom_sid *, group_ret))) {
+                       talloc_destroy((*server_info)->mem_ctx);
+                       samdb_close(sam_ctx);
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               /* Need to unroll some nested groups, but not aliases */
+               for (i = 0; i < group_ret; i++) {
+                       sidstr = ldb_msg_find_string(group_msgs[i], "objectSid", NULL);
+                       groupSIDs[i] = dom_sid_parse_talloc((*server_info)->mem_ctx, sidstr);
+               }
+               
+               sidstr = ldb_msg_find_string(msgs[0], "objectSid", NULL);
+               user_sid = dom_sid_parse_talloc((*server_info)->mem_ctx, sidstr);
+               group_sid = dom_sid_parse_talloc((*server_info)->mem_ctx, sidstr);
+               group_sid->sub_auths[group_sid->num_auths-1] 
+                       = samdb_result_uint(msgs[0], "primaryGroupID", 0);
+
+               if (!NT_STATUS_IS_OK(nt_status = create_nt_user_token((*server_info)->mem_ctx, 
+                                                                    user_sid, group_sid, 
+                                                                    group_ret, groupSIDs, 
+                                                                    False, &(*server_info)->ptok))) {
+                       DEBUG(1,("check_sam_security: create_nt_user_token failed with '%s'\n", nt_errstr(nt_status)));
+                       free_server_info(server_info);
+                       samdb_close(sam_ctx);
+                       return nt_status;
+               }
        }
-       
-       memcpy((*server_info)->session_key, user_sess_key, sizeof(user_sess_key));
+
+       (*server_info)->guest = False;
+
+       (*server_info)->user_session_key = user_sess_key;
+       (*server_info)->lm_session_key = lm_sess_key;
 
        return nt_status;
 }
 
 /* module initialisation */
-static 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;
 }
 
@@ -509,57 +401,14 @@ static NTSTATUS check_samstrict_security(const struct auth_context *auth_context
 }
 
 /* module initialisation */
-static 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";
-       return NT_STATUS_OK;
-}
-
-/****************************************************************************
-Check SAM security (above) but with a few extra checks if we're a DC.
-****************************************************************************/
-
-static NTSTATUS check_samstrict_dc_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)
-{
-
-       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, empty
-          or our domain if we are a logon server.*/
-       
-
-       if ((strcasecmp(lp_workgroup(), user_info->domain.str) != 0) &&
-           (!is_myname(user_info->domain.str))) {
-               DEBUG(7,("The requested user domain is not the local server name or our domain. [%s]\\[%s]\n",
-                       user_info->domain.str,user_info->internal_username.str));
-               return NT_STATUS_NO_SUCH_USER;
-       }               
-
-       return check_sam_security(auth_context, my_private_data, mem_ctx, user_info, server_info);
-}
-
-/* module initialisation */
-static NTSTATUS auth_init_samstrict_dc(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_dc_security;
-       (*auth_method)->name = "samstrict_dc";
+       (*auth_method)->name = "sam";
        return NT_STATUS_OK;
 }
 
@@ -577,17 +426,8 @@ NTSTATUS auth_sam_init(void)
                return ret;
        }
 
-       ops.name = "samstrict";
-       ops.init = auth_init_samstrict;
-       ret = register_backend("auth", &ops);
-       if (!NT_STATUS_IS_OK(ret)) {
-               DEBUG(0,("Failed to register '%s' auth backend!\n",
-                       ops.name));
-               return ret;
-       }
-
-       ops.name = "samstrict_dc";
-       ops.init = auth_init_samstrict_dc;
+       ops.name = "sam_ignoredomain";
+       ops.init = auth_init_sam_ignoredomain;
        ret = register_backend("auth", &ops);
        if (!NT_STATUS_IS_OK(ret)) {
                DEBUG(0,("Failed to register '%s' auth backend!\n",