The branch, v3-6-test has been updated via 180ef28 Fix bug #9039 'map untrusted to domain' treats WORKSTATION as bogus domain. from b174e1b pdb: Fix array overrun by one. Reviewed-by: Alexander Bokovoy <a...@samba.org>
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 180ef28a4874026740e3b5381fe4d25fb70167bf Author: Daniel Kobras <d.kob...@science-computing.de> Date: Fri Feb 22 16:24:26 2013 -0800 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 <j...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/auth/auth_util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 1daddcd..47a8a09 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -120,7 +120,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(); -- Samba Shared Repository