r17943: The horror, the horror. Add KDC site support by
[tprouty/samba.git] / source / nsswitch / winbindd_cm.c
index dbcfdcf88f9887c7261e714101c75be8f0bcb757..a09faaed949bc588cd1c2bb162b4059b0b2943d4 100644 (file)
@@ -3,8 +3,10 @@
 
    Winbind daemon connection manager
 
-   Copyright (C) Tim Potter 2001
-   Copyright (C) Andrew Bartlett 2002
+   Copyright (C) Tim Potter                2001
+   Copyright (C) Andrew Bartlett           2002
+   Copyright (C) Gerald (Jerry) Carter     2003-2005.
+   Copyright (C) Volker Lendecke           2004-2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
      - I'm pretty annoyed by all the make_nmb_name() stuff.  It should be
        moved down into another function.
 
-     - There needs to be a utility function in libsmb/namequery.c that does
-       cm_get_dc_name() 
-
      - Take care when destroying cli_structs as they can be shared between
        various sam handles.
 
  */
 
+#include "includes.h"
 #include "winbindd.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-/* Global list of connections. Initially a DLIST but can become a hash
-   table or whatever later. */
 
-struct winbindd_cm_conn {
-       struct winbindd_cm_conn *prev, *next;
-       fstring domain;
-       fstring controller;
-       fstring pipe_name;
-       size_t mutex_ref_count;
-       struct cli_state *cli;
-       POLICY_HND pol;
-};
+/* Choose between anonymous or authenticated connections.  We need to use
+   an authenticated connection if DCs have the RestrictAnonymous registry
+   entry set > 0, or the "Additional restrictions for anonymous
+   connections" set in the win2k Local Security Policy. 
+   
+   Caller to free() result in domain, username, password
+*/
 
-static struct winbindd_cm_conn *cm_conns = NULL;
+static void cm_get_ipc_userpass(char **username, char **domain, char **password)
+{
+       *username = (char *)secrets_fetch(SECRETS_AUTH_USER, NULL);
+       *domain = (char *)secrets_fetch(SECRETS_AUTH_DOMAIN, NULL);
+       *password = (char *)secrets_fetch(SECRETS_AUTH_PASSWORD, NULL);
+       
+       if (*username && **username) {
 
-/* Get a domain controller name.  Cache positive and negative lookups so we
-   don't go to the network too often when something is badly broken. */
+               if (!*domain || !**domain)
+                       *domain = smb_xstrdup(lp_workgroup());
+               
+               if (!*password || !**password)
+                       *password = smb_xstrdup("");
 
-#define GET_DC_NAME_CACHE_TIMEOUT 30 /* Seconds between dc lookups */
+               DEBUG(3, ("cm_get_ipc_userpass: Retrieved auth-user from secrets.tdb [%s\\%s]\n", 
+                         *domain, *username));
 
-struct get_dc_name_cache {
-       fstring domain_name;
-       fstring srv_name;
-       time_t lookup_time;
-       struct get_dc_name_cache *prev, *next;
-};
+       } else {
+               DEBUG(3, ("cm_get_ipc_userpass: No auth-user defined\n"));
+               *username = smb_xstrdup("");
+               *domain = smb_xstrdup("");
+               *password = smb_xstrdup("");
+       }
+}
 
-/*
-  find the DC for a domain using methods appropriate for a ADS domain
-*/
-static BOOL cm_ads_find_dc(const char *domain, struct in_addr *dc_ip, fstring srv_name)
+static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain,
+                                    fstring dcname, struct in_addr *dc_ip)
 {
-       ADS_STRUCT *ads;
-       const char *realm = domain;
+       struct winbindd_domain *our_domain = NULL;
+       struct rpc_pipe_client *netlogon_pipe = NULL;
+       NTSTATUS result;
+       TALLOC_CTX *mem_ctx;
+
+       fstring tmp;
+       char *p;
 
-       if (strcasecmp(realm, lp_workgroup()) == 0)
-               realm = lp_realm();
+       /* Hmmmm. We can only open one connection to the NETLOGON pipe at the
+        * moment.... */
 
-       ads = ads_init(realm, domain, NULL);
-       if (!ads)
+       if (IS_DC) {
                return False;
+       }
 
-       /* we don't need to bind, just connect */
-       ads->auth.flags |= ADS_AUTH_NO_BIND;
+       if (domain->primary) {
+               return False;
+       }
 
-       DEBUG(4,("cm_ads_find_dc: domain=%s\n", domain));
+       our_domain = find_our_domain();
 
-#ifdef HAVE_ADS
-       /* a full ads_connect() is actually overkill, as we don't srictly need
-          to do the SASL auth in order to get the info we need, but libads
-          doesn't offer a better way right now */
-       ads_connect(ads);
-#endif
+       if ((mem_ctx = talloc_init("get_dc_name_via_netlogon")) == NULL) {
+               return False;
+       }
 
-       if (!ads->config.realm)
+       result = cm_connect_netlogon(our_domain, &netlogon_pipe);
+       if (!NT_STATUS_IS_OK(result)) {
                return False;
+       }
 
-       fstrcpy(srv_name, ads->config.ldap_server_name);
-       strupper(srv_name);
-       *dc_ip = ads->ldap_ip;
-       ads_destroy(&ads);
-       
-       DEBUG(4,("cm_ads_find_dc: using server='%s' IP=%s\n",
-                srv_name, inet_ntoa(*dc_ip)));
-       
-       return True;
-}
+       result = rpccli_netlogon_getdcname(netlogon_pipe, mem_ctx, our_domain->dcname,
+                                          domain->name, tmp);
 
+       talloc_destroy(mem_ctx);
 
+       if (!NT_STATUS_IS_OK(result)) {
+               DEBUG(10, ("rpccli_netlogon_getdcname failed: %s\n",
+                          nt_errstr(result)));
+               return False;
+       }
 
-static BOOL cm_get_dc_name(const char *domain, fstring srv_name, struct in_addr *ip_out)
-{
-       static struct get_dc_name_cache *get_dc_name_cache;
-       struct get_dc_name_cache *dcc;
-       struct in_addr dc_ip;
-       BOOL ret;
+       /* cli_netlogon_getdcname gives us a name with \\ */
+       p = tmp;
+       if (*p == '\\') {
+               p+=1;
+       }
+       if (*p == '\\') {
+               p+=1;
+       }
 
-       /* Check the cache for previous lookups */
+       fstrcpy(dcname, p);
 
-       for (dcc = get_dc_name_cache; dcc; dcc = dcc->next) {
+       DEBUG(10, ("rpccli_netlogon_getdcname returned %s\n", dcname));
 
-               if (!strequal(domain, dcc->domain_name))
-                       continue; /* Not our domain */
+       if (!resolve_name(dcname, dc_ip, 0x20)) {
+               return False;
+       }
 
-               if ((time(NULL) - dcc->lookup_time) > 
-                   GET_DC_NAME_CACHE_TIMEOUT) {
+       return True;
+}
 
-                       /* Cache entry has expired, delete it */
+/************************************************************************
+ Given a fd with a just-connected TCP connection to a DC, open a connection
+ to the pipe.
+************************************************************************/
 
-                       DEBUG(10, ("get_dc_name_cache entry expired for %s\n", domain));
+static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
+                                     const int sockfd,
+                                     const char *controller,
+                                     struct cli_state **cli,
+                                     BOOL *retry)
+{
+       char *machine_password, *machine_krb5_principal, *machine_account;
+       char *ipc_username, *ipc_domain, *ipc_password;
 
-                       DLIST_REMOVE(get_dc_name_cache, dcc);
-                       SAFE_FREE(dcc);
+       BOOL got_mutex;
 
-                       break;
-               }
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
-               /* Return a positive or negative lookup for this domain */
+       struct sockaddr peeraddr;
+       socklen_t peeraddr_len;
 
-               if (dcc->srv_name[0]) {
-                       DEBUG(10, ("returning positive get_dc_name_cache entry for %s\n", domain));
-                       fstrcpy(srv_name, dcc->srv_name);
-                       return True;
-               } else {
-                       DEBUG(10, ("returning negative get_dc_name_cache entry for %s\n", domain));
-                       return False;
-               }
+       struct sockaddr_in *peeraddr_in = (struct sockaddr_in *)&peeraddr;
+
+       machine_password = secrets_fetch_machine_password(lp_workgroup(), NULL,
+                                                         NULL);
+       
+       if (asprintf(&machine_account, "%s$", global_myname()) == -1) {
+               SAFE_FREE(machine_password);
+               return NT_STATUS_NO_MEMORY;
        }
 
-       /* Add cache entry for this lookup. */
+       if (asprintf(&machine_krb5_principal, "%s$@%s", global_myname(),
+                    lp_realm()) == -1) {
+               SAFE_FREE(machine_account);
+               SAFE_FREE(machine_password);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       DEBUG(10, ("Creating get_dc_name_cache entry for %s\n", domain));
+       cm_get_ipc_userpass(&ipc_username, &ipc_domain, &ipc_password);
 
-       if (!(dcc = (struct get_dc_name_cache *) 
-             malloc(sizeof(struct get_dc_name_cache))))
-               return False;
+       *retry = True;
 
-       ZERO_STRUCTP(dcc);
+       got_mutex = secrets_named_mutex(controller,
+                                       WINBIND_SERVER_MUTEX_WAIT_TIME);
 
-       fstrcpy(dcc->domain_name, domain);
-       dcc->lookup_time = time(NULL);
+       if (!got_mutex) {
+               DEBUG(0,("cm_prepare_connection: mutex grab failed for %s\n",
+                        controller));
+               result = NT_STATUS_POSSIBLE_DEADLOCK;
+               goto done;
+       }
 
-       DLIST_ADD(get_dc_name_cache, dcc);
+       if ((*cli = cli_initialise()) == NULL) {
+               DEBUG(1, ("Could not cli_initialize\n"));
+               result = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
-       zero_ip(&dc_ip);
+       (*cli)->timeout = 10000;        /* 10 seconds */
+       (*cli)->fd = sockfd;
+       fstrcpy((*cli)->desthost, controller);
+       (*cli)->use_kerberos = True;
 
-       ret = False;
-       if (lp_security() == SEC_ADS)
-               ret = cm_ads_find_dc(domain, &dc_ip, srv_name);
+       peeraddr_len = sizeof(peeraddr);
 
-       if (!ret) {
-               /* fall back on rpc methods if the ADS methods fail */
-               ret = rpc_find_dc(domain, srv_name, &dc_ip);
+       if ((getpeername((*cli)->fd, &peeraddr, &peeraddr_len) != 0) ||
+           (peeraddr_len != sizeof(struct sockaddr_in)) ||
+           (peeraddr_in->sin_family != PF_INET))
+       {
+               DEBUG(0,("cm_prepare_connection: %s\n", strerror(errno)));
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
-       if (!ret)
-               return False;
+       if (ntohs(peeraddr_in->sin_port) == 139) {
+               struct nmb_name calling;
+               struct nmb_name called;
 
-       /* We have a name so make the cache entry positive now */
-       fstrcpy(dcc->srv_name, srv_name);
+               make_nmb_name(&calling, global_myname(), 0x0);
+               make_nmb_name(&called, "*SMBSERVER", 0x20);
 
-       DEBUG(3, ("cm_get_dc_name: Returning DC %s (%s) for domain %s\n", srv_name,
-                 inet_ntoa(dc_ip), domain));
+               if (!cli_session_request(*cli, &calling, &called)) {
+                       DEBUG(8, ("cli_session_request failed for %s\n",
+                                 controller));
+                       result = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
+               }
+       }
 
-       *ip_out = dc_ip;
+       cli_setup_signing_state(*cli, Undefined);
 
-       return True;
-}
+       if (!cli_negprot(*cli)) {
+               DEBUG(1, ("cli_negprot failed\n"));
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+                       
+       if ((*cli)->protocol >= PROTOCOL_NT1 && (*cli)->capabilities & CAP_EXTENDED_SECURITY) {
+               ADS_STATUS ads_status;
 
-/* Choose between anonymous or authenticated connections.  We need to use
-   an authenticated connection if DCs have the RestrictAnonymous registry
-   entry set > 0, or the "Additional restrictions for anonymous
-   connections" set in the win2k Local Security Policy. 
-   
-   Caller to free() result in domain, username, password
-*/
+               if (lp_security() == SEC_ADS) {
 
-static void cm_get_ipc_userpass(char **username, char **domain, char **password)
-{
-       *username = secrets_fetch(SECRETS_AUTH_USER, NULL);
-       *domain = secrets_fetch(SECRETS_AUTH_DOMAIN, NULL);
-       *password = secrets_fetch(SECRETS_AUTH_PASSWORD, NULL);
-       
-       if (*username && **username) {
+                       /* Try a krb5 session */
 
-               if (!*domain || !**domain)
-                       *domain = smb_xstrdup(lp_workgroup());
-               
-               if (!*password || !**password)
-                       *password = smb_xstrdup("");
+                       (*cli)->use_kerberos = True;
+                       DEBUG(5, ("connecting to %s from %s with kerberos principal "
+                                 "[%s]\n", controller, global_myname(),
+                                 machine_krb5_principal));
 
-               DEBUG(3, ("IPC$ connections done by user %s\\%s\n", 
-                         *domain, *username));
+                       ads_status = cli_session_setup_spnego(*cli,
+                                                             machine_krb5_principal, 
+                                                             machine_password, 
+                                                             lp_workgroup());
 
-       } else {
-               DEBUG(3, ("IPC$ connections done anonymously\n"));
-               *username = smb_xstrdup("");
-               *domain = smb_xstrdup("");
-               *password = smb_xstrdup("");
-       }
-}
+                       if (!ADS_ERR_OK(ads_status)) {
+                               DEBUG(4,("failed kerberos session setup with %s\n",
+                                        ads_errstr(ads_status)));
+                       }
 
-/* Open a new smb pipe connection to a DC on a given domain.  Cache
-   negative creation attempts so we don't try and connect to broken
-   machines too often. */
+                       result = ads_ntstatus(ads_status);
+                       if (NT_STATUS_IS_OK(result)) {
+                               /* Ensure creds are stored for NTLMSSP authenticated pipe access. */
+                               cli_init_creds(*cli, machine_account, lp_workgroup(), machine_password);
+                               goto session_setup_done;
+                       }
+               }
 
-#define FAILED_CONNECTION_CACHE_TIMEOUT 30 /* Seconds between attempts */
+               /* Fall back to non-kerberos session setup using NTLMSSP SPNEGO with the machine account. */
+               (*cli)->use_kerberos = False;
 
-struct failed_connection_cache {
-       fstring domain_name;
-       fstring controller;
-       time_t lookup_time;
-       NTSTATUS nt_status;
-       struct failed_connection_cache *prev, *next;
-};
+               DEBUG(5, ("connecting to %s from %s with username "
+                         "[%s]\\[%s]\n",  controller, global_myname(),
+                         lp_workgroup(), machine_account));
 
-static struct failed_connection_cache *failed_connection_cache;
+               ads_status = cli_session_setup_spnego(*cli,
+                                                     machine_account, 
+                                                     machine_password, 
+                                                     lp_workgroup());
+               if (!ADS_ERR_OK(ads_status)) {
+                       DEBUG(4, ("authenticated session setup failed with %s\n",
+                               ads_errstr(ads_status)));
+               }
 
-/* Add an entry to the failed conneciton cache */
+               result = ads_ntstatus(ads_status);
+               if (NT_STATUS_IS_OK(result)) {
+                       /* Ensure creds are stored for NTLMSSP authenticated pipe access. */
+                       cli_init_creds(*cli, machine_account, lp_workgroup(), machine_password);
+                       goto session_setup_done;
+               }
+       }
 
-static void add_failed_connection_entry(struct winbindd_cm_conn *new_conn, 
-                                       NTSTATUS result) 
-{
-       struct failed_connection_cache *fcc;
+       /* Fall back to non-kerberos session setup */
+
+       (*cli)->use_kerberos = False;
+
+       if ((((*cli)->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) != 0) &&
+           (strlen(ipc_username) > 0)) {
 
-       SMB_ASSERT(!NT_STATUS_IS_OK(result));
+               /* Only try authenticated if we have a username */
 
-       /* Check we already aren't in the cache */
+               DEBUG(5, ("connecting to %s from %s with username "
+                         "[%s]\\[%s]\n",  controller, global_myname(),
+                         ipc_domain, ipc_username));
 
-       for (fcc = failed_connection_cache; fcc; fcc = fcc->next) {
-               if (strequal(fcc->domain_name, new_conn->domain)) {
-                       DEBUG(10, ("domain %s already tried and failed\n",
-                                  fcc->domain_name));
-                       return;
+               if (NT_STATUS_IS_OK(cli_session_setup(
+                                           *cli, ipc_username,
+                                           ipc_password, strlen(ipc_password)+1,
+                                           ipc_password, strlen(ipc_password)+1,
+                                           ipc_domain))) {
+                       /* Successful logon with given username. */
+                       cli_init_creds(*cli, ipc_username, ipc_domain, ipc_password);
+                       goto session_setup_done;
+               } else {
+                       DEBUG(4, ("authenticated session setup with user %s\\%s failed.\n",
+                               ipc_domain, ipc_username ));
                }
        }
 
-       /* Create negative lookup cache entry for this domain and controller */
+       /* Fall back to anonymous connection, this might fail later */
 
-       if (!(fcc = (struct failed_connection_cache *)
-             malloc(sizeof(struct failed_connection_cache)))) {
-               DEBUG(0, ("malloc failed in add_failed_connection_entry!\n"));
-               return;
+       if (NT_STATUS_IS_OK(cli_session_setup(*cli, "", NULL, 0,
+                                             NULL, 0, ""))) {
+               DEBUG(5, ("Connected anonymously\n"));
+               cli_init_creds(*cli, "", "", "");
+               goto session_setup_done;
        }
-       
-       ZERO_STRUCTP(fcc);
-       
-       fstrcpy(fcc->domain_name, new_conn->domain);
-       fstrcpy(fcc->controller, new_conn->controller);
-       fcc->lookup_time = time(NULL);
-       fcc->nt_status = result;
-       
-       DLIST_ADD(failed_connection_cache, fcc);
-}
-       
-/* Open a connction to the remote server, cache failures for 30 seconds */
 
-static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
-                              struct winbindd_cm_conn *new_conn)
-{
-       struct failed_connection_cache *fcc;
-       NTSTATUS result;
-       char *ipc_username, *ipc_domain, *ipc_password;
-       struct in_addr dc_ip;
-       int i;
-       BOOL retry = True;
+       result = cli_nt_error(*cli);
 
-       ZERO_STRUCT(dc_ip);
+       if (NT_STATUS_IS_OK(result))
+               result = NT_STATUS_UNSUCCESSFUL;
 
-       fstrcpy(new_conn->domain, domain);
-       fstrcpy(new_conn->pipe_name, get_pipe_name_from_index(pipe_index));
-       
-       /* Look for a domain controller for this domain.  Negative results
-          are cached so don't bother applying the caching for this
-          function just yet.  */
+       /* We can't session setup */
 
-       if (!cm_get_dc_name(domain, new_conn->controller, &dc_ip)) {
-               result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
-               add_failed_connection_entry(new_conn, result);
-               return result;
-       }
-               
-       /* Return false if we have tried to look up this domain and netbios
-          name before and failed. */
+       goto done;
 
-       for (fcc = failed_connection_cache; fcc; fcc = fcc->next) {
-               
-               if (!(strequal(domain, fcc->domain_name) &&
-                     strequal(new_conn->controller, fcc->controller)))
-                       continue; /* Not our domain */
-
-               if ((time(NULL) - fcc->lookup_time) > 
-                   FAILED_CONNECTION_CACHE_TIMEOUT) {
+ session_setup_done:
 
-                       /* Cache entry has expired, delete it */
+       /* cache the server name for later connections */
 
-                       DEBUG(10, ("cm_open_connection cache entry expired for %s, %s\n", domain, new_conn->controller));
+       saf_store( domain->name, (*cli)->desthost );
 
-                       DLIST_REMOVE(failed_connection_cache, fcc);
-                       free(fcc);
+       if (!cli_send_tconX(*cli, "IPC$", "IPC", "", 0)) {
 
-                       break;
-               }
+               result = cli_nt_error(*cli);
 
-               /* The timeout hasn't expired yet so return false */
+               DEBUG(1,("failed tcon_X with %s\n", nt_errstr(result)));
 
-               DEBUG(10, ("returning negative open_connection_cache entry for %s, %s\n", domain, new_conn->controller));
+               if (NT_STATUS_IS_OK(result))
+                       result = NT_STATUS_UNSUCCESSFUL;
 
-               result = fcc->nt_status;
-               SMB_ASSERT(!NT_STATUS_IS_OK(result));
-               return result;
+               goto done;
        }
 
-       /* Initialise SMB connection */
+       secrets_named_mutex_release(controller);
+       got_mutex = False;
+       *retry = False;
 
-       cm_get_ipc_userpass(&ipc_username, &ipc_domain, &ipc_password);
+       /* set the domain if empty; needed for schannel connections */
+       if ( !*(*cli)->domain ) {
+               fstrcpy( (*cli)->domain, domain->name );
+       }
 
-       DEBUG(5, ("connecting to %s from %s with username [%s]\\[%s]\n", 
-             new_conn->controller, global_myname(), ipc_domain, ipc_username));
+       result = NT_STATUS_OK;
 
-       for (i = 0; retry && (i < 3); i++) {
-               BOOL got_mutex;
-               if (!(got_mutex = secrets_named_mutex(new_conn->controller, WINBIND_SERVER_MUTEX_WAIT_TIME))) {
-                       DEBUG(0,("cm_open_connection: mutex grab failed for %s\n", new_conn->controller));
-                       result = NT_STATUS_POSSIBLE_DEADLOCK;
-                       continue;
-               }
-               
-               result = cli_full_connection(&new_conn->cli, global_myname(), new_conn->controller, 
-                                            &dc_ip, 0, "IPC$", "IPC", ipc_username, ipc_domain, 
-                                            ipc_password, CLI_FULL_CONNECTION_ANNONYMOUS_FALLBACK, &retry);
-               
-               secrets_named_mutex_release(new_conn->controller);
-
-               if (NT_STATUS_IS_OK(result))
-                       break;
+ done:
+       if (got_mutex) {
+               secrets_named_mutex_release(controller);
        }
 
+       SAFE_FREE(machine_account);
+       SAFE_FREE(machine_password);
+       SAFE_FREE(machine_krb5_principal);
        SAFE_FREE(ipc_username);
        SAFE_FREE(ipc_domain);
        SAFE_FREE(ipc_password);
 
        if (!NT_STATUS_IS_OK(result)) {
-               add_failed_connection_entry(new_conn, result);
-               return result;
+               add_failed_connection_entry(domain->name, controller, result);
+               if ((*cli) != NULL) {
+                       cli_shutdown(*cli);
+                       *cli = NULL;
+               }
        }
-       
-       if ( !cli_nt_session_open (new_conn->cli, pipe_index) ) {
-               result = NT_STATUS_PIPE_NOT_AVAILABLE;
-               /* 
-                * only cache a failure if we are not trying to open the 
-                * **win2k** specific lsarpc UUID.  This could be an NT PDC 
-                * and therefore a failure is normal.  This should probably
-                * be abstracted to a check for 2k specific pipes and wondering
-                * if the PDC is an NT4 box.   but since there is only one 2k 
-                * specific UUID right now, i'm not going to bother.  --jerry
-                */
-               if ( !is_win2k_pipe(pipe_index) )
-                       add_failed_connection_entry(new_conn, result);
-               cli_shutdown(new_conn->cli);
-               return result;
+
+       return result;
+}
+
+struct dc_name_ip {
+       fstring name;
+       struct in_addr ip;
+};
+
+static BOOL add_one_dc_unique(TALLOC_CTX *mem_ctx, const char *domain_name,
+                             const char *dcname, struct in_addr ip,
+                             struct dc_name_ip **dcs, int *num)
+{
+       if (!NT_STATUS_IS_OK(check_negative_conn_cache(domain_name, dcname))) {
+               DEBUG(10, ("DC %s was in the negative conn cache\n", dcname));
+               return False;
        }
 
-       return NT_STATUS_OK;
+       *dcs = TALLOC_REALLOC_ARRAY(mem_ctx, *dcs, struct dc_name_ip, (*num)+1);
+
+       if (*dcs == NULL)
+               return False;
+
+       fstrcpy((*dcs)[*num].name, dcname);
+       (*dcs)[*num].ip = ip;
+       *num += 1;
+       return True;
 }
 
-/* Return true if a connection is still alive */
+static BOOL add_sockaddr_to_array(TALLOC_CTX *mem_ctx,
+                                 struct in_addr ip, uint16 port,
+                                 struct sockaddr_in **addrs, int *num)
+{
+       *addrs = TALLOC_REALLOC_ARRAY(mem_ctx, *addrs, struct sockaddr_in, (*num)+1);
+
+       if (*addrs == NULL)
+               return False;
+
+       (*addrs)[*num].sin_family = PF_INET;
+       putip((char *)&((*addrs)[*num].sin_addr), (char *)&ip);
+       (*addrs)[*num].sin_port = htons(port);
+
+       *num += 1;
+       return True;
+}
+
+static void mailslot_name(struct in_addr dc_ip, fstring name)
+{
+       fstr_sprintf(name, "\\MAILSLOT\\NET\\GETDC%X", dc_ip.s_addr);
+}
+
+static BOOL send_getdc_request(struct in_addr dc_ip,
+                              const char *domain_name,
+                              const DOM_SID *sid)
+{
+       pstring outbuf;
+       char *p;
+       fstring my_acct_name;
+       fstring my_mailslot;
+
+       mailslot_name(dc_ip, my_mailslot);
+
+       memset(outbuf, '\0', sizeof(outbuf));
+
+       p = outbuf;
+
+       SCVAL(p, 0, SAMLOGON);
+       p++;
+
+       SCVAL(p, 0, 0); /* Count pointer ... */
+       p++;
 
-static BOOL connection_ok(struct winbindd_cm_conn *conn)
+       SIVAL(p, 0, 0); /* The sender's token ... */
+       p += 2;
+
+       p += dos_PutUniCode(p, global_myname(), sizeof(pstring), True);
+       fstr_sprintf(my_acct_name, "%s$", global_myname());
+       p += dos_PutUniCode(p, my_acct_name, sizeof(pstring), True);
+
+       memcpy(p, my_mailslot, strlen(my_mailslot)+1);
+       p += strlen(my_mailslot)+1;
+
+       SIVAL(p, 0, 0x80);
+       p+=4;
+
+       SIVAL(p, 0, sid_size(sid));
+       p+=4;
+
+       p = ALIGN4(p, outbuf);
+
+       sid_linearize(p, sid_size(sid), sid);
+       p += sid_size(sid);
+
+       SIVAL(p, 0, 1);
+       SSVAL(p, 4, 0xffff);
+       SSVAL(p, 6, 0xffff);
+       p+=8;
+
+       return cli_send_mailslot(False, "\\MAILSLOT\\NET\\NTLOGON", 0,
+                                outbuf, PTR_DIFF(p, outbuf),
+                                global_myname(), 0, domain_name, 0x1c,
+                                dc_ip);
+}
+
+static BOOL receive_getdc_response(struct in_addr dc_ip,
+                                  const char *domain_name,
+                                  fstring dc_name)
 {
-       if (!conn) {
-               smb_panic("Invalid paramater passed to conneciton_ok():  conn was NULL!\n");
+       struct packet_struct *packet;
+       fstring my_mailslot;
+       char *buf, *p;
+       fstring dcname, user, domain;
+       int len;
+
+       mailslot_name(dc_ip, my_mailslot);
+
+       packet = receive_unexpected(DGRAM_PACKET, 0, my_mailslot);
+
+       if (packet == NULL) {
+               DEBUG(5, ("Did not receive packet for %s\n", my_mailslot));
                return False;
        }
 
-       if (!conn->cli) {
-               DEBUG(0, ("Connection to %s for domain %s (pipe %s) has NULL conn->cli!\n", 
-                         conn->controller, conn->domain, conn->pipe_name));
-               smb_panic("connection_ok: conn->cli was null!");
+       DEBUG(5, ("Received packet for %s\n", my_mailslot));
+
+       buf = packet->packet.dgram.data;
+       len = packet->packet.dgram.datasize;
+
+       if (len < 70) {
+               /* 70 is a completely arbitrary value to make sure
+                  the SVAL below does not read uninitialized memory */
+               DEBUG(3, ("GetDC got short response\n"));
                return False;
        }
 
-       if (!conn->cli->initialised) {
-               DEBUG(0, ("Connection to %s for domain %s (pipe %s) was never initialised!\n", 
-                         conn->controller, conn->domain, conn->pipe_name));
-               smb_panic("connection_ok: conn->cli->initialised is False!");
+       /* This should be (buf-4)+SVAL(buf-4, smb_vwv12)... */
+       p = buf+SVAL(buf, smb_vwv10);
+
+       if (CVAL(p,0) != SAMLOGON_R) {
+               DEBUG(8, ("GetDC got invalid response type %d\n", CVAL(p, 0)));
                return False;
        }
 
-       if (conn->cli->fd == -1) {
-               DEBUG(3, ("Connection to %s for domain %s (pipe %s) has died or was never started (fd == -1)\n", 
-                         conn->controller, conn->domain, conn->pipe_name));
+       p+=2;
+       pull_ucs2(buf, dcname, p, sizeof(dcname), PTR_DIFF(buf+len, p),
+                 STR_TERMINATE|STR_NOALIGN);
+       p = skip_unibuf(p, PTR_DIFF(buf+len, p));
+       pull_ucs2(buf, user, p, sizeof(dcname), PTR_DIFF(buf+len, p),
+                 STR_TERMINATE|STR_NOALIGN);
+       p = skip_unibuf(p, PTR_DIFF(buf+len, p));
+       pull_ucs2(buf, domain, p, sizeof(dcname), PTR_DIFF(buf+len, p),
+                 STR_TERMINATE|STR_NOALIGN);
+       p = skip_unibuf(p, PTR_DIFF(buf+len, p));
+
+       if (!strequal(domain, domain_name)) {
+               DEBUG(3, ("GetDC: Expected domain %s, got %s\n",
+                         domain_name, domain));
                return False;
        }
-       
+
+       p = dcname;
+       if (*p == '\\') p += 1;
+       if (*p == '\\') p += 1;
+
+       fstrcpy(dc_name, p);
+
+       DEBUG(10, ("GetDC gave name %s for domain %s\n",
+                  dc_name, domain));
+
        return True;
 }
 
-/* Get a connection to the remote DC and open the pipe.  If there is already a connection, use that */
+/*******************************************************************
+ convert an ip to a name
+*******************************************************************/
 
-static NTSTATUS get_connection_from_cache(const char *domain, const char *pipe_name,
-               struct winbindd_cm_conn **conn_out) 
+static BOOL dcip_to_name( const char *domainname, const char *realm, 
+                          const DOM_SID *sid, struct in_addr ip, fstring name )
 {
-       struct winbindd_cm_conn *conn, conn_temp;
-       NTSTATUS result;
+       struct ip_service ip_list;
 
-       for (conn = cm_conns; conn; conn = conn->next) {
-               if (strequal(conn->domain, domain) && 
-                   strequal(conn->pipe_name, pipe_name)) {
-                       if (!connection_ok(conn)) {
-                               if (conn->cli)
-                                       cli_shutdown(conn->cli);
-                               ZERO_STRUCT(conn_temp);
-                               conn_temp.next = conn->next;
-                               DLIST_REMOVE(cm_conns, conn);
-                               SAFE_FREE(conn);
-                               conn = &conn_temp;  /* Just to keep the loop moving */
-                       } else {
-                               break;
+       ip_list.ip = ip;
+       ip_list.port = 0;
+
+#ifdef WITH_ADS
+       /* For active directory servers, try to get the ldap server name.
+          None of these failures should be considered critical for now */
+
+       if ( lp_security() == SEC_ADS ) {
+               ADS_STRUCT *ads;
+
+               ads = ads_init(realm, domainname, NULL);
+               ads->auth.flags |= ADS_AUTH_NO_BIND;
+
+               if (ads_try_connect( ads, inet_ntoa(ip) ) )  {
+                       const char *sitename = sitename_fetch();
+                       /* We got a cldap packet. */
+                       fstrcpy(name, ads->config.ldap_server_name);
+                       namecache_store(name, 0x20, 1, &ip_list);
+
+#ifdef HAVE_KRB5
+                       if ((ads->config.flags & ADS_KDC) && sitename) {
+                               /* We're going to use this KDC for this realm/domain.
+                                  If we are using sites, then force the krb5 libs
+                                  to use this KDC. */
+
+                               create_local_private_krb5_conf_for_domain(realm,
+                                                               domainname,
+                                                               ip);
                        }
+#endif
+                       SAFE_FREE(sitename);
+                       ads_destroy( &ads );
+                       return True;
                }
+
+               ads_destroy( &ads );
        }
+#endif
+
+       /* try GETDC requests next */
        
-       if (!conn) {
-               if (!(conn = malloc(sizeof(*conn))))
-                       return NT_STATUS_NO_MEMORY;
-               
-               ZERO_STRUCTP(conn);
-               
-               if (!NT_STATUS_IS_OK(result = cm_open_connection(domain, get_pipe_index(pipe_name), conn))) {
-                       DEBUG(3, ("Could not open a connection to %s for %s (%s)\n", 
-                                 domain, pipe_name, nt_errstr(result)));
-                       SAFE_FREE(conn);
-                       return result;
+       if (send_getdc_request(ip, domainname, sid)) {
+               int i;
+               smb_msleep(100);
+               for (i=0; i<5; i++) {
+                       if (receive_getdc_response(ip, domainname, name)) {
+                               namecache_store(name, 0x20, 1, &ip_list);
+                               return True;
+                       }
+                       smb_msleep(500);
                }
-               DLIST_ADD(cm_conns, conn);              
        }
-       
-       *conn_out = conn;
-       return NT_STATUS_OK;
+
+       /* try node status request */
+
+       if ( name_status_find(domainname, 0x1c, 0x20, ip, name) ) {
+               namecache_store(name, 0x20, 1, &ip_list);
+               return True;
+       }
+       return False;
 }
 
+/*******************************************************************
+ Retreive a list of IP address for domain controllers.  Fill in 
+ the dcs[]  with results.
+*******************************************************************/
 
-/**********************************************************************************
-**********************************************************************************/
+static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain,
+                   struct dc_name_ip **dcs, int *num_dcs)
+{
+       fstring dcname;
+       struct  in_addr ip;
+       struct  ip_service *ip_list = NULL;
+       int     iplist_size = 0;
+       int     i;
+       BOOL    is_our_domain;
+       enum security_types sec = (enum security_types)lp_security();
+
+       is_our_domain = strequal(domain->name, lp_workgroup());
+
+       if ( !is_our_domain 
+               && get_dc_name_via_netlogon(domain, dcname, &ip) 
+               && add_one_dc_unique(mem_ctx, domain->name, dcname, ip, dcs, num_dcs) )
+       {
+               DEBUG(10, ("Retrieved DC %s at %s via netlogon\n",
+                          dcname, inet_ntoa(ip)));
+               return True;
+       }
+
+#ifdef WITH_ADS
+       if (sec == SEC_ADS) {
+               /* We need to make sure we know the local site before
+                  doing any DNS queries, as this will restrict the
+                  get_sorted_dc_list() call below to only fetching
+                  DNS records for the correct site. */
+
+               /* Find any DC to get the site record.
+                  We deliberately don't care about the
+                  return here. */
+               get_dc_name(domain->name, lp_realm(), dcname, &ip);
+        }
+#endif
+
+       /* try standard netbios queries first */
+
+       get_sorted_dc_list(domain->name, &ip_list, &iplist_size, False);
+
+       /* check for security = ads and use DNS if we can */
+
+       if ( iplist_size==0 && sec == SEC_ADS ) 
+               get_sorted_dc_list(domain->alt_name, &ip_list, &iplist_size, True);
+
+       /* FIXME!! this is where we should re-insert the GETDC requests --jerry */
+
+       /* now add to the dc array.  We'll wait until the last minute 
+          to look up the name of the DC.  But we fill in the char* for 
+          the ip now in to make the failed connection cache work */
+
+       for ( i=0; i<iplist_size; i++ ) {
+               add_one_dc_unique(mem_ctx, domain->name, inet_ntoa(ip_list[i].ip), 
+                       ip_list[i].ip, dcs, num_dcs);
+       }
+
+       SAFE_FREE( ip_list );
+
+       return True;
+}
 
-BOOL cm_check_for_native_mode_win2k( const char *domain )
+static BOOL find_new_dc(TALLOC_CTX *mem_ctx,
+                       const struct winbindd_domain *domain,
+                       fstring dcname, struct sockaddr_in *addr, int *fd)
 {
-       NTSTATUS                result;
-       struct winbindd_cm_conn conn;
-       DS_DOMINFO_CTR          ctr;
-       BOOL                    ret = False;
-       
-       ZERO_STRUCT( conn );
-       ZERO_STRUCT( ctr );
-       
-       
-       if ( !NT_STATUS_IS_OK(result = cm_open_connection(domain, PI_LSARPC_DS, &conn)) ) {
-               DEBUG(5, ("cm_check_for_native_mode_win2k: Could not open a connection to %s for PIPE_LSARPC (%s)\n", 
-                         domain, nt_errstr(result)));
+       struct dc_name_ip *dcs = NULL;
+       int num_dcs = 0;
+
+       const char **dcnames = NULL;
+       int num_dcnames = 0;
+
+       struct sockaddr_in *addrs = NULL;
+       int num_addrs = 0;
+
+       int i, fd_index;
+
+ again:
+       if (!get_dcs(mem_ctx, domain, &dcs, &num_dcs) || (num_dcs == 0))
                return False;
+
+       for (i=0; i<num_dcs; i++) {
+
+               add_string_to_array(mem_ctx, dcs[i].name,
+                                   &dcnames, &num_dcnames);
+               add_sockaddr_to_array(mem_ctx, dcs[i].ip, 445,
+                                     &addrs, &num_addrs);
+
+               add_string_to_array(mem_ctx, dcs[i].name,
+                                   &dcnames, &num_dcnames);
+               add_sockaddr_to_array(mem_ctx, dcs[i].ip, 139,
+                                     &addrs, &num_addrs);
        }
-       
-       if ( conn.cli ) {
-               if ( !NT_STATUS_IS_OK(cli_ds_getprimarydominfo( conn.cli, 
-                               conn.cli->mem_ctx, DsRolePrimaryDomainInfoBasic, &ctr)) ) {
-                       ret = False;
-                       goto done;
+
+       if ((num_dcnames == 0) || (num_dcnames != num_addrs))
+               return False;
+
+       if ((addrs == NULL) || (dcnames == NULL))
+               return False;
+
+       if ( !open_any_socket_out(addrs, num_addrs, 10000, &fd_index, fd) ) 
+       {
+               for (i=0; i<num_dcs; i++) {
+                       add_failed_connection_entry(domain->name,
+                               dcs[i].name, NT_STATUS_UNSUCCESSFUL);
                }
+               return False;
        }
-                               
-       if ( (ctr.basic->flags & DSROLE_PRIMARY_DS_RUNNING) 
-                       && !(ctr.basic->flags & DSROLE_PRIMARY_DS_MIXED_MODE) )
-               ret = True;
 
-done:
-       if ( conn.cli )
-               cli_shutdown( conn.cli );
-       
-       return ret;
-}
+       *addr = addrs[fd_index];
 
+       if (*dcnames[fd_index] != '\0' && !is_ipaddress(dcnames[fd_index])) {
+               /* Ok, we've got a name for the DC */
+               fstrcpy(dcname, dcnames[fd_index]);
+               return True;
+       }
 
+       /* Try to figure out the name */
+       if (dcip_to_name( domain->name, domain->alt_name, &domain->sid,
+                         addr->sin_addr, dcname )) {
+               return True;
+       }
 
-/* Return a LSA policy handle on a domain */
+       /* We can not continue without the DC's name */
+       add_failed_connection_entry(domain->name, dcs[fd_index].name,
+                                   NT_STATUS_UNSUCCESSFUL);
+       goto again;
+}
 
-CLI_POLICY_HND *cm_get_lsa_handle(const char *domain)
+static NTSTATUS cm_open_connection(struct winbindd_domain *domain,
+                                  struct winbindd_cm_conn *new_conn)
 {
-       struct winbindd_cm_conn *conn;
-       uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       TALLOC_CTX *mem_ctx;
        NTSTATUS result;
-       static CLI_POLICY_HND hnd;
+       char *saf_servername = saf_fetch( domain->name );
+       int retries;
+
+       if ((mem_ctx = talloc_init("cm_open_connection")) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       /* we have to check the server affinity cache here since 
+          later we selecte a DC based on response time and not preference */
+          
+       if ( saf_servername ) 
+       {
+               /* convert an ip address to a name */
+               if ( is_ipaddress( saf_servername ) )
+               {
+                       fstring saf_name;
+                       struct in_addr ip;
+
+                       ip = *interpret_addr2( saf_servername );
+                       if (dcip_to_name( domain->name, domain->alt_name,
+                                         &domain->sid, ip, saf_name )) {
+                               fstrcpy( domain->dcname, saf_name );
+                       } else {
+                               add_failed_connection_entry(
+                                       domain->name, saf_servername,
+                                       NT_STATUS_UNSUCCESSFUL);
+                       }
+               } 
+               else 
+               {
+                       fstrcpy( domain->dcname, saf_servername );
+               }
 
-       /* Look for existing connections */
+               SAFE_FREE( saf_servername );
+       }
 
-       if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_LSARPC, &conn)))
-               return NULL;
+       for (retries = 0; retries < 3; retries++) {
 
-       /* This *shitty* code needs scrapping ! JRA */
-       if (policy_handle_is_valid(&conn->pol)) {
-               hnd.pol = conn->pol;
-               hnd.cli = conn->cli;
-               return &hnd;
-       }
-       
-       result = cli_lsa_open_policy(conn->cli, conn->cli->mem_ctx, False, 
-                                    des_access, &conn->pol);
+               int fd = -1;
+               BOOL retry = False;
 
-       if (!NT_STATUS_IS_OK(result)) {
-               /* Hit the cache code again.  This cleans out the old connection and gets a new one */
-               if (conn->cli->fd == -1) { /* Try again, if the remote host disapeared */
-                       if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_LSARPC, &conn)))
-                               return NULL;
+               result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+
+               if ((strlen(domain->dcname) > 0)
+                       && NT_STATUS_IS_OK(check_negative_conn_cache( domain->name, domain->dcname))
+                       && (resolve_name(domain->dcname, &domain->dcaddr.sin_addr, 0x20)))
+               {
+                       struct sockaddr_in *addrs = NULL;
+                       int num_addrs = 0;
+                       int dummy = 0;
 
-                       result = cli_lsa_open_policy(conn->cli, conn->cli->mem_ctx, False, 
-                                                    des_access, &conn->pol);
+                       add_sockaddr_to_array(mem_ctx, domain->dcaddr.sin_addr, 445, &addrs, &num_addrs);
+                       add_sockaddr_to_array(mem_ctx, domain->dcaddr.sin_addr, 139, &addrs, &num_addrs);
+
+                       if (!open_any_socket_out(addrs, num_addrs, 10000, &dummy, &fd)) {
+                               domain->online = False;
+                               fd = -1;
+                       }
                }
 
-               if (!NT_STATUS_IS_OK(result)) {
-                       cli_shutdown(conn->cli);
-                       DLIST_REMOVE(cm_conns, conn);
-                       SAFE_FREE(conn);
-                       return NULL;
+               if ((fd == -1) 
+                       && !find_new_dc(mem_ctx, domain, domain->dcname, &domain->dcaddr, &fd))
+               {
+                       /* This is the one place where we will
+                          set the global winbindd offline state
+                          to true, if a "WINBINDD_OFFLINE" entry
+                          is found in the winbindd cache. */
+                       set_global_winbindd_state_offline();
+                       domain->online = False;
+                       break;
                }
-       }       
 
-       hnd.pol = conn->pol;
-       hnd.cli = conn->cli;
+               new_conn->cli = NULL;
+
+               result = cm_prepare_connection(domain, fd, domain->dcname,
+                       &new_conn->cli, &retry);
+
+               if (!retry)
+                       break;
+       }
 
-       return &hnd;
+       if (NT_STATUS_IS_OK(result)) {
+               if (domain->online == False) {
+                       /* We're changing state from offline to online. */
+                       set_global_winbindd_state_online();
+               }
+               domain->online = True;
+       }
+
+       talloc_destroy(mem_ctx);
+       return result;
 }
 
-/* Return a SAM policy handle on a domain */
+/* Close down all open pipes on a connection. */
 
-CLI_POLICY_HND *cm_get_sam_handle(char *domain)
-{ 
-       struct winbindd_cm_conn *conn;
-       uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       NTSTATUS result;
-       static CLI_POLICY_HND hnd;
+void invalidate_cm_connection(struct winbindd_cm_conn *conn)
+{
+       if (conn->samr_pipe != NULL) {
+               cli_rpc_pipe_close(conn->samr_pipe);
+               conn->samr_pipe = NULL;
+       }
 
-       /* Look for existing connections */
+       if (conn->lsa_pipe != NULL) {
+               cli_rpc_pipe_close(conn->lsa_pipe);
+               conn->lsa_pipe = NULL;
+       }
 
-       if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_SAMR, &conn)))
-               return NULL;
-       
-       /* This *shitty* code needs scrapping ! JRA */
-       if (policy_handle_is_valid(&conn->pol)) {
-               hnd.pol = conn->pol;
-               hnd.cli = conn->cli;
-               return &hnd;
+       if (conn->netlogon_pipe != NULL) {
+               cli_rpc_pipe_close(conn->netlogon_pipe);
+               conn->netlogon_pipe = NULL;
        }
-       result = cli_samr_connect(conn->cli, conn->cli->mem_ctx,
-                                 des_access, &conn->pol);
 
-       if (!NT_STATUS_IS_OK(result)) {
-               /* Hit the cache code again.  This cleans out the old connection and gets a new one */
-               if (conn->cli->fd == -1) { /* Try again, if the remote host disapeared */
-                       if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_SAMR, &conn)))
-                               return NULL;
+       if (conn->cli) {
+               cli_shutdown(conn->cli);
+       }
 
-                       result = cli_samr_connect(conn->cli, conn->cli->mem_ctx,
-                                                 des_access, &conn->pol);
-               }
+       conn->cli = NULL;
+}
 
-               if (!NT_STATUS_IS_OK(result)) {
-                       cli_shutdown(conn->cli);
-                       DLIST_REMOVE(cm_conns, conn);
-                       SAFE_FREE(conn);
-                       return NULL;
-               }
-       }       
+void close_conns_after_fork(void)
+{
+       struct winbindd_domain *domain;
+
+       for (domain = domain_list(); domain; domain = domain->next) {
+               if (domain->conn.cli == NULL)
+                       continue;
 
-       hnd.pol = conn->pol;
-       hnd.cli = conn->cli;
+               if (domain->conn.cli->fd == -1)
+                       continue;
 
-       return &hnd;
+               close(domain->conn.cli->fd);
+               domain->conn.cli->fd = -1;
+       }
 }
 
-#if 0  /* This code now *well* out of date */
+static BOOL connection_ok(struct winbindd_domain *domain)
+{
+       if (domain->conn.cli == NULL) {
+               DEBUG(8, ("Connection to %s for domain %s has NULL "
+                         "cli!\n", domain->dcname, domain->name));
+               return False;
+       }
 
-/* Return a SAM domain policy handle on a domain */
+       if (!domain->conn.cli->initialised) {
+               DEBUG(3, ("Connection to %s for domain %s was never "
+                         "initialised!\n", domain->dcname, domain->name));
+               return False;
+       }
 
-CLI_POLICY_HND *cm_get_sam_dom_handle(char *domain, DOM_SID *domain_sid)
+       if (domain->conn.cli->fd == -1) {
+               DEBUG(3, ("Connection to %s for domain %s has died or was "
+                         "never started (fd == -1)\n", 
+                         domain->dcname, domain->name));
+               return False;
+       }
+
+       return True;
+}
+       
+/* Initialize a new connection up to the RPC BIND. */
+
+static NTSTATUS init_dc_connection(struct winbindd_domain *domain)
 {
-       struct winbindd_cm_conn *conn, *basic_conn = NULL;
-       static CLI_POLICY_HND hnd;
-       NTSTATUS result;
-       uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       if (connection_ok(domain))
+               return NT_STATUS_OK;
 
-       /* Look for existing connections */
+       invalidate_cm_connection(&domain->conn);
 
-       for (conn = cm_conns; conn; conn = conn->next) {
-               if (strequal(conn->domain, domain) &&
-                   strequal(conn->pipe_name, PIPE_SAMR) &&
-                   conn->pipe_data.samr.pipe_type == SAM_PIPE_DOM) {
+       return cm_open_connection(domain, &domain->conn);
+}
 
-                       if (!connection_ok(conn)) {
-                               /* Shutdown cli?  Free conn?  Allow retry of DC? */
-                               DLIST_REMOVE(cm_conns, conn);
-                               return NULL;
-                       }
+/******************************************************************************
+ We can 'sense' certain things about the DC by it's replies to certain
+ questions.
 
-                       goto ok;
-               }
+ This tells us if this particular remote server is Active Directory, and if it
+ is native mode.
+******************************************************************************/
+
+void set_dc_type_and_flags( struct winbindd_domain *domain )
+{
+       NTSTATUS                result;
+       DS_DOMINFO_CTR          ctr;
+       TALLOC_CTX              *mem_ctx = NULL;
+       struct rpc_pipe_client  *cli;
+       POLICY_HND pol;
+       
+       char *domain_name = NULL;
+       char *dns_name = NULL;
+       DOM_SID *dom_sid = NULL;
+
+       ZERO_STRUCT( ctr );
+       
+       domain->native_mode = False;
+       domain->active_directory = False;
+
+       if (domain->internal) {
+               domain->initialized = True;
+               return;
        }
 
-       /* Create a basic handle to open a domain handle from */
+       result = init_dc_connection(domain);
+       if (!NT_STATUS_IS_OK(result)) {
+               DEBUG(5, ("set_dc_type_and_flags: Could not open a connection "
+                         "to %s: (%s)\n", domain->name, nt_errstr(result)));
+               domain->initialized = True;
+               return;
+       }
 
-       if (!cm_get_sam_handle(domain))
-               return False;
+       cli = cli_rpc_pipe_open_noauth(domain->conn.cli, PI_LSARPC_DS,
+                                      &result);
 
-       for (conn = cm_conns; conn; conn = conn->next) {
-               if (strequal(conn->domain, domain) &&
-                   strequal(conn->pipe_name, PIPE_SAMR) &&
-                   conn->pipe_data.samr.pipe_type == SAM_PIPE_BASIC)
-                       basic_conn = conn;
+       if (cli == NULL) {
+               DEBUG(5, ("set_dc_type_and_flags: Could not bind to "
+                         "PI_LSARPC_DS on domain %s: (%s)\n",
+                         domain->name, nt_errstr(result)));
+               domain->initialized = True;
+               return;
+       }
+
+       result = rpccli_ds_getprimarydominfo(cli, cli->cli->mem_ctx,
+                                            DsRolePrimaryDomainInfoBasic,
+                                            &ctr);
+       cli_rpc_pipe_close(cli);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               domain->initialized = True;
+               return;
        }
        
-       if (!(conn = (struct winbindd_cm_conn *)
-             malloc(sizeof(struct winbindd_cm_conn))))
-               return NULL;
-       
-       ZERO_STRUCTP(conn);
+       if ((ctr.basic->flags & DSROLE_PRIMARY_DS_RUNNING) &&
+           !(ctr.basic->flags & DSROLE_PRIMARY_DS_MIXED_MODE) )
+               domain->native_mode = True;
 
-       fstrcpy(conn->domain, basic_conn->domain);
-       fstrcpy(conn->controller, basic_conn->controller);
-       fstrcpy(conn->pipe_name, basic_conn->pipe_name);
+       cli = cli_rpc_pipe_open_noauth(domain->conn.cli, PI_LSARPC, &result);
 
-       conn->pipe_data.samr.pipe_type = SAM_PIPE_DOM;
-       conn->cli = basic_conn->cli;
+       if (cli == NULL) {
+               domain->initialized = True;
+               return;
+       }
 
-       result = cli_samr_open_domain(conn->cli, conn->cli->mem_ctx,
-                                     &basic_conn->pol, des_access, 
-                                     domain_sid, &conn->pol);
+       mem_ctx = talloc_init("set_dc_type_and_flags on domain %s\n",
+                             domain->name);
+       if (!mem_ctx) {
+               DEBUG(1, ("set_dc_type_and_flags: talloc_init() failed\n"));
+               cli_rpc_pipe_close(cli);
+               return;
+       }
 
-       if (!NT_STATUS_IS_OK(result))
-               return NULL;
+       result = rpccli_lsa_open_policy2(cli, mem_ctx, True, 
+                                        SEC_RIGHTS_MAXIMUM_ALLOWED, &pol);
+               
+       if (NT_STATUS_IS_OK(result)) {
+               /* This particular query is exactly what Win2k clients use 
+                  to determine that the DC is active directory */
+               result = rpccli_lsa_query_info_policy2(cli, mem_ctx, &pol,
+                                                      12, &domain_name,
+                                                      &dns_name, NULL,
+                                                      NULL, &dom_sid);
+       }
 
-       /* Add to list */
+       if (NT_STATUS_IS_OK(result)) {
+               if (domain_name)
+                       fstrcpy(domain->name, domain_name);
 
-       DLIST_ADD(cm_conns, conn);
+               if (dns_name)
+                       fstrcpy(domain->alt_name, dns_name);
 
- ok:
-       hnd.pol = conn->pol;
-       hnd.cli = conn->cli;
+               if (dom_sid) 
+                       sid_copy(&domain->sid, dom_sid);
+
+               domain->active_directory = True;
+       } else {
+               
+               result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
+                                               SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                               &pol);
+                       
+               if (!NT_STATUS_IS_OK(result))
+                       goto done;
+                       
+               result = rpccli_lsa_query_info_policy(cli, mem_ctx, 
+                                                     &pol, 5, &domain_name, 
+                                                     &dom_sid);
+                       
+               if (NT_STATUS_IS_OK(result)) {
+                       if (domain_name)
+                               fstrcpy(domain->name, domain_name);
 
-       return &hnd;
+                       if (dom_sid) 
+                               sid_copy(&domain->sid, dom_sid);
+               }
+       }
+done:
+
+       cli_rpc_pipe_close(cli);
+       
+       talloc_destroy(mem_ctx);
+
+       domain->initialized = True;
+       
+       return;
 }
 
-/* Return a SAM policy handle on a domain user */
+static BOOL cm_get_schannel_dcinfo(struct winbindd_domain *domain,
+                                  struct dcinfo **ppdc)
+{
+       NTSTATUS result;
+       struct rpc_pipe_client *netlogon_pipe;
+
+       if (lp_client_schannel() == False) {
+               return False;
+       }
 
-CLI_POLICY_HND *cm_get_sam_user_handle(char *domain, DOM_SID *domain_sid,
-                                      uint32 user_rid)
+       result = cm_connect_netlogon(domain, &netlogon_pipe);
+       if (!NT_STATUS_IS_OK(result)) {
+               return False;
+       }
+
+       /* Return a pointer to the struct dcinfo from the
+          netlogon pipe. */
+
+       *ppdc = domain->conn.netlogon_pipe->dc;
+       return True;
+}
+
+NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
+                       struct rpc_pipe_client **cli, POLICY_HND *sam_handle)
 {
-       struct winbindd_cm_conn *conn, *basic_conn = NULL;
-       static CLI_POLICY_HND hnd;
+       struct winbindd_cm_conn *conn;
        NTSTATUS result;
-       uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       fstring conn_pwd;
+       struct dcinfo *p_dcinfo;
+
+       result = init_dc_connection(domain);
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
 
-       /* Look for existing connections */
+       conn = &domain->conn;
 
-       for (conn = cm_conns; conn; conn = conn->next) {
-               if (strequal(conn->domain, domain) &&
-                   strequal(conn->pipe_name, PIPE_SAMR) &&
-                   conn->pipe_data.samr.pipe_type == SAM_PIPE_USER &&
-                   conn->pipe_data.samr.rid == user_rid) {
+       if (conn->samr_pipe != NULL) {
+               goto done;
+       }
 
-                       if (!connection_ok(conn)) {
-                               /* Shutdown cli?  Free conn?  Allow retry of DC? */
-                               DLIST_REMOVE(cm_conns, conn);
-                               return NULL;
-                       }
-               
-                       goto ok;
-               }
+       /*
+        * No SAMR pipe yet. Attempt to get an NTLMSSP SPNEGO authenticated
+        * sign and sealed pipe using the machine account password by
+        * preference. If we can't - try schannel, if that fails, try
+        * anonymous.
+        */
+
+       pwd_get_cleartext(&conn->cli->pwd, conn_pwd);
+       if ((conn->cli->user_name[0] == '\0') ||
+           (conn->cli->domain[0] == '\0') || 
+           (conn_pwd[0] == '\0')) {
+               DEBUG(10, ("cm_connect_sam: No no user available for "
+                          "domain %s, trying schannel\n", conn->cli->domain));
+               goto schannel;
        }
 
-       /* Create a domain handle to open a user handle from */
+       /* We have an authenticated connection. Use a NTLMSSP SPNEGO
+          authenticated SAMR pipe with sign & seal. */
+       conn->samr_pipe =
+               cli_rpc_pipe_open_spnego_ntlmssp(conn->cli, PI_SAMR,
+                                                PIPE_AUTH_LEVEL_PRIVACY,
+                                                conn->cli->domain,
+                                                conn->cli->user_name,
+                                                conn_pwd, &result);
+
+       if (conn->samr_pipe == NULL) {
+               DEBUG(10,("cm_connect_sam: failed to connect to SAMR "
+                         "pipe for domain %s using NTLMSSP "
+                         "authenticated pipe: user %s\\%s. Error was "
+                         "%s\n", domain->name, conn->cli->domain,
+                         conn->cli->user_name, nt_errstr(result)));
+               goto schannel;
+       }
 
-       if (!cm_get_sam_dom_handle(domain, domain_sid))
-               return NULL;
+       DEBUG(10,("cm_connect_sam: connected to SAMR pipe for "
+                 "domain %s using NTLMSSP authenticated "
+                 "pipe: user %s\\%s\n", domain->name,
+                 conn->cli->domain, conn->cli->user_name ));
 
-       for (conn = cm_conns; conn; conn = conn->next) {
-               if (strequal(conn->domain, domain) &&
-                   strequal(conn->pipe_name, PIPE_SAMR) &&
-                   conn->pipe_data.samr.pipe_type == SAM_PIPE_DOM)
-                       basic_conn = conn;
+       result = rpccli_samr_connect(conn->samr_pipe, mem_ctx,
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    &conn->sam_connect_handle);
+       if (NT_STATUS_IS_OK(result)) {
+               goto open_domain;
        }
-       
-       if (!basic_conn) {
-               DEBUG(0, ("No domain sam handle was created!\n"));
-               return NULL;
+       DEBUG(10,("cm_connect_sam: ntlmssp-sealed rpccli_samr_connect "
+                 "failed for domain %s, error was %s. Trying schannel\n",
+                 domain->name, nt_errstr(result) ));
+       cli_rpc_pipe_close(conn->samr_pipe);
+
+ schannel:
+
+       /* Fall back to schannel if it's a W2K pre-SP1 box. */
+
+       if (!cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
+               DEBUG(10, ("cm_connect_sam: Could not get schannel auth info "
+                          "for domain %s, trying anon\n", conn->cli->domain));
+               goto anonymous;
+       }
+       conn->samr_pipe = cli_rpc_pipe_open_schannel_with_key
+               (conn->cli, PI_SAMR, PIPE_AUTH_LEVEL_PRIVACY,
+                domain->name, p_dcinfo, &result);
+
+       if (conn->samr_pipe == NULL) {
+               DEBUG(10,("cm_connect_sam: failed to connect to SAMR pipe for "
+                         "domain %s using schannel. Error was %s\n",
+                         domain->name, nt_errstr(result) ));
+               goto anonymous;
        }
+       DEBUG(10,("cm_connect_sam: connected to SAMR pipe for domain %s using "
+                 "schannel.\n", domain->name ));
+
+       result = rpccli_samr_connect(conn->samr_pipe, mem_ctx,
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    &conn->sam_connect_handle);
+       if (NT_STATUS_IS_OK(result)) {
+               goto open_domain;
+       }
+       DEBUG(10,("cm_connect_sam: schannel-sealed rpccli_samr_connect failed "
+                 "for domain %s, error was %s. Trying anonymous\n",
+                 domain->name, nt_errstr(result) ));
+       cli_rpc_pipe_close(conn->samr_pipe);
 
-       if (!(conn = (struct winbindd_cm_conn *)
-             malloc(sizeof(struct winbindd_cm_conn))))
-               return NULL;
-       
-       ZERO_STRUCTP(conn);
+ anonymous:
 
-       fstrcpy(conn->domain, basic_conn->domain);
-       fstrcpy(conn->controller, basic_conn->controller);
-       fstrcpy(conn->pipe_name, basic_conn->pipe_name);
-       
-       conn->pipe_data.samr.pipe_type = SAM_PIPE_USER;
-       conn->cli = basic_conn->cli;
-       conn->pipe_data.samr.rid = user_rid;
+       /* Finally fall back to anonymous. */
+       conn->samr_pipe = cli_rpc_pipe_open_noauth(conn->cli, PI_SAMR,
+                                                  &result);
 
-       result = cli_samr_open_user(conn->cli, conn->cli->mem_ctx,
-                                   &basic_conn->pol, des_access, user_rid,
-                                   &conn->pol);
+       if (conn->samr_pipe == NULL) {
+               result = NT_STATUS_PIPE_NOT_AVAILABLE;
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(result))
-               return NULL;
+       result = rpccli_samr_connect(conn->samr_pipe, mem_ctx,
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    &conn->sam_connect_handle);
+       if (!NT_STATUS_IS_OK(result)) {
+               DEBUG(10,("cm_connect_sam: rpccli_samr_connect failed "
+                         "for domain %s Error was %s\n",
+                         domain->name, nt_errstr(result) ));
+               goto done;
+       }
 
-       /* Add to list */
+ open_domain:
+       result = rpccli_samr_open_domain(conn->samr_pipe,
+                                        mem_ctx,
+                                        &conn->sam_connect_handle,
+                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                        &domain->sid,
+                                        &conn->sam_domain_handle);
 
-       DLIST_ADD(cm_conns, conn);
+ done:
 
- ok:
-       hnd.pol = conn->pol;
-       hnd.cli = conn->cli;
+       if (!NT_STATUS_IS_OK(result)) {
+               invalidate_cm_connection(conn);
+               return result;
+       }
 
-       return &hnd;
+       *cli = conn->samr_pipe;
+       *sam_handle = conn->sam_domain_handle;
+       return result;
 }
 
-/* Return a SAM policy handle on a domain group */
-
-CLI_POLICY_HND *cm_get_sam_group_handle(char *domain, DOM_SID *domain_sid,
-                                       uint32 group_rid)
+NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
+                       struct rpc_pipe_client **cli, POLICY_HND *lsa_policy)
 {
-       struct winbindd_cm_conn *conn, *basic_conn = NULL;
-       static CLI_POLICY_HND hnd;
+       struct winbindd_cm_conn *conn;
        NTSTATUS result;
-       uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
+       fstring conn_pwd;
+       struct dcinfo *p_dcinfo;
 
-       /* Look for existing connections */
+       result = init_dc_connection(domain);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
 
-       for (conn = cm_conns; conn; conn = conn->next) {
-               if (strequal(conn->domain, domain) &&
-                   strequal(conn->pipe_name, PIPE_SAMR) &&
-                   conn->pipe_data.samr.pipe_type == SAM_PIPE_GROUP &&
-                   conn->pipe_data.samr.rid == group_rid) {
+       conn = &domain->conn;
 
-                       if (!connection_ok(conn)) {
-                               /* Shutdown cli?  Free conn?  Allow retry of DC? */
-                               DLIST_REMOVE(cm_conns, conn);
-                               return NULL;
-                       }
-               
-                       goto ok;
-               }
+       if (conn->lsa_pipe != NULL) {
+               goto done;
        }
 
-       /* Create a domain handle to open a user handle from */
-
-       if (!cm_get_sam_dom_handle(domain, domain_sid))
-               return NULL;
+       pwd_get_cleartext(&conn->cli->pwd, conn_pwd);
+       if ((conn->cli->user_name[0] == '\0') ||
+           (conn->cli->domain[0] == '\0') || 
+           (conn_pwd[0] == '\0')) {
+               DEBUG(10, ("cm_connect_lsa: No no user available for "
+                          "domain %s, trying schannel\n", conn->cli->domain));
+               goto schannel;
+       }
 
-       for (conn = cm_conns; conn; conn = conn->next) {
-               if (strequal(conn->domain, domain) &&
-                   strequal(conn->pipe_name, PIPE_SAMR) &&
-                   conn->pipe_data.samr.pipe_type == SAM_PIPE_DOM)
-                       basic_conn = conn;
+       /* We have an authenticated connection. Use a NTLMSSP SPNEGO
+        * authenticated LSA pipe with sign & seal. */
+       conn->lsa_pipe = cli_rpc_pipe_open_spnego_ntlmssp
+               (conn->cli, PI_LSARPC, PIPE_AUTH_LEVEL_PRIVACY,
+                conn->cli->domain, conn->cli->user_name, conn_pwd, &result);
+
+       if (conn->lsa_pipe == NULL) {
+               DEBUG(10,("cm_connect_lsa: failed to connect to LSA pipe for "
+                         "domain %s using NTLMSSP authenticated pipe: user "
+                         "%s\\%s. Error was %s. Trying schannel.\n",
+                         domain->name, conn->cli->domain,
+                         conn->cli->user_name, nt_errstr(result)));
+               goto schannel;
        }
-       
-       if (!basic_conn) {
-               DEBUG(0, ("No domain sam handle was created!\n"));
-               return NULL;
+
+       DEBUG(10,("cm_connect_lsa: connected to LSA pipe for domain %s using "
+                 "NTLMSSP authenticated pipe: user %s\\%s\n",
+                 domain->name, conn->cli->domain, conn->cli->user_name ));
+
+       result = rpccli_lsa_open_policy(conn->lsa_pipe, mem_ctx, True,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       &conn->lsa_policy);
+       if (NT_STATUS_IS_OK(result)) {
+               goto done;
        }
 
-       if (!(conn = (struct winbindd_cm_conn *)
-             malloc(sizeof(struct winbindd_cm_conn))))
-               return NULL;
-       
-       ZERO_STRUCTP(conn);
+       DEBUG(10,("cm_connect_lsa: rpccli_lsa_open_policy failed, trying "
+                 "schannel\n"));
 
-       fstrcpy(conn->domain, basic_conn->domain);
-       fstrcpy(conn->controller, basic_conn->controller);
-       fstrcpy(conn->pipe_name, basic_conn->pipe_name);
-       
-       conn->pipe_data.samr.pipe_type = SAM_PIPE_GROUP;
-       conn->cli = basic_conn->cli;
-       conn->pipe_data.samr.rid = group_rid;
+       cli_rpc_pipe_close(conn->lsa_pipe);
 
-       result = cli_samr_open_group(conn->cli, conn->cli->mem_ctx,
-                                   &basic_conn->pol, des_access, group_rid,
-                                   &conn->pol);
+ schannel:
 
-       if (!NT_STATUS_IS_OK(result))
-               return NULL;
+       /* Fall back to schannel if it's a W2K pre-SP1 box. */
 
-       /* Add to list */
+       if (!cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
+               DEBUG(10, ("cm_connect_lsa: Could not get schannel auth info "
+                          "for domain %s, trying anon\n", conn->cli->domain));
+               goto anonymous;
+       }
+       conn->lsa_pipe = cli_rpc_pipe_open_schannel_with_key
+               (conn->cli, PI_LSARPC, PIPE_AUTH_LEVEL_PRIVACY,
+                domain->name, p_dcinfo, &result);
+
+       if (conn->lsa_pipe == NULL) {
+               DEBUG(10,("cm_connect_lsa: failed to connect to LSA pipe for "
+                         "domain %s using schannel. Error was %s\n",
+                         domain->name, nt_errstr(result) ));
+               goto anonymous;
+       }
+       DEBUG(10,("cm_connect_lsa: connected to LSA pipe for domain %s using "
+                 "schannel.\n", domain->name ));
+
+       result = rpccli_lsa_open_policy(conn->lsa_pipe, mem_ctx, True,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       &conn->lsa_policy);
+       if (NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
 
-       DLIST_ADD(cm_conns, conn);
+       DEBUG(10,("cm_connect_lsa: rpccli_lsa_open_policy failed, trying "
+                 "anonymous\n"));
 
- ok:
-       hnd.pol = conn->pol;
-       hnd.cli = conn->cli;
+       cli_rpc_pipe_close(conn->lsa_pipe);
 
-       return &hnd;
-}
+ anonymous:
 
-#endif
+       conn->lsa_pipe = cli_rpc_pipe_open_noauth(conn->cli, PI_LSARPC,
+                                                 &result);
+       if (conn->lsa_pipe == NULL) {
+               result = NT_STATUS_PIPE_NOT_AVAILABLE;
+               goto done;
+       }
 
-/* Get a handle on a netlogon pipe.  This is a bit of a hack to re-use the
-   netlogon pipe as no handle is returned. */
+       result = rpccli_lsa_open_policy(conn->lsa_pipe, mem_ctx, True,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       &conn->lsa_policy);
+ done:
+       if (!NT_STATUS_IS_OK(result)) {
+               invalidate_cm_connection(conn);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
 
-NTSTATUS cm_get_netlogon_cli(const char *domain, 
-                            const unsigned char *trust_passwd, 
-                            uint32 sec_channel_type,
-                            struct cli_state **cli)
+       *cli = conn->lsa_pipe;
+       *lsa_policy = conn->lsa_policy;
+       return result;
+}
+
+/****************************************************************************
+ Open the netlogon pipe to this DC. Use schannel if specified in client conf.
+ session key stored in conn->netlogon_pipe->dc->sess_key.
+****************************************************************************/
+
+NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
+                            struct rpc_pipe_client **cli)
 {
-       NTSTATUS result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
        struct winbindd_cm_conn *conn;
-       uint32 neg_flags = 0x000001ff;
-       fstring lock_name;
-       BOOL got_mutex;
+       NTSTATUS result;
 
-       if (!cli)
-               return NT_STATUS_INVALID_PARAMETER;
+       uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS;
+       uint8  mach_pwd[16];
+       uint32  sec_chan_type;
+       const char *account_name;
+       struct rpc_pipe_client *netlogon_pipe = NULL;
 
-       /* Open an initial conection - keep the mutex. */
+       *cli = NULL;
 
-       if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_NETLOGON, &conn)))
+       result = init_dc_connection(domain);
+       if (!NT_STATUS_IS_OK(result)) {
                return result;
-       
-       snprintf(lock_name, sizeof(lock_name), "NETLOGON\\%s", conn->controller);
+       }
 
-       if (!(got_mutex = secrets_named_mutex(lock_name, WINBIND_SERVER_MUTEX_WAIT_TIME))) {
-               DEBUG(0,("cm_get_netlogon_cli: mutex grab failed for %s\n", conn->controller));
+       conn = &domain->conn;
+
+       if (conn->netlogon_pipe != NULL) {
+               *cli = conn->netlogon_pipe;
+               return NT_STATUS_OK;
        }
-                       
-       result = cli_nt_setup_creds(conn->cli, sec_channel_type, trust_passwd, &neg_flags, 2);
-       
-       if (got_mutex)
-               secrets_named_mutex_release(lock_name);
-                       
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(0, ("error connecting to domain password server: %s\n",
-                         nt_errstr(result)));
-               
-               /* Hit the cache code again.  This cleans out the old connection and gets a new one */
-               if (conn->cli->fd == -1) {
-                       if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_NETLOGON, &conn)))
-                               return result;
-                       
-                       snprintf(lock_name, sizeof(lock_name), "NETLOGON\\%s", conn->controller);
-                       if (!(got_mutex = secrets_named_mutex(lock_name, WINBIND_SERVER_MUTEX_WAIT_TIME))) {
-                               DEBUG(0,("cm_get_netlogon_cli: mutex grab failed for %s\n", conn->controller));
-                       }
-                       
-                       /* Try again */
-                       result = cli_nt_setup_creds( conn->cli, sec_channel_type,trust_passwd, &neg_flags, 2);
-                       
-                       if (got_mutex)
-                               secrets_named_mutex_release(lock_name);
-               }
-               
-               if (!NT_STATUS_IS_OK(result)) {
-                       cli_shutdown(conn->cli);
-                       DLIST_REMOVE(cm_conns, conn);
-                       SAFE_FREE(conn);
-                       return result;
-               }
+
+       if (!get_trust_pw(domain->name, mach_pwd, &sec_chan_type)) {
+               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
        }
 
-       *cli = conn->cli;
+       netlogon_pipe = cli_rpc_pipe_open_noauth(conn->cli, PI_NETLOGON,
+                                                &result);
+       if (netlogon_pipe == NULL) {
+               return result;
+       }
 
-       return result;
-}
+       if (lp_client_schannel() != False) {
+               neg_flags |= NETLOGON_NEG_SCHANNEL;
+       }
 
-/* Dump the current connection status */
+       /* if we are a DC and this is a trusted domain, then we need to use our
+          domain name in the net_req_auth2() request */
 
-static void dump_conn_list(void)
-{
-       struct winbindd_cm_conn *con;
+       if ( IS_DC
+               && !strequal(domain->name, lp_workgroup())
+               && lp_allow_trusted_domains() ) 
+       {
+               account_name = lp_workgroup();
+       } else {
+               account_name = domain->primary ?
+                       global_myname() : domain->name;
+       }
 
-       DEBUG(0, ("\tDomain          Controller      Pipe\n"));
+       if (account_name == NULL) {
+               cli_rpc_pipe_close(netlogon_pipe);
+               return NT_STATUS_NO_MEMORY;
+       }
 
-       for(con = cm_conns; con; con = con->next) {
-               char *msg;
+       result = rpccli_netlogon_setup_creds(
+                netlogon_pipe,
+                domain->dcname, /* server name. */
+                domain->name,   /* domain name */
+                global_myname(), /* client name */
+                account_name,   /* machine account */
+                mach_pwd,       /* machine password */
+                sec_chan_type,  /* from get_trust_pw */
+                &neg_flags);
 
-               /* Display pipe info */
-               
-               if (asprintf(&msg, "\t%-15s %-15s %-16s", con->domain, con->controller, con->pipe_name) < 0) {
-                       DEBUG(0, ("Error: not enough memory!\n"));
-               } else {
-                       DEBUG(0, ("%s\n", msg));
-                       SAFE_FREE(msg);
-               }
+       if (!NT_STATUS_IS_OK(result)) {
+               cli_rpc_pipe_close(netlogon_pipe);
+               return result;
        }
-}
 
-void winbindd_cm_status(void)
-{
-       /* List open connections */
+       if ((lp_client_schannel() == True) &&
+                       ((neg_flags & NETLOGON_NEG_SCHANNEL) == 0)) {
+               DEBUG(3, ("Server did not offer schannel\n"));
+               cli_rpc_pipe_close(netlogon_pipe);
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
-       DEBUG(0, ("winbindd connection manager status:\n"));
+       if ((lp_client_schannel() == False) ||
+                       ((neg_flags & NETLOGON_NEG_SCHANNEL) == 0)) {
+               /* We're done - just keep the existing connection to NETLOGON
+                * open */
+               conn->netlogon_pipe = netlogon_pipe;
+               *cli = conn->netlogon_pipe;
+               return NT_STATUS_OK;
+       }
 
-       if (cm_conns)
-               dump_conn_list();
-       else
-               DEBUG(0, ("\tNo active connections\n"));
+       /* Using the credentials from the first pipe, open a signed and sealed
+          second netlogon pipe. The session key is stored in the schannel
+          part of the new pipe auth struct.
+       */
+
+       conn->netlogon_pipe =
+               cli_rpc_pipe_open_schannel_with_key(conn->cli,
+                                                   PI_NETLOGON,
+                                                   PIPE_AUTH_LEVEL_PRIVACY,
+                                                   domain->name,
+                                                   netlogon_pipe->dc,
+                                                   &result);
+
+       /* We can now close the initial netlogon pipe. */
+       cli_rpc_pipe_close(netlogon_pipe);
+
+       if (conn->netlogon_pipe == NULL) {
+               DEBUG(3, ("Could not open schannel'ed NETLOGON pipe. Error "
+                         "was %s\n", nt_errstr(result)));
+                         
+               /* make sure we return something besides OK */
+               return !NT_STATUS_IS_OK(result) ? result : NT_STATUS_PIPE_NOT_AVAILABLE;
+       }
+
+       *cli = conn->netlogon_pipe;
+       return NT_STATUS_OK;
 }