diff options
| author | Daniel Kobras <d.kobras@science-computing.de> | 2013-02-22 16:24:26 -0800 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-02-28 00:10:48 +0100 |
| commit | 3630ea12034ac17c1498ee2f81eb4788c0305782 (patch) | |
| tree | 9abdbd633e5d1025a4e5243b03dc1780b41077e8 | |
| parent | a125ebe9a5f3b9801b99bdffd12d565fc6fdcf07 (diff) | |
| download | samba-3630ea12034ac17c1498ee2f81eb4788c0305782.tar.gz samba-3630ea12034ac17c1498ee2f81eb4788c0305782.tar.bz2 samba-3630ea12034ac17c1498ee2f81eb4788c0305782.zip | |
Fix bug #9039 'map untrusted to domain' treats WORKSTATION as bogus domain.
s3: never try to map global SAM name
Do not treat the global SAM name as a BOGUS domain, and exempt
local users from mapping, instead. This change reinstates the
exact mapping behaviour of Samba 3.2 if parameter 'map untrusted
to domain' is set.
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/auth/auth_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 1367186a55..ceaa7064d5 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -125,7 +125,8 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info, * This also deals with the client passing in a "" domain */ if (!is_trusted_domain(domain) && - !strequal(domain, my_sam_name())) + !strequal(domain, my_sam_name()) && + !strequal(domain, get_global_sam_name())) { if (lp_map_untrusted_to_domain()) domain = my_sam_name(); |