summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-09-11 16:15:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:38 -0500
commita3dc218f4850e2bf46ebaa85302b84d209bb7f82 (patch)
treed088aea0015130986876a8ea9c9c85e93bf59f0a /source3
parentcd45a258a7b66bd4919ac02a7f4bfbce9e4a195b (diff)
downloadsamba-a3dc218f4850e2bf46ebaa85302b84d209bb7f82.tar.gz
samba-a3dc218f4850e2bf46ebaa85302b84d209bb7f82.tar.bz2
samba-a3dc218f4850e2bf46ebaa85302b84d209bb7f82.zip
r25086: Fix interdomain trusts (this povides the fix expected in r22709):
Fix winbindd on a Samba DC talking to a trusted domain DC by making it use the trusted domain password... Michael I hope this does not brake any other setup. (This used to be commit 2322fe5cd76c5b7214c66f8a403debe1e36a82d6)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/winbindd_cm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 1a9d2bbeff..9ffb3dfb23 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -2161,7 +2161,7 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
return NT_STATUS_OK;
}
- if (domain->primary && !get_trust_pw(domain->name, mach_pwd, &sec_chan_type)) {
+ if ((IS_DC || domain->primary) && !get_trust_pw(domain->name, mach_pwd, &sec_chan_type)) {
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
@@ -2171,7 +2171,7 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
return result;
}
- if ( !domain->primary ) {
+ if ((!IS_DC) && (!domain->primary)) {
/* Clear the schannel request bit and drop down */
neg_flags &= ~NETLOGON_NEG_SCHANNEL;
goto no_schannel;