From e403d11fcb2478e2675e76d0cc9994e6dde4ceed Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 27 Sep 2005 19:39:13 +0000 Subject: r10556: BUG 3083: patch from Alex Deiter to fix checking trusted account for winbindd running on a Samba PDC (This used to be commit 24b43af642c9d41c14b9ad64704e13cc9150378d) --- source3/nsswitch/winbindd_cm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index 8a97b7ae17..14221483ad 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -1175,7 +1175,10 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain, /* if we are a DC and this is a trusted domain, then we need to use our domain name in the net_req_auth2() request */ - if ( IS_DC ) { + if ( IS_DC + && !strequal(domain->name, lp_workgroup()) + && lp_allow_trusted_domains() ) + { account_name = talloc_asprintf( mem_ctx, "%s$", lp_workgroup() ); } else { -- cgit