summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-03-26 21:08:53 +0100
committerGünther Deschner <gd@samba.org>2008-03-26 21:11:53 +0100
commit06772e7f6561d32e9cc7b15811815e3368b2beae (patch)
tree258a7e28914607c7b627e98bee6f03d25f9e442f /source3
parent6dbcf6f0f3f56679b22b6c25b2d5099256ecbeaa (diff)
downloadsamba-06772e7f6561d32e9cc7b15811815e3368b2beae.tar.gz
samba-06772e7f6561d32e9cc7b15811815e3368b2beae.tar.bz2
samba-06772e7f6561d32e9cc7b15811815e3368b2beae.zip
Fix winbind NETLOGON cred chain on a samba dc for w2k8 trusts.
Guenther (This used to be commit 2586dc34e0f72204749f5bf10c8135cd3a753a42)
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd_cm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index c715ac08d8..d4241a0c78 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/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) {