From f8f79a3070f7d1cdc100a7fb63a6472c755dca86 Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Mon, 20 Feb 2012 19:03:38 +0100 Subject: [PATCH 1/2] s3:auth only map unknown domain names for standalone servers for a domain member, we should not map because of known issues with trustdom cache but for a standalone machine, we still need to map unknown domain names to the local SAM --- 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 18e4783..36a6ae0 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -119,7 +119,8 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info, * non-domain member box will also map to WORKSTATION\user. * This also deals with the client passing in a "" domain */ - if (!is_trusted_domain(domain) && + if (lp_server_role() != ROLE_DOMAIN_MEMBER && + !is_trusted_domain(domain) && !strequal(domain, my_sam_name())) { if (lp_map_untrusted_to_domain()) -- 1.7.11.7 From fe0bee9ac91b38783d62d93c6092eab52ededeb5 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 23 Feb 2012 16:12:38 +0100 Subject: [PATCH 2/2] s3:winbindd do not set shell for user info from logon cache shell will be filled again later to the template shell --- source3/winbindd/wb_queryuser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/winbindd/wb_queryuser.c b/source3/winbindd/wb_queryuser.c index e356116..a3a3dcb 100644 --- a/source3/winbindd/wb_queryuser.c +++ b/source3/winbindd/wb_queryuser.c @@ -65,7 +65,7 @@ struct tevent_req *wb_queryuser_send(TALLOC_CTX *mem_ctx, state->info->homedir = talloc_strdup( state->info, ""); state->info->shell = talloc_strdup( - state->info, "/bin/false"); + state->info, ""); TALLOC_FREE(info3); tevent_req_done(req); return tevent_req_post(req, ev); -- 1.7.11.7