summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-24 16:51:30 +0100
committerVolker Lendecke <vl@samba.org>2009-11-24 16:55:30 +0100
commitde63a5ad91eabb22c58338779ddb4bc16ab647ac (patch)
tree8ce925bf713c571b49e42c1f3c8a106b8fddee67
parente92470d4427bda74537c4ecf79a7e888a1e16963 (diff)
downloadsamba-de63a5ad91eabb22c58338779ddb4bc16ab647ac.tar.gz
samba-de63a5ad91eabb22c58338779ddb4bc16ab647ac.tar.bz2
samba-de63a5ad91eabb22c58338779ddb4bc16ab647ac.zip
s3: Always try SamLogonEx
Required for cluster systems working in a Samba domain. With NT4 this won't work, but real NT4 DCs should not be around in environments that pay big bucks for a cluster... And if they are, they can always install a Samba DC trusting that NT4 domain.
-rw-r--r--source3/winbindd/winbindd_cm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 95e1daf0b7..e310d426a2 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2471,9 +2471,13 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
}
/*
- * Try NetSamLogonEx for AD domains
+ * Always try netr_LogonSamLogonEx. We will fall back for NT4
+ * which gives DCERPC_FAULT_OP_RNG_ERROR (function not
+ * supported). We used to only try SamLogonEx for AD, but
+ * Samba DCs can also do it. And because we don't distinguish
+ * between Samba and NT4, always try it once.
*/
- domain->can_do_samlogon_ex = domain->active_directory;
+ domain->can_do_samlogon_ex = true;
*cli = conn->netlogon_pipe;
return NT_STATUS_OK;