[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-11-g9b5ed88

[Günther Deschner]

The branch, v3-0-test has been updated
       via  9b5ed88d4ae6885bc70f7c9ef4f10c381af7260e (commit)
      from  851585790d6945c8db06f506ea1ece925d4984d1 (commit)

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


- Log -----------------------------------------------------------------
commit 9b5ed88d4ae6885bc70f7c9ef4f10c381af7260e
Author: Günther Deschner <gd at samba.org>
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/nsswitch/winbindd_cm.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbindd_cm.c b/source/nsswitch/winbindd_cm.c
index 14c3fc1..7f6076e 100644
--- a/source/nsswitch/winbindd_cm.c
+++ b/source/nsswitch/winbindd_cm.c
@@ -2027,7 +2027,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;
@@ -2040,6 +2040,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