r6793: Move auth_sam to use the dnsDomain rather than the
[samba.git] / source / auth / auth_sam.c
index 1d097c94ef482e70f772f1ac998dab798f683637..947de1ef8c441c1ea133d12d827372c45728d00a 100644 (file)
@@ -1,9 +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) Andrew Bartlett <abartlet@samba.org> 2001-2004
+   Copyright (C) Gerald Carter                             2003
+   Copyright (C) Stefan Metzmacher                         2005
    
    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(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);
-}
-
+#include "librpc/gen_ndr/ndr_samr.h"
+#include "system/time.h"
+#include "auth/auth.h"
+#include "lib/ldb/include/ldb.h"
+#include "pstring.h"
 
 /****************************************************************************
  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 auth_usersupplied_info *user_info, 
-                               uint8 user_sess_key[16])
+static NTSTATUS authsam_password_ok(const struct auth_context *auth_context,
+                                   TALLOC_CTX *mem_ctx,
+                                   uint16_t acct_flags,
+                                   const struct samr_Password *lm_pwd, 
+                                   const struct samr_Password *nt_pwd,
+                                   const struct auth_usersupplied_info *user_info, 
+                                   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;
+       NTSTATUS status;
 
-       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))
-               {
+       if (acct_flags & ACB_PWNOTREQ) {
+               if (lp_null_passwords()) {
+                       DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", 
+                                user_info->account_name));
                        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,("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", 
+                                user_info->account_name));
+                       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;
-               }
+       status = ntlm_password_check(mem_ctx, &auth_context->challenge.data, 
+                                    &user_info->lm_resp, &user_info->nt_resp, 
+                                    &user_info->lm_interactive_password, 
+                                    &user_info->nt_interactive_password,
+                                    user_info->account_name,
+                                    user_info->client.account_name, 
+                                    user_info->client.domain_name, 
+                                    lm_pwd->hash, nt_pwd->hash,
+                                    user_sess_key, lm_sess_key);
+       NT_STATUS_NOT_OK_RETURN(status);
 
-               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;
-               }
-                       
+       if (user_sess_key && user_sess_key->data) {
+               talloc_steal(auth_context, user_sess_key->data);
        }
-               
-       /* 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;
+       if (lm_sess_key && lm_sess_key->data) {
+               talloc_steal(auth_context, lm_sess_key->data);
+       }
+
+       return NT_STATUS_OK;
 }
 
+
 /****************************************************************************
  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 auth_usersupplied_info *user_info)
+static NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,
+                                  uint16_t acct_flags,
+                                  NTTIME acct_expiry,
+                                  NTTIME must_change_time,
+                                  NTTIME last_set_time,
+                                  const char *workstation_list,
+                                  const struct 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,("authsam_account_ok: Checking SMB password for user %s\n", user_info->account_name));
 
        /* 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,("authsam_account_ok: Account for user '%s' was disabled.\n", user_info->account_name));
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
+       /* Quit if the account was locked out. */
+       if (acct_flags & ACB_AUTOLOCK) {
+               DEBUG(1,("authsam_account_ok: Account for user %s was locked out.\n", user_info->account_name));
+               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) != -1 && time(NULL) > nt_time_to_unix(acct_expiry)) {
+               DEBUG(1,("authsam_account_ok: Account for user '%s' has expired.\n", user_info->account_name));
+               DEBUG(3,("authsam_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)));
+                       DEBUG(1,("sam_account_ok: Account for user '%s' password must change!.\n", 
+                                user_info->account_name));
                        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(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", 
+                                user_info->account_name));
+                       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",
-                                 tok, user_info->wksta_name.str, user_info->wksta_name.len));
-                       if(strequal(tok, user_info->wksta_name.str)) {
+                       DEBUG(10,("sam_account_ok: checking for workstation match '%s' and '%s'\n",
+                                 tok, user_info->workstation_name));
+
+                       if (strequal(tok, user_info->workstation_name)) {
                                invalid_ws = False;
+
                                break;
                        }
                }
