[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[jerry/samba.git] / source / winbindd / winbindd_cm.c

diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index 9ffb3dfb239bb6dc028c6a1ae8737d62a6141495..e12b13cbbd1b16ef5c7f7c5e7a543fc6bb2c37b6 100644 (file)
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -2224,12 +2224,6 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
  no_schannel:
        if ((lp_client_schannel() == False) ||
                        ((neg_flags & NETLOGON_NEG_SCHANNEL) == 0)) {
-
-               /*
-                * NetSamLogonEx only works for schannel
-                */
-               domain->can_do_samlogon_ex = False;
-
                /* We're done - just keep the existing connection to NETLOGON
                 * open */
                conn->netlogon_pipe = netlogon_pipe;
@@ -2261,11 +2255,6 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
                return !NT_STATUS_IS_OK(result) ? result : NT_STATUS_PIPE_NOT_AVAILABLE;
        }
 
-       /*
-        * Try NetSamLogonEx for AD domains
-        */
-       domain->can_do_samlogon_ex = domain->active_directory;
-       
        *cli = conn->netlogon_pipe;
        return NT_STATUS_OK;
 }