r25446: Merge some changes I made on the way home from SFO:
[jelmer/samba4-debian.git] / source / auth / auth_sam.c
index a6db8ef63d686d682f117482bc69985fe3fe8bfa..da1ffb5c851ffeb5e8f7f89baf8d19b8f16e6bbc 100644 (file)
@@ -7,7 +7,7 @@
    
    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,
    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 "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 #include "system/time.h"
-#include "auth/auth.h"
+#include "db_wrap.h"
 #include "lib/ldb/include/ldb.h"
+#include "auth/auth.h"
+#include "auth/auth_sam.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/security/security.h"
+#include "libcli/ldap/ldap.h"
+#include "param/param.h"
+
+extern const char *user_attrs[];
+extern const char *domain_ref_attrs[];
+
+/****************************************************************************
+ Look for the specified user in the sam, return ldb result structures
+****************************************************************************/
+
+static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, struct ldb_context *sam_ctx,
+                                      const char *account_name,
+                                      const char *domain_name,
+                                      struct ldb_message ***ret_msgs,
+                                      struct ldb_message ***ret_msgs_domain_ref)
+{
+       struct ldb_message **msgs_tmp;
+       struct ldb_message **msgs;
+       struct ldb_message **msgs_domain_ref;
+       struct ldb_dn *partitions_basedn = samdb_partitions_dn(sam_ctx, mem_ctx);
+
+       int ret;
+       int ret_domain;
+
+       struct ldb_dn *domain_dn = NULL;
+
+       if (domain_name) {
+               domain_dn = samdb_domain_to_dn(sam_ctx, mem_ctx, domain_name);
+               if (!domain_dn) {
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+       }
+
+       /* pull the user attributes */
+       ret = gendb_search(sam_ctx, mem_ctx, domain_dn, &msgs, user_attrs,
+                          "(&(sAMAccountName=%s)(objectclass=user))", 
+                          ldb_binary_encode_string(mem_ctx, account_name));
+       if (ret == -1) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       if (ret == 0) {
+               DEBUG(3,("sam_search_user: Couldn't find user [%s\\%s] in samdb, under %s\n", 
+                        domain_name, account_name, ldb_dn_get_linearized(domain_dn)));
+               return NT_STATUS_NO_SUCH_USER;
+       }
+
+       if (ret > 1) {
+               DEBUG(0,("Found %d records matching user [%s]\n", ret, account_name));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       if (!domain_dn) {
+               struct dom_sid *domain_sid;
+
+               domain_sid = samdb_result_sid_prefix(mem_ctx, msgs[0], "objectSid");
+               if (!domain_sid) {
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+
+               /* find the domain's DN */
+               ret = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_tmp, NULL,
+                                  "(&(objectSid=%s)(objectClass=domain))", 
+                                  ldap_encode_ndr_dom_sid(mem_ctx, domain_sid));
+               if (ret == -1) {
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+               
+               if (ret == 0) {
+                       DEBUG(3,("check_sam_security: Couldn't find domain_sid [%s] in passdb file.\n",
+                                dom_sid_string(mem_ctx, domain_sid)));
+                       return NT_STATUS_NO_SUCH_USER;
+               }
+               
+               if (ret > 1) {
+                       DEBUG(0,("Found %d records matching domain_sid [%s]\n", 
+                                ret, dom_sid_string(mem_ctx, domain_sid)));
+                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
+               }
+
+               domain_dn = msgs_tmp[0]->dn;
+       }
+
+       ret_domain = gendb_search(sam_ctx, mem_ctx, partitions_basedn, &msgs_domain_ref, domain_ref_attrs,
+                                 "(nCName=%s)", ldb_dn_get_linearized(domain_dn));
+       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",
+                        ldb_dn_get_linearized(msgs_tmp[0]->dn)));
+               return NT_STATUS_NO_SUCH_USER;
+       }
+               
+       if (ret_domain > 1) {
+               DEBUG(0,("Found %d records matching domain [%s]\n", 
+                        ret_domain, ldb_dn_get_linearized(msgs_tmp[0]->dn)));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       *ret_msgs = msgs;
+       *ret_msgs_domain_ref = msgs_domain_ref;
+       
+       return NT_STATUS_OK;
+}
 
 /****************************************************************************
  Do a specific test for an smb password being correct, given a smb_password and
@@ -42,7 +151,7 @@ static NTSTATUS authsam_password_ok(struct auth_context *auth_context,
        NTSTATUS status;
 
        if (acct_flags & ACB_PWNOTREQ) {
-               if (lp_null_passwords()) {
+               if (lp_null_passwords(global_loadparm)) {
                        DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", 
                                 user_info->mapped.account_name));
                        return NT_STATUS_OK;
@@ -66,7 +175,7 @@ static NTSTATUS authsam_password_ok(struct auth_context *auth_context,
                }
                user_info = user_info_temp;
 
-               /* NO break */
+               /*fall through*/
        }
        case AUTH_PASSWORD_HASH:
                *lm_sess_key = data_blob(NULL, 0);