-               
-               if (invalid_ws) 
+
+               if (invalid_ws) {
                        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", user_info->account_name));
                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", user_info->account_name));
                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", user_info->account_name));
                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
-return an NT_STATUS constant.
+ Look for the specified user in the sam, return ldb result structures
 ****************************************************************************/
 
-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)
+static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, void *sam_ctx,
+                                      const char *account_name,
+                                      const char *domain_name,
+                                      struct ldb_message ***ret_msgs,
+                                      struct ldb_message ***ret_msgs_domain)
 {
-       SAM_ACCOUNT *sampass=NULL;
-       BOOL ret;
-       NTSTATUS nt_status;
-       uint8 user_sess_key[16];
-       const uint8* lm_hash;
+       struct ldb_message **msgs;
+       struct ldb_message **msgs_domain;
+
+       int ret;
+       int ret_domain;
+
+       const char *domain_dn = NULL;
+
+       const char *attrs[] = {"unicodePwd", "lmPwdHash", "ntPwdHash",
+                              "userAccountControl",
+                              "pwdLastSet",
+                              "accountExpires",
+                              "objectSid",
+                              "userWorkstations",
+                              
+                              /* required for server_info, not access control: */
+                              "sAMAccountName",
+                              "displayName",
+                              "scriptPath",
+                              "profilePath",
+                              "homeDirectory",
+                              "homeDrive",
+                              "lastLogon",
+                              "lastLogoff",
+                              "accountExpires",
+                              "badPwdCount",
+                              "logonCount",
+                              "primaryGroupID",
+                              NULL,
+       };
+
+       const char *domain_attrs[] =  {"flatname", "objectSid"};
+
+       if (domain_name) {
+               /* find the domain's DN */
+               ret_domain = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_domain, domain_attrs,
+                                         "(|(&(dnsDomain=%s)(objectClass=domainDNS))(&(flatname=%s)(objectclass=domain)))", 
+                                         domain_name, domain_name);
+               if (ret_domain == -1) {
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
 
-       if (!user_info || !auth_context) {
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+               if (ret_domain == 0) {
+                       DEBUG(3,("sam_search_user: Couldn't find domain [%s] in samdb.\n", 
+                                domain_name));
+                       return NT_STATUS_NO_SUCH_USER;
+               }
 
-       /* 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;
-       }
+               if (ret_domain > 1) {
+                       DEBUG(0,("Found %d records matching domain [%s]\n", 
+                                ret_domain, domain_name));
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
 
-       /* get the account information */
+               domain_dn = msgs_domain[0]->dn;
+       }
 
-       become_root();
-       ret = pdb_getsampwnam(sampass, user_info->internal_username.str);
-       unbecome_root();
+       /* pull the user attributes */
+       ret = gendb_search(sam_ctx, mem_ctx, domain_dn, &msgs, attrs,
+                          "(&(sAMAccountName=%s)(objectclass=user))", 
+                          account_name);
+       if (ret == -1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
 
-       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 == 0) {
+               DEBUG(3,("sam_search_user: Couldn't find user [%s] in samdb.\n", 
+                        account_name));
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       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 (ret > 1) {
+               DEBUG(0,("Found %d records matching user [%s]\n", ret, account_name));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
-       nt_status = sam_password_ok(auth_context, mem_ctx, sampass, user_info, user_sess_key);
+       if (!domain_name) {
+               const char *domain_sid;
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               pdb_free_sam(&sampass);
-               return nt_status;
-       }
+               domain_sid = samdb_result_sid_prefix(mem_ctx, msgs[0], "objectSid");
+               if (!domain_sid) {
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
 
-       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;
+               /* find the domain's DN */
+               ret_domain = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_domain, domain_attrs,
+                                         "(&(objectSid=%s)(objectclass=domain))", 
+                                         domain_sid);
+               if (ret_domain == -1) {
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+               
+               if (ret_domain == 0) {
+                       DEBUG(3,("check_sam_security: Couldn't find domain [%s] in passdb file.\n",
+                                domain_sid));
+                       return NT_STATUS_NO_SUCH_USER;
+               }
+               
+               if (ret_domain > 1) {
+                       DEBUG(0,("Found %d records matching domain [%s]\n", 
+                                ret_domain, domain_sid));
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
        }
 
-       lm_hash = pdb_get_lanman_passwd((*server_info)->sam_account);
-       if (lm_hash) {
-               memcpy((*server_info)->first_8_lm_hash, lm_hash, 8);
-       }
+       *ret_msgs = msgs;
+       *ret_msgs_domain = msgs_domain;
        
-       memcpy((*server_info)->session_key, user_sess_key, sizeof(user_sess_key));
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS authsam_authenticate(const struct auth_context *auth_context, 
+                                    TALLOC_CTX *mem_ctx, void *sam_ctx, 
+                                    struct ldb_message **msgs,
+                                    struct ldb_message **msgs_domain,
+                                    const struct auth_usersupplied_info *user_info, 
+                                    DATA_BLOB *user_sess_key, DATA_BLOB *lm_sess_key) 
+{
+       uint16_t acct_flags;
+       const char *workstation_list;
+       NTTIME acct_expiry;
+       NTTIME must_change_time;
+       NTTIME last_set_time;
+       struct samr_Password *lm_pwd, *nt_pwd;
+       NTSTATUS nt_status;
+       const char *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", 
+                        user_info->account_name));
+               return NT_STATUS_ACCOUNT_LOCKED_OUT;
+       }
+
+       nt_status = samdb_result_passwords(mem_ctx, msgs[0], &lm_pwd, &nt_pwd);
+       NT_STATUS_NOT_OK_RETURN(nt_status);
+
+       nt_status = authsam_password_ok(auth_context, mem_ctx, 
+                                       acct_flags, lm_pwd, nt_pwd,
+                                       user_info, user_sess_key, lm_sess_key);
+       NT_STATUS_NOT_OK_RETURN(nt_status);
+
+       acct_expiry = samdb_result_nttime(msgs[0], "accountExpires", 0);
+       must_change_time = samdb_result_force_password_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 = authsam_account_ok(mem_ctx, acct_flags, 
+                                      acct_expiry, 
+                                      must_change_time, 
+                                      last_set_time, 
+                                      workstation_list,
+                                      user_info);
 
        return nt_status;
 }
 
-/* module initialisation */
-NTSTATUS auth_init_sam(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+static NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, void *sam_ctx,
+                                        struct ldb_message **msgs,
+                                        struct ldb_message **msgs_domain,
+                                        DATA_BLOB user_sess_key, DATA_BLOB lm_sess_key,
+                                        struct auth_serversupplied_info **_server_info)
 {
-       if (!make_auth_methods(auth_context, auth_method)) {
-               return NT_STATUS_NO_MEMORY;
+       struct auth_serversupplied_info *server_info;
+       struct ldb_message **group_msgs;
+       int group_ret;
+       const char *group_attrs[3] = { "sAMAccountType", "objectSid", NULL }; 
+       /* find list of sids */
+       struct dom_sid **groupSIDs = NULL;
+       struct dom_sid *account_sid;
+       struct dom_sid *primary_group_sid;
+       const char *str;
+       int i;
+       uint_t rid;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+
+       group_ret = gendb_search(sam_ctx,
+                                tmp_ctx, NULL, &group_msgs, group_attrs,
+                                "(&(member=%s)(sAMAccountType=*))", 
+                                msgs[0]->dn);
+       if (group_ret == -1) {
+               talloc_free(tmp_ctx);
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       server_info = talloc(mem_ctx, struct auth_serversupplied_info);
+       NT_STATUS_HAVE_NO_MEMORY(server_info);
+       
+       if (group_ret > 0) {
+               groupSIDs = talloc_array(server_info, struct dom_sid *, group_ret);
+               NT_STATUS_HAVE_NO_MEMORY(groupSIDs);
        }
 
-       (*auth_method)->auth = check_sam_security;      
-       (*auth_method)->name = "sam";
-       return NT_STATUS_OK;
-}
+       /* Need to unroll some nested groups, but not aliases */
+       for (i = 0; i < group_ret; i++) {
+               str = ldb_msg_find_string(group_msgs[i], "objectSid", NULL);
+               groupSIDs[i] = dom_sid_parse_talloc(groupSIDs, str);
+               NT_STATUS_HAVE_NO_MEMORY(groupSIDs[i]);
+       }
 
+       talloc_free(tmp_ctx);
 
-/****************************************************************************
-Check SAM security (above) but with a few extra checks.
-****************************************************************************/
+       str = ldb_msg_find_string(msgs[0], "objectSid", NULL);
+       account_sid = dom_sid_parse_talloc(server_info, str);
+       NT_STATUS_HAVE_NO_MEMORY(account_sid);
 
-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)
-{
+       primary_group_sid = dom_sid_dup(server_info, account_sid);
+       NT_STATUS_HAVE_NO_MEMORY(primary_group_sid);
 
-       if (!user_info || !auth_context) {
-               return NT_STATUS_LOGON_FAILURE;
+       rid = samdb_result_uint(msgs[0], "primaryGroupID", ~0);
+       if (rid == ~0) {
+               if (group_ret > 0) {
+                       primary_group_sid = groupSIDs[0];
+               } else {
+                       primary_group_sid = NULL;
+               }
+       } else {
+               primary_group_sid->sub_auths[primary_group_sid->num_auths-1] = rid;
        }
 
-       /* If we are a domain member, we must not 
-          attempt to check the password locally,
-          unless it is one of our aliases. */
+       server_info->account_sid = account_sid;
+       server_info->primary_group_sid = primary_group_sid;
        
-       if (!is_myname(user_info->domain.str)) {
-               DEBUG(7,("The requested user domain is not the local server name. [%s]\\[%s]\n",
-                       user_info->domain.str,user_info->internal_username.str));
-               return NT_STATUS_NO_SUCH_USER;
+       server_info->n_domain_groups = group_ret;
+       server_info->domain_groups = groupSIDs;
+
+       server_info->account_name = talloc_reference(server_info, samdb_result_string(msgs[0], "sAMAccountName", NULL));
+
+       server_info->domain_name = talloc_reference(server_info, samdb_result_string(msgs_domain[0], "flatname", NULL));
+
+       str = samdb_result_string(msgs[0], "displayName", "");
+       server_info->full_name = talloc_strdup(server_info, str);
+       NT_STATUS_HAVE_NO_MEMORY(server_info->full_name);
+
+       str = samdb_result_string(msgs[0], "scriptPath", "");
+       server_info->logon_script = talloc_strdup(server_info, str);
+       NT_STATUS_HAVE_NO_MEMORY(server_info->logon_script);
+
+       str = samdb_result_string(msgs[0], "profilePath", "");
+       server_info->profile_path = talloc_strdup(server_info, str);
+       NT_STATUS_HAVE_NO_MEMORY(server_info->profile_path);
+
+       str = samdb_result_string(msgs[0], "homeDirectory", "");
+       server_info->home_directory = talloc_strdup(server_info, str);
+       NT_STATUS_HAVE_NO_MEMORY(server_info->home_directory);
+
+       str = samdb_result_string(msgs[0], "homeDrive", "");
+       server_info->home_drive = talloc_strdup(server_info, str);
+       NT_STATUS_HAVE_NO_MEMORY(server_info->home_drive);
+
+       server_info->last_logon = samdb_result_nttime(msgs[0], "lastLogon", 0);
+       server_info->last_logoff = samdb_result_nttime(msgs[0], "lastLogoff", 0);
+       server_info->acct_expiry = samdb_result_nttime(msgs[0], "accountExpires", 0);
+       server_info->last_password_change = samdb_result_nttime(msgs[0], "pwdLastSet", 0);
+
+       server_info->allow_password_change = samdb_result_allow_password_change(sam_ctx, mem_ctx, 
+                                                       msgs_domain[0]->dn, msgs[0], "pwdLastSet");
+       server_info->force_password_change = samdb_result_force_password_change(sam_ctx, mem_ctx, 
+                                                       msgs_domain[0]->dn, msgs[0], "pwdLastSet");
+
+       server_info->logon_count = samdb_result_uint(msgs[0], "logonCount", 0);
+       server_info->bad_password_count = samdb_result_uint(msgs[0], "badPwdCount", 0);
+
+       server_info->acct_flags = samdb_result_acct_flags(msgs[0], "userAccountControl");
+
+       server_info->user_session_key = user_sess_key;
+       server_info->lm_session_key = lm_sess_key;
+
+       server_info->authenticated = True;
+
+       *_server_info = server_info;
+
+       return NT_STATUS_OK;
+}
+
+NTSTATUS sam_get_server_info(TALLOC_CTX *mem_ctx, const char *account_name, const char *domain_name,
+                            DATA_BLOB user_sess_key, DATA_BLOB lm_sess_key,
+                            struct auth_serversupplied_info **server_info)
+{
+       NTSTATUS nt_status;
+
+       struct ldb_message **msgs;
+       struct ldb_message **domain_msgs;
+       void *sam_ctx;
+
+       sam_ctx = samdb_connect(mem_ctx);
+       if (sam_ctx == NULL) {
+               return NT_STATUS_INVALID_SYSTEM_SERVICE;
        }
-       
-       return check_sam_security(auth_context, my_private_data, mem_ctx, user_info, server_info);
+
+       nt_status = authsam_search_account(mem_ctx, sam_ctx, account_name, domain_name, &msgs, &domain_msgs);
+       NT_STATUS_NOT_OK_RETURN(nt_status);
+
+       nt_status = authsam_make_server_info(mem_ctx, sam_ctx, msgs, domain_msgs,
+                                            user_sess_key, lm_sess_key,
+                                            server_info);
+       NT_STATUS_NOT_OK_RETURN(nt_status);
+
+       talloc_free(msgs);
+       talloc_free(domain_msgs);
+
+       return NT_STATUS_OK;
 }
 
-/* module initialisation */
-NTSTATUS auth_init_samstrict(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+static NTSTATUS authsam_check_password_internals(struct auth_method_context *ctx,
+                                                TALLOC_CTX *mem_ctx,
+                                                const char *domain,
+                                                const struct auth_usersupplied_info *user_info, 
+                                                struct auth_serversupplied_info **server_info)
 {
-       if (!make_auth_methods(auth_context, auth_method)) {
-               return NT_STATUS_NO_MEMORY;
+       NTSTATUS nt_status;
+       const char *account_name = user_info->account_name;
+       struct ldb_message **msgs;
+       struct ldb_message **domain_msgs;
+       void *sam_ctx;
+       DATA_BLOB user_sess_key, lm_sess_key;
+
+       if (!account_name || !*account_name) {
+               /* 'not for me' */
+               return NT_STATUS_NOT_IMPLEMENTED;
        }
 
-       (*auth_method)->auth = check_samstrict_security;
-       (*auth_method)->name = "samstrict";
+       sam_ctx = samdb_connect(mem_ctx);
+       if (sam_ctx == NULL) {
+               return NT_STATUS_INVALID_SYSTEM_SERVICE;
+       }
+
+       nt_status = authsam_search_account(mem_ctx, sam_ctx, account_name, domain, &msgs, &domain_msgs);
+       NT_STATUS_NOT_OK_RETURN(nt_status);
+
+       nt_status = authsam_authenticate(ctx->auth_ctx, mem_ctx, sam_ctx, msgs, domain_msgs, user_info,
+                                        &user_sess_key, &lm_sess_key);
+       NT_STATUS_NOT_OK_RETURN(nt_status);
+
+       nt_status = authsam_make_server_info(mem_ctx, sam_ctx, msgs, domain_msgs,
+                                            user_sess_key, lm_sess_key,
+                                            server_info);
+       NT_STATUS_NOT_OK_RETURN(nt_status);
+
+       talloc_free(msgs);
+       talloc_free(domain_msgs);
+
        return NT_STATUS_OK;
 }
 
+static NTSTATUS authsam_ignoredomain_check_password(struct auth_method_context *ctx,
+                                                   TALLOC_CTX *mem_ctx,
+                                                   const struct auth_usersupplied_info *user_info, 
+                                                   struct auth_serversupplied_info **server_info)
+{
+       return authsam_check_password_internals(ctx, mem_ctx, NULL, user_info, server_info);
+}
+
 /****************************************************************************
-Check SAM security (above) but with a few extra checks if we're a DC.
+Check SAM security (above) but with a few extra checks.
 ****************************************************************************/
-
-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)
+static NTSTATUS authsam_check_password(struct auth_method_context *ctx,
+                                      TALLOC_CTX *mem_ctx,
+                                      const struct auth_usersupplied_info *user_info, 
+                                      struct auth_serversupplied_info **server_info)
 {
-
-       if (!user_info || !auth_context) {
-               return NT_STATUS_LOGON_FAILURE;
+       const char *domain;
+       BOOL is_local_name, is_my_domain;
+
+       is_local_name = is_myname(user_info->domain_name);
+       is_my_domain  = strequal(user_info->domain_name, lp_workgroup());
+
+       /* check whether or not we service this domain/workgroup name */
+       switch (lp_server_role()) {
+               case ROLE_STANDALONE:
+                       domain = lp_netbios_name();
+                       break;
+               case ROLE_DOMAIN_MEMBER:
+                       if (!is_local_name) {
+                               DEBUG(6,("authsam_check_password: %s is not one of my local names (%s)\n",
+                                       user_info->domain_name, (lp_server_role() == ROLE_DOMAIN_MEMBER 
+                                       ? "ROLE_DOMAIN_MEMBER" : "ROLE_STANDALONE") ));
+                               return NT_STATUS_NOT_IMPLEMENTED;
+                       }
+                       domain = lp_netbios_name();
+                       break;
+               case ROLE_DOMAIN_PDC:
+               case ROLE_DOMAIN_BDC:
+                       if (!is_local_name && !is_my_domain) {
+                               DEBUG(6,("authsam_check_password: %s is not one of my local names or domain name (DC)\n",
+                                       user_info->domain_name));
+                               return NT_STATUS_NOT_IMPLEMENTED;
+                       }
+                       domain = lp_workgroup();
+                       break;
+               default:
+                       DEBUG(6,("authsam_check_password: lp_server_role() has an undefined value\n"));
+                       return NT_STATUS_NOT_IMPLEMENTED;
        }
 
-       /* 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.*/
-       
+       return authsam_check_password_internals(ctx, mem_ctx, domain, user_info, server_info);
+}
 
-       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;
-       }               
+static const struct auth_operations sam_ignoredomain_ops = {
+       .name           = "sam_ignoredomain",
+       .get_challenge  = auth_get_challenge_not_implemented,
+       .check_password = authsam_ignoredomain_check_password
+};
 
-       return check_sam_security(auth_context, my_private_data, mem_ctx, user_info, server_info);
-}
+static const struct auth_operations sam_ops = {
+       .name           = "sam",
+       .get_challenge  = auth_get_challenge_not_implemented,
+       .check_password = authsam_check_password
+};
 
-/* module initialisation */
-NTSTATUS auth_init_samstrict_dc(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+NTSTATUS auth_sam_init(void)
 {
-       if (!make_auth_methods(auth_context, auth_method)) {
-               return NT_STATUS_NO_MEMORY;
+       NTSTATUS ret;
+
+       ret = auth_register(&sam_ops);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0,("Failed to register 'sam' auth backend!\n"));
+               return ret;
        }
 
-       (*auth_method)->auth = check_samstrict_dc_security;
-       (*auth_method)->name = "samstrict_dc";
-       return NT_STATUS_OK;
+       ret = auth_register(&sam_ignoredomain_ops);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0,("Failed to register 'sam_ignoredomain' auth backend!\n"));
+               return ret;
+       }
+
+       return ret;
 }