1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00

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 commit is contained in:
Michael Adam 2007-09-11 16:15:36 +00:00 committed by Gerald (Jerry) Carter
parent 7e4dcf8e7e
commit 2322fe5cd7

View File

@ -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;