summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-08-08 05:11:11 +0000
committerGerald Carter <jerry@samba.org>2003-08-08 05:11:11 +0000
commit56bb027696d5d0c8b72fe9d37d09b00f60b62ca1 (patch)
tree773727f9e22d8ecdcdc6a5b124ef90f6f987eda4
parent2a091c4e898a527293ec9a9cce7468722c9dfd57 (diff)
downloadsamba-56bb027696d5d0c8b72fe9d37d09b00f60b62ca1.tar.gz
samba-56bb027696d5d0c8b72fe9d37d09b00f60b62ca1.tar.bz2
samba-56bb027696d5d0c8b72fe9d37d09b00f60b62ca1.zip
need to be able to connect to a domain member as a local account; don't always map to the domain name
(This used to be commit 20b6e64da2669e5dfc7265cae331ec9c89aa02dc)
-rw-r--r--source3/auth/auth_util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 5403ee8c39..061cc7345b 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -216,8 +216,8 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
client_domain, smb_name, wksta_name));
/* don't allow "" as a domain, fixes a Win9X bug
- where it doens't supply a domain for logon script
- 'net use' commands.*/
+ where it doens't supply a domain for logon script
+ 'net use' commands. */
if ( *client_domain )
domain = client_domain;
@@ -227,7 +227,7 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
/* do what win2k does. Always map unknown domains to our own
and let the "passdb backend" handle unknown users. */
- if ( !is_trusted_domain(domain) )
+ if ( !is_trusted_domain(domain) && !strequal(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 */