From 0362868fa73bc339d40625ec0adade05fb80a9a7 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 1 Jul 2003 04:11:42 +0000 Subject: * revert change to get_global_sam_name() * add get_default_sam_name() to be used by make_user_info_map() * add comments describing get_*_sam_name() (This used to be commit 90470366ea4bdb8021a3453c4bbeb29f009668c1) --- source3/auth/auth_util.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'source3/auth/auth_util.c') diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 5185f876c6..ab08a28ff6 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -214,20 +214,16 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info, domain = lp_workgroup(); /* do what win2k does. Always map unknown domains to our own - and let the "passdb backend" handle unknown users */ + and let the "passdb backend" handle unknown users. */ if ( !is_trusted_domain(domain) ) - domain = get_global_sam_name(); + domain = get_default_sam_name(); /* we know that it is a trusted domain (and we are allowing them) or it is our domain */ - return make_user_info(user_info, - smb_name, internal_username, - client_domain, domain, - wksta_name, - lm_pwd, nt_pwd, - plaintext, - ntlmssp_flags, encrypted); + return make_user_info(user_info, smb_name, internal_username, + client_domain, domain, wksta_name, lm_pwd, nt_pwd, + plaintext, ntlmssp_flags, encrypted); } /**************************************************************************** -- cgit