@@ -80,7 +189,8 @@ static NTSTATUS authsam_password_ok(struct auth_context *auth_context,
                break;
                
        case AUTH_PASSWORD_RESPONSE:
-               status = ntlm_password_check(mem_ctx, &auth_context->challenge.data, 
+               status = ntlm_password_check(mem_ctx, user_info->logon_parameters, 
+                                            &auth_context->challenge.data, 
                                             &user_info->password.response.lanman, 
                                             &user_info->password.response.nt,
                                             user_info->mapped.account_name,
@@ -103,260 +213,17 @@ static NTSTATUS authsam_password_ok(struct auth_context *auth_context,
 }
 
 
-/****************************************************************************
- Do a specific test for a SAM_ACCOUNT being vaild for this connection 
- (ie not disabled, expired and the like).
-****************************************************************************/
-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)
-{
-       NTTIME now;
-       DEBUG(4,("authsam_account_ok: Checking SMB password for user %s\n", user_info->mapped.account_name));
-
-       /* Quit if the account was disabled. */
-       if (acct_flags & ACB_DISABLED) {
-               DEBUG(1,("authsam_account_ok: Account for user '%s' was disabled.\n", user_info->mapped.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->mapped.account_name));
-               return NT_STATUS_ACCOUNT_LOCKED_OUT;
-       }
-
-       /* Test account expire time */
-       unix_to_nt_time(&now, time(NULL));
-       if (now > acct_expiry) {
-               DEBUG(1,("authsam_account_ok: Account for user '%s' has expired.\n", user_info->mapped.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 (!(acct_flags & ACB_PWNOEXP)) {
-               /* check for immediate expiry "must change at next logon" */
-               if (must_change_time == 0 && last_set_time != 0) {
-                       DEBUG(1,("sam_account_ok: Account for user '%s' password must change!.\n", 
-                                user_info->mapped.account_name));
-                       return NT_STATUS_PASSWORD_MUST_CHANGE;
-               }
-
-               /* check for expired password */
-               if ((must_change_time != 0) && (must_change_time < now)) {
-                       DEBUG(1,("sam_account_ok: Account for user '%s' password expired!.\n", 
-                                user_info->mapped.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. */
-       if (workstation_list && *workstation_list) {
-               BOOL invalid_ws = True;
-               int i;
-               const char **workstations = str_list_make(mem_ctx, workstation_list, ",");
-               
-               for (i = 0; workstations[i]; i++) {
-                       DEBUG(10,("sam_account_ok: checking for workstation match '%s' and '%s'\n",
-                                 workstations[i], user_info->workstation_name));
-
-                       if (strequal(workstations[i], user_info->workstation_name)) {
-                               invalid_ws = False;
-                               break;
-                       }
-               }
-
-               talloc_free(workstations);
-
-               if (invalid_ws) {
-                       return NT_STATUS_INVALID_WORKSTATION;
-               }
-       }
-
-       if (acct_flags & ACB_DOMTRUST) {
-               DEBUG(2,("sam_account_ok: Domain trust account %s denied by server\n", user_info->mapped.account_name));
-               return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
-       }
-
-       if (acct_flags & ACB_SVRTRUST) {
-               DEBUG(2,("sam_account_ok: Server trust account %s denied by server\n", user_info->mapped.account_name));
-               return NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT;
-       }
-
-       if (acct_flags & ACB_WSTRUST) {
-               DEBUG(4,("sam_account_ok: Wksta trust account %s denied by server\n", user_info->mapped.account_name));
-               return NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT;
-       }
-
-       return NT_STATUS_OK;
-}
-
-/****************************************************************************
- Look for the specified user in the sam, return ldb result structures
-****************************************************************************/
-
-static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, struct ldb_context *sam_ctx,
-                                      const char *account_name,
-                                      const char *domain_name,
-                                      struct ldb_message ***ret_msgs,
-                                      struct ldb_message ***ret_msgs_domain)
-{
-       struct ldb_message **msgs_tmp;
-       struct ldb_message **msgs;
-       struct ldb_message **msgs_domain;
-
-       int ret;
-       int ret_domain;
-
-       const struct ldb_dn *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[] =  {"nETBIOSName", "nCName", NULL};
-
-       if (domain_name) {
-               /* find the domain's DN */
-               ret_domain = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_domain, domain_attrs,
-                                         "(&(&(|(&(dnsRoot=%s)(nETBIOSName=*))(nETBIOSName=%s))(objectclass=crossRef))(ncName=*))", 
-                                         domain_name, domain_name);
-               if (ret_domain == -1) {
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
-               }
-
-               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;
-               }
-
-               if (ret_domain > 1) {
-                       DEBUG(0,("Found %d records matching domain [%s]\n", 
-                                ret_domain, domain_name));
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
-               }
-
-               domain_dn = samdb_result_dn(mem_ctx, msgs_domain[0], "nCName", NULL);
-       }
-
-       /* 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 == 0) {
-               DEBUG(3,("sam_search_user: Couldn't find user [%s] in samdb.\n", 
-                        account_name));
-               return NT_STATUS_NO_SUCH_USER;
-       }
-
-       if (ret > 1) {
-               DEBUG(0,("Found %d records matching user [%s]\n", ret, account_name));
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
-       }
-
-       if (!domain_name) {
-               struct dom_sid *domain_sid;
-
-               domain_sid = samdb_result_sid_prefix(mem_ctx, msgs[0], "objectSid");
-               if (!domain_sid) {
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
-               }
-
-               /* find the domain's DN */
-               ret = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_tmp, NULL,
-                                  "(&(objectSid=%s)(objectclass=domain))", 
-                                  ldap_encode_ndr_dom_sid(mem_ctx, domain_sid));
-               if (ret == -1) {
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
-               }
-               
-               if (ret == 0) {
-                       DEBUG(3,("check_sam_security: Couldn't find domain_sid [%s] in passdb file.\n",
-                                dom_sid_string(mem_ctx, domain_sid)));
-                       return NT_STATUS_NO_SUCH_USER;
-               }
-               
-               if (ret > 1) {
-                       DEBUG(0,("Found %d records matching domain_sid [%s]\n", 
-                                ret, dom_sid_string(mem_ctx, domain_sid)));
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
-               }
-
-               ret_domain = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_domain, domain_attrs,
-                                         "(nCName=%s)", ldb_dn_linearize(msgs_tmp, msgs_tmp[0]->dn));
-
-               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",
-                                ldb_dn_linearize(msgs_tmp, msgs_tmp[0]->dn)));
-                       return NT_STATUS_NO_SUCH_USER;
-               }
-               
-               if (ret_domain > 1) {
-                       DEBUG(0,("Found %d records matching domain [%s]\n", 
-                                ret_domain, ldb_dn_linearize(msgs_tmp, msgs_tmp[0]->dn)));
-                       return NT_STATUS_INTERNAL_DB_CORRUPTION;
-               }
-
-       }
-
-       *ret_msgs = msgs;
-       *ret_msgs_domain = msgs_domain;
-       
-       return NT_STATUS_OK;
-}
 
 static NTSTATUS authsam_authenticate(struct auth_context *auth_context, 
                                     TALLOC_CTX *mem_ctx, struct ldb_context *sam_ctx, 
                                     struct ldb_message **msgs,
-                                    struct ldb_message **msgs_domain,
+                                    struct ldb_message **msgs_domain_ref,
                                     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;
-       struct ldb_dn *domain_dn = samdb_result_dn(mem_ctx, msgs_domain[0], "nCName", ldb_dn_new(mem_ctx));
-
-       acct_flags = samdb_result_acct_flags(msgs[0], "userAccountControl");
+       uint16_t acct_flags = samdb_result_acct_flags(msgs[0], "userAccountControl");
        
        /* Quit if the account was locked out. */
        if (acct_flags & ACB_AUTOLOCK) {
@@ -365,6 +232,13 @@ static NTSTATUS authsam_authenticate(struct auth_context *auth_context,
                return NT_STATUS_ACCOUNT_LOCKED_OUT;
        }
 
+       /* You can only do an interactive login to normal accounts */
+       if (user_info->flags & USER_INFO_INTERACTIVE_LOGON) {
+               if (!(acct_flags & ACB_NORMAL)) {
+                       return NT_STATUS_NO_SUCH_USER;
+               }
+       }
+
        nt_status = samdb_result_passwords(mem_ctx, msgs[0], &lm_pwd, &nt_pwd);
        NT_STATUS_NOT_OK_RETURN(nt_status);
 
@@ -373,172 +247,17 @@ static NTSTATUS authsam_authenticate(struct auth_context *auth_context,
                                        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);
+       nt_status = authsam_account_ok(mem_ctx, sam_ctx, 
+                                      user_info->logon_parameters,
+                                      msgs[0],
+                                      msgs_domain_ref[0],
+                                      user_info->workstation_name,
+                                      user_info->mapped.account_name);
 
        return nt_status;
 }
 
-static NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, struct ldb_context *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)
-{
-       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;
-       struct ldb_dn *ncname;
-       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=*))", 
-                                ldb_dn_linearize(tmp_ctx, 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);
-       }
-
-       /* Need to unroll some nested groups, but not aliases */
-       for (i = 0; i < group_ret; i++) {
-               groupSIDs[i] = samdb_result_dom_sid(groupSIDs, 
-                                                   group_msgs[i], "objectSid");
-               NT_STATUS_HAVE_NO_MEMORY(groupSIDs[i]);
-       }
-
-       talloc_free(tmp_ctx);
-
-       account_sid = samdb_result_dom_sid(server_info, msgs[0], "objectSid");
-       NT_STATUS_HAVE_NO_MEMORY(account_sid);
-
-       primary_group_sid = dom_sid_dup(server_info, account_sid);
-       NT_STATUS_HAVE_NO_MEMORY(primary_group_sid);
-
-       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;
-       }
-
-       server_info->account_sid = account_sid;
-       server_info->primary_group_sid = primary_group_sid;
-       
-       server_info->n_domain_groups = group_ret;
-       server_info->domain_groups = groupSIDs;
-
-       server_info->account_name = talloc_steal(server_info, samdb_result_string(msgs[0], "sAMAccountName", NULL));
-
-       server_info->domain_name = talloc_steal(server_info, samdb_result_string(msgs_domain[0], "nETBIOSName", 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);
-
-       ncname = samdb_result_dn(mem_ctx, msgs_domain[0], "nCName", ldb_dn_new(mem_ctx));
-
-       server_info->allow_password_change = samdb_result_allow_password_change(sam_ctx, mem_ctx, 
-                                                       ncname, msgs[0], "pwdLastSet");
-       server_info->force_password_change = samdb_result_force_password_change(sam_ctx, mem_ctx, 
-                                                       ncname, 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;
-       }
-
-       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;
-}
 
 static NTSTATUS authsam_check_password_internals(struct auth_method_context *ctx,
                                                 TALLOC_CTX *mem_ctx,
@@ -549,34 +268,61 @@ static NTSTATUS authsam_check_password_internals(struct auth_method_context *ctx
        NTSTATUS nt_status;
        const char *account_name = user_info->mapped.account_name;
        struct ldb_message **msgs;
-       struct ldb_message **domain_msgs;
+       struct ldb_message **domain_ref_msgs;
        struct ldb_context *sam_ctx;
        DATA_BLOB user_sess_key, lm_sess_key;
+       TALLOC_CTX *tmp_ctx;
 
        if (!account_name || !*account_name) {
                /* 'not for me' */
                return NT_STATUS_NOT_IMPLEMENTED;
        }
 
-       sam_ctx = samdb_connect(mem_ctx);
+       tmp_ctx = talloc_new(mem_ctx);
+       if (!tmp_ctx) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       sam_ctx = samdb_connect(tmp_ctx, system_session(mem_ctx));
        if (sam_ctx == NULL) {
+               talloc_free(tmp_ctx);
                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_search_account(tmp_ctx, sam_ctx, account_name, domain, &msgs, &domain_ref_msgs);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               talloc_free(tmp_ctx);
+               return nt_status;
+       }
 
-       nt_status = authsam_authenticate(ctx->auth_ctx, mem_ctx, sam_ctx, msgs, domain_msgs, user_info,
+       nt_status = authsam_authenticate(ctx->auth_ctx, tmp_ctx, sam_ctx, msgs, domain_ref_msgs, user_info,
                                         &user_sess_key, &lm_sess_key);
-       NT_STATUS_NOT_OK_RETURN(nt_status);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               talloc_free(tmp_ctx);
+               return nt_status;
+       }
 
-       nt_status = authsam_make_server_info(mem_ctx, sam_ctx, msgs, domain_msgs,
+       nt_status = authsam_make_server_info(tmp_ctx, sam_ctx, msgs[0], domain_ref_msgs[0],
                                             user_sess_key, lm_sess_key,
                                             server_info);
-       NT_STATUS_NOT_OK_RETURN(nt_status);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               talloc_free(tmp_ctx);
+               return nt_status;
+       }
 
-       talloc_free(msgs);
-       talloc_free(domain_msgs);
+       talloc_steal(mem_ctx, *server_info);
+       talloc_free(tmp_ctx);
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS authsam_ignoredomain_want_check(struct auth_method_context *ctx,
+                                               TALLOC_CTX *mem_ctx,
+                                               const struct auth_usersupplied_info *user_info)
+{
+       if (!user_info->mapped.account_name || !*user_info->mapped.account_name) {
+               return NT_STATUS_NOT_IMPLEMENTED;
+       }
 
        return NT_STATUS_OK;
 }
@@ -592,43 +338,70 @@ static NTSTATUS authsam_ignoredomain_check_password(struct auth_method_context *
 /****************************************************************************
 Check SAM security (above) but with a few extra checks.
 ****************************************************************************/
-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)
+static NTSTATUS authsam_want_check(struct auth_method_context *ctx,
+                                  TALLOC_CTX *mem_ctx,
+                                  const struct auth_usersupplied_info *user_info)
 {
-       const char *domain;
-       BOOL is_local_name, is_my_domain;
+       bool is_local_name, is_my_domain;
+
+       if (!user_info->mapped.account_name || !*user_info->mapped.account_name) {
+               return NT_STATUS_NOT_IMPLEMENTED;
+       }
 
-       is_local_name = is_myname(user_info->mapped.domain_name);
-       is_my_domain  = strequal(user_info->mapped.domain_name, lp_workgroup());
+       is_local_name = lp_is_myname(global_loadparm, 
+                                 user_info->mapped.domain_name);
+       is_my_domain  = lp_is_mydomain(global_loadparm, 
+                                      user_info->mapped.domain_name); 
 
        /* check whether or not we service this domain/workgroup name */
-       switch (lp_server_role()) {
+       switch (lp_server_role(global_loadparm)) {
                case ROLE_STANDALONE:
-                       domain = lp_netbios_name();
-                       break;
+                       return NT_STATUS_OK;
+
                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->mapped.domain_name, (lp_server_role() == ROLE_DOMAIN_MEMBER 
-                                       ? "ROLE_DOMAIN_MEMBER" : "ROLE_STANDALONE") ));
+                               DEBUG(6,("authsam_check_password: %s is not one of my local names (DOMAIN_MEMBER)\n",
+                                       user_info->mapped.domain_name));
                                return NT_STATUS_NOT_IMPLEMENTED;
                        }
-                       domain = lp_netbios_name();
-                       break;
-               case ROLE_DOMAIN_PDC:
-               case ROLE_DOMAIN_BDC:
+                       return NT_STATUS_OK;
+
+               case ROLE_DOMAIN_CONTROLLER:
                        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->mapped.domain_name));
                                return NT_STATUS_NOT_IMPLEMENTED;
                        }
