[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-453-g2586dc3

[gd@xxxxxxxxx (Günther Deschner)]

The branch, v3-2-test has been updated
       via  2586dc34e0f72204749f5bf10c8135cd3a753a42 (commit)
      from  9024aecdbf5d4df9996625f0cc8ce8a5ecdd247e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 2586dc34e0f72204749f5bf10c8135cd3a753a42
Author: Günther Deschner <gd@xxxxxxxxx>
Date:   Wed Mar 26 21:08:53 2008 +0100

    Fix winbind NETLOGON cred chain on a samba dc for w2k8 trusts.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/winbindd_cm.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index c715ac0..d4241a0 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -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) {


-- 
Samba Shared Repository