From 3630ea12034ac17c1498ee2f81eb4788c0305782 Mon Sep 17 00:00:00 2001 From: Daniel Kobras Date: Fri, 22 Feb 2013 16:24:26 -0800 Subject: [PATCH] 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 Reviewed-by: Michael Adam --- source3/auth/auth_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 1367186..ceaa706 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(); -- 1.8.1.3