git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2919634
)
r10556: BUG 3083: patch from Alex Deiter <tiamat@komi.mts.ru> to fix checking trusted...
author
Gerald Carter
<jerry@samba.org>
Tue, 27 Sep 2005 19:39:13 +0000
(19:39 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 16:04:47 +0000
(11:04 -0500)
(This used to be commit
24b43af642c9d41c14b9ad64704e13cc9150378d
)
source3/nsswitch/winbindd_cm.c
patch
|
blob
|
history
diff --git
a/source3/nsswitch/winbindd_cm.c
b/source3/nsswitch/winbindd_cm.c
index 8a97b7ae17a26ea5a3be96dbd7539758a982f143..14221483adc5f075deb140488ea5b1f677b9bb0c 100644
(file)
--- 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 {