-                       domain = lp_workgroup();
+                       return NT_STATUS_OK;
+       }
+
+       DEBUG(6,("authsam_check_password: lp_server_role() has an undefined value\n"));
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+/****************************************************************************
+Check SAM security (above) but with a few extra checks.
+****************************************************************************/
+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)
+{
+       const char *domain;
+
+       /* check whether or not we service this domain/workgroup name */
+       switch (lp_server_role(global_loadparm)) {
+               case ROLE_STANDALONE:
+               case ROLE_DOMAIN_MEMBER:
+                       domain = lp_netbios_name(global_loadparm);
+                       break;
+
+               case ROLE_DOMAIN_CONTROLLER:
+                       domain = lp_workgroup(global_loadparm);
                        break;
+
                default:
-                       DEBUG(6,("authsam_check_password: lp_server_role() has an undefined value\n"));
-                       return NT_STATUS_NOT_IMPLEMENTED;
+                       return NT_STATUS_NO_SUCH_USER;
        }
 
        return authsam_check_password_internals(ctx, mem_ctx, domain, user_info, server_info);
@@ -637,12 +410,14 @@ static NTSTATUS authsam_check_password(struct auth_method_context *ctx,
 static const struct auth_operations sam_ignoredomain_ops = {
        .name           = "sam_ignoredomain",
        .get_challenge  = auth_get_challenge_not_implemented,
+       .want_check     = authsam_ignoredomain_want_check,
        .check_password = authsam_ignoredomain_check_password
 };
 
 static const struct auth_operations sam_ops = {
        .name           = "sam",
        .get_challenge  = auth_get_challenge_not_implemented,
+       .want_check     = authsam_want_check,
        .check_password = authsam_check_password
 };