diff options
| author | Gerald Carter <jerry@samba.org> | 2003-07-01 04:11:42 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-07-01 04:11:42 +0000 |
| commit | 0362868fa73bc339d40625ec0adade05fb80a9a7 (patch) | |
| tree | 17acecf9b626b64edac66b620af971c238ae9ea9 /source3/auth/auth_util.c | |
| parent | db6ce132e360a42ea6843c81429be194662fce39 (diff) | |
| download | samba-0362868fa73bc339d40625ec0adade05fb80a9a7.tar.gz samba-0362868fa73bc339d40625ec0adade05fb80a9a7.tar.bz2 samba-0362868fa73bc339d40625ec0adade05fb80a9a7.zip | |
* 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)
Diffstat (limited to 'source3/auth/auth_util.c')
| -rw-r--r-- | source3/auth/auth_util.c | 14 |
1 files changed, 5 insertions, 9 deletions
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); } /**************************************************************************** |