diff options
| author | Gerald Carter <jerry@samba.org> | 2005-09-27 19:39:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:04:47 -0500 |
| commit | e403d11fcb2478e2675e76d0cc9994e6dde4ceed (patch) | |
| tree | 42e66def24e569bda2c5f1a44df566350f5e7ad8 /source3/nsswitch | |
| parent | 291963446795813098fc1c89bf7e4db55414806f (diff) | |
| download | samba-e403d11fcb2478e2675e76d0cc9994e6dde4ceed.tar.gz samba-e403d11fcb2478e2675e76d0cc9994e6dde4ceed.tar.bz2 samba-e403d11fcb2478e2675e76d0cc9994e6dde4ceed.zip | |
r10556: BUG 3083: patch from Alex Deiter <tiamat@komi.mts.ru> to fix checking trusted account for winbindd running on a Samba PDC
(This used to be commit 24b43af642c9d41c14b9ad64704e13cc9150378d)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 { |