Fix winbind NETLOGON cred chain on a samba dc for w2k8 trusts.
authorGünther Deschner <gd@samba.org>
Wed, 26 Mar 2008 20:08:53 +0000 (21:08 +0100)
committerGünther Deschner <gd@samba.org>
Wed, 26 Mar 2008 20:11:53 +0000 (21:11 +0100)
Guenther
(This used to be commit 2586dc34e0f72204749f5bf10c8135cd3a753a42)

source3/winbindd/winbindd_cm.c

index c715ac08d82e5b05c451305909c2f75e9786dc2d..d4241a0c7822ba36b4af34cd886f14e0b9dea12c 100644 (file)
@@ -2335,7 +2335,7 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
        struct winbindd_cm_conn *conn;
        NTSTATUS result;
 
-       uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS;
+       uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS;
        uint8  mach_pwd[16];
        uint32  sec_chan_type;
        const char *account_name;
@@ -2348,6 +2348,10 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
                return result;
        }
 
+       if (domain->active_directory) {
+               neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
+       }
+
        conn = &domain->conn;
 
        if (conn->netlogon_pipe != NULL) {