]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
winbind: correctly omit check for trusted domain support in cm_prepare_connection
authorMichael Adam <obnox@samba.org>
Mon, 26 May 2008 10:38:48 +0000 (12:38 +0200)
committerMichael Adam <obnox@samba.org>
Mon, 26 May 2008 14:42:25 +0000 (16:42 +0200)
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)

source3/winbindd/winbindd_cm.c

index 2ee0fae6db958452ebe06e0671ef65f0ea4dcf36..a1027cec9719b7e87a9e82c7ebf25e74c07a9bbf 100644 (file)
@@ -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)
        {