summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-05-26 12:38:48 +0200
committerMichael Adam <obnox@samba.org>2008-05-26 16:42:25 +0200
commitc5a030a38a520e2cd89dc061f4d2bfee57ce9d84 (patch)
tree6998d2d70aae2a6861700fbfb238184bb553839a
parent6efce4738ff28c4f24c8b80be05893bb1643a788 (diff)
downloadsamba-c5a030a38a520e2cd89dc061f4d2bfee57ce9d84.tar.gz
samba-c5a030a38a520e2cd89dc061f4d2bfee57ce9d84.tar.bz2
samba-c5a030a38a520e2cd89dc061f4d2bfee57ce9d84.zip
winbind: correctly omit check for trusted domain support in cm_prepare_connection
when checking for a trusted domain situation. This is how it was meant to be: Otherwise, with a dc-trusted-domain situation but trusted domains disabled, we would attempt to do a session setup and fail (wouldn't even get a trust password). Michael (This used to be commit a5a51ca8e5971992d9b060d66201b808bd2b7a53)
-rw-r--r--source3/winbindd/winbindd_cm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 2ee0fae6db..a1027cec97 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -808,7 +808,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
goto done;
}
- if (!is_trusted_domain_situation(domain->name) &&
+ if (!is_dc_trusted_domain_situation(domain->name) &&
(*cli)->protocol >= PROTOCOL_NT1 &&
(*cli)->capabilities & CAP_EXTENDED_SECURITY)
{