r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation
[samba.git] / source3 / nsswitch / winbindd_cm.c
index 586a307464714cb8076f793f6f52a20d312339c9..1843ec188b03479bfa058f37e091b751f359e699 100644 (file)
      - 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
@@ -72,342 +70,619 @@ struct winbindd_cm_conn {
        fstring domain;
        fstring controller;
        fstring pipe_name;
-       size_t mutex_ref_count;
        struct cli_state *cli;
        POLICY_HND pol;
 };
 
 static struct winbindd_cm_conn *cm_conns = NULL;
 
-/* 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. */
+static NTSTATUS get_connection_from_cache(struct winbindd_domain *domain,
+                                         const char *pipe_name,
+                                         struct winbindd_cm_conn **conn_out);
 
-#define GET_DC_NAME_CACHE_TIMEOUT 30 /* Seconds between dc lookups */
+/* 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
+*/
 
-struct get_dc_name_cache {
-       fstring domain_name;
-       fstring srv_name;
-       time_t lookup_time;
-       struct get_dc_name_cache *prev, *next;
-};
+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) {
+
+               if (!*domain || !**domain)
+                       *domain = smb_xstrdup(lp_workgroup());
+               
+               if (!*password || !**password)
+                       *password = smb_xstrdup("");
+
+               DEBUG(3, ("IPC$ connections done by user %s\\%s\n", 
+                         *domain, *username));
+
+       } else {
+               DEBUG(3, ("IPC$ connections done anonymously\n"));
+               *username = smb_xstrdup("");
+               *domain = smb_xstrdup("");
+               *password = smb_xstrdup("");
+       }
+}
 
 /*
-  find the DC for a domain using methods appropriate for a ADS domain
+  setup for schannel on any pipes opened on this connection
 */
-static BOOL cm_ads_find_dc(const char *domain, struct in_addr *dc_ip, fstring srv_name)
+static NTSTATUS setup_schannel( struct cli_state *cli, const char *domain )
+{
+       NTSTATUS ret;
+       uchar trust_password[16];
+       uint32 sec_channel_type;
+       DOM_SID sid;
+       time_t lct;
+
+       /* use the domain trust password if we're on a DC 
+          and this is not our domain */
+       
+       if ( IS_DC && !strequal(domain, lp_workgroup()) ) {
+               char *pass = NULL;
+               
+               if ( !secrets_fetch_trusted_domain_password( domain, 
+                       &pass, &sid, &lct) )
+               {
+                       return NT_STATUS_UNSUCCESSFUL;
+               }       
+
+               sec_channel_type = SEC_CHAN_DOMAIN;
+               E_md4hash(pass, trust_password);
+               SAFE_FREE( pass );
+               
+       } else {
+               if (!secrets_fetch_trust_account_password(lp_workgroup(),
+                       trust_password, NULL, &sec_channel_type)) 
+               {
+                       return NT_STATUS_UNSUCCESSFUL;
+               }
+       }
+
+       ret = cli_nt_setup_netsec(cli, sec_channel_type, 
+               AUTH_PIPE_NETSEC | AUTH_PIPE_SIGN, trust_password);
+
+       return ret;
+}
+
+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;
+       NTSTATUS result;
+       struct winbindd_cm_conn *conn;
+       TALLOC_CTX *mem_ctx;
 
-       if (strcasecmp(realm, lp_workgroup()) == 0)
-               realm = lp_realm();
+       fstring tmp;
+       char *p;
 
-       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));
+       if ((our_domain = find_our_domain()) == NULL)
+               return False;
 
-#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
+       result = get_connection_from_cache(our_domain, PIPE_NETLOGON, &conn);
+       if (!NT_STATUS_IS_OK(result))
+               return False;
 
-       if (!ads->config.realm)
+       if ((mem_ctx = talloc_init("get_dc_name_via_netlogon")) == NULL)
+               return False;
+
+       result = cli_netlogon_getdcname(conn->cli, mem_ctx, domain->name, tmp);
+
+       talloc_destroy(mem_ctx);
+
+       if (!NT_STATUS_IS_OK(result))
+               return False;
+
+       /* cli_netlogon_getdcname gives us a name with \\ */
+       p = tmp;
+       if (*p == '\\') p+=1;
+       if (*p == '\\') p+=1;
+
+       fstrcpy(dcname, p);
+
+       if (!resolve_name(dcname, dc_ip, 0x20))
                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;
 }
 
+/************************************************************************
+ Given a fd with a just-connected TCP connection to a DC, open a connection
+ to the pipe.
+************************************************************************/
+
+static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
+                                     const int sockfd,
+                                     const int pipe_index,
+                                     const char *controller,
+                                     struct cli_state **cli,
+                                     BOOL *retry)
+{
+       char *machine_password, *machine_krb5_principal;
+       char *ipc_username, *ipc_domain, *ipc_password;
+       struct ntuser_creds creds;
 
+       BOOL got_mutex;
+       BOOL add_failed_connection = True;
 
-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;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+       struct sockaddr peeraddr;
+       socklen_t peeraddr_len;
+
+       struct sockaddr_in *peeraddr_in = (struct sockaddr_in *)&peeraddr;
+
+       machine_password = secrets_fetch_machine_password(lp_workgroup(), NULL,
+                                                         NULL);
+       
+       if (asprintf(&machine_krb5_principal, "%s$@%s", global_myname(),
+                    lp_realm()) == -1) {
+               SAFE_FREE(machine_password);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       cm_get_ipc_userpass(&ipc_username, &ipc_domain, &ipc_password);
+
+       *retry = True;
 
-       /* Check the cache for previous lookups */
+       got_mutex = secrets_named_mutex(controller,
+                                       WINBIND_SERVER_MUTEX_WAIT_TIME);
 
-       for (dcc = get_dc_name_cache; dcc; dcc = dcc->next) {
+       if (!got_mutex) {
+               DEBUG(0,("cm_open_connection: mutex grab failed for %s\n",
+                        controller));
+               result = NT_STATUS_POSSIBLE_DEADLOCK;
+               goto done;
+       }
+
+       if ((*cli = cli_initialise(NULL)) == NULL) {
+               DEBUG(1, ("Could not cli_initialize\n"));
+               result = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
-               if (!strequal(domain, dcc->domain_name))
-                       continue; /* Not our domain */
+       (*cli)->timeout = 10000;        /* 10 seconds */
+       (*cli)->fd = sockfd;
+       fstrcpy((*cli)->desthost, controller);
+       (*cli)->use_kerberos = True;
 
-               if ((time(NULL) - dcc->lookup_time) > 
-                   GET_DC_NAME_CACHE_TIMEOUT) {
+       peeraddr_len = sizeof(peeraddr);
 
-                       /* Cache entry has expired, delete it */
+       if ((getpeername((*cli)->fd, &peeraddr, &peeraddr_len) != 0) ||
+           (peeraddr_len != sizeof(struct sockaddr_in)) ||
+           (peeraddr_in->sin_family != PF_INET))
+               goto done;
 
-                       DEBUG(10, ("get_dc_name_cache entry expired for %s\n", domain));
+       if (ntohs(peeraddr_in->sin_port) == 139) {
+               struct nmb_name calling;
+               struct nmb_name called;
 
-                       DLIST_REMOVE(get_dc_name_cache, dcc);
-                       SAFE_FREE(dcc);
+               make_nmb_name(&calling, global_myname(), 0x0);
+               make_nmb_name(&called, "*SMBSERVER", 0x20);
 
-                       break;
+               if (!cli_session_request(*cli, &calling, &called)) {
+                       DEBUG(8, ("cli_session_request failed for %s\n",
+                                 controller));
+                       goto done;
                }
+       }
 
-               /* Return a positive or negative lookup for this domain */
+       cli_setup_signing_state(*cli, Undefined);
 
-               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;
+       if (!cli_negprot(*cli)) {
+               DEBUG(1, ("cli_negprot failed\n"));
+               cli_shutdown(*cli);
+               goto done;
+       }
+
+       /* Krb5 session */
+                       
+       if ((lp_security() == SEC_ADS) 
+           && ((*cli)->protocol >= PROTOCOL_NT1 &&
+               (*cli)->capabilities & CAP_EXTENDED_SECURITY)) {
+
+               ADS_STATUS ads_status;
+               (*cli)->use_kerberos = True;
+               DEBUG(5, ("connecting to %s from %s with kerberos principal "
+                         "[%s]\n", controller, global_myname(),
+                         machine_krb5_principal));
+
+               ads_status = cli_session_setup_spnego(*cli,
+                                                     machine_krb5_principal, 
+                                                     machine_password, 
+                                                     lp_workgroup());
+
+               if (!ADS_ERR_OK(ads_status))
+                       DEBUG(4,("failed kerberos session setup with %s\n",
+                                ads_errstr(ads_status)));
+
+               result = ads_ntstatus(ads_status);
+       }
+
+       if (NT_STATUS_IS_OK(result))
+               goto session_setup_done;
+
+       /* Fall back to non-kerberos session setup */
+
+       (*cli)->use_kerberos = False;
+
+       if ((((*cli)->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) != 0) &&
+           (strlen(ipc_username) > 0)) {
+
+               /* Only try authenticated if we have a username */
+
+               DEBUG(5, ("connecting to %s from %s with username "
+                         "[%s]\\[%s]\n",  controller, global_myname(),
+                         ipc_domain, ipc_username));
+
+               if (cli_session_setup(*cli, ipc_username,
+                                     ipc_password, strlen(ipc_password)+1,
+                                     ipc_password, strlen(ipc_password)+1,
+                                     ipc_domain)) {
+                       DEBUG(5, ("authenticated session setup failed\n"));
+                       goto session_setup_done;
                }
        }
 
-       /* Add cache entry for this lookup. */
+       /* Fall back to anonymous connection, this might fail later */
+
+       if (cli_session_setup(*cli, "", NULL, 0, NULL, 0, "")) {
+               DEBUG(5, ("Connected anonymously\n"));
+               goto session_setup_done;
+       }
 
-       DEBUG(10, ("Creating get_dc_name_cache entry for %s\n", domain));
+       result = cli_nt_error(*cli);
 
-       if (!(dcc = (struct get_dc_name_cache *) 
-             malloc(sizeof(struct get_dc_name_cache))))
-               return False;
+       if (NT_STATUS_IS_OK(result))
+               result = NT_STATUS_UNSUCCESSFUL;
+
+       /* We can't session setup */
+
+       goto done;
+
+ session_setup_done:
+
+       if (!cli_send_tconX(*cli, "IPC$", "IPC", "", 0)) {
 
-       ZERO_STRUCTP(dcc);
+               result = cli_nt_error(*cli);
 
-       fstrcpy(dcc->domain_name, domain);
-       dcc->lookup_time = time(NULL);
+               DEBUG(1,("failed tcon_X with %s\n", nt_errstr(result)));
 
-       DLIST_ADD(get_dc_name_cache, dcc);
+               if (NT_STATUS_IS_OK(result))
+                       result = NT_STATUS_UNSUCCESSFUL;
+
+               cli_shutdown(*cli);
+               goto done;
+       }
 
-       zero_ip(&dc_ip);
+       init_creds(&creds, ipc_username, ipc_domain, ipc_password);
+       cli_init_creds(*cli, &creds);
 
-       ret = False;
-       if (lp_security() == SEC_ADS)
-               ret = cm_ads_find_dc(domain, &dc_ip, srv_name);
+       secrets_named_mutex_release(controller);
+       got_mutex = False;
+       *retry = False;
 
-       if (!ret) {
-               /* fall back on rpc methods if the ADS methods fail */
-               ret = rpc_find_dc(domain, srv_name, &dc_ip);
+       if (domain->primary || IS_DC) {
+               NTSTATUS status = setup_schannel( *cli, domain->name );
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(3,("schannel refused - continuing without "
+                                "schannel (%s)\n", nt_errstr(status)));
+               }
        }
 
-       if (!ret)
+       /* set the domain if empty; needed for schannel connections */
+       if ( !*(*cli)->domain )
+               fstrcpy( (*cli)->domain, domain->name );
+
+       if ( !cli_nt_session_open (*cli, pipe_index) ) {
+
+               result = NT_STATUS_PIPE_NOT_AVAILABLE;
+
+               /* This might be a NT4 DC */
+               if ( is_win2k_pipe(pipe_index) )
+                       add_failed_connection = False;
+
+               cli_shutdown(*cli);
+               goto done;
+       }
+
+       result = NT_STATUS_OK;
+       add_failed_connection = False;
+
+ done:
+       if (got_mutex)
+               secrets_named_mutex_release(controller);
+
+       SAFE_FREE(machine_password);
+       SAFE_FREE(machine_krb5_principal);
+       SAFE_FREE(ipc_username);
+       SAFE_FREE(ipc_domain);
+       SAFE_FREE(ipc_password);
+
+       if (add_failed_connection)
+               add_failed_connection_entry(domain->name, controller, 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)))
+               return False;
+
+       *dcs = TALLOC_REALLOC_ARRAY(mem_ctx, *dcs, struct dc_name_ip, (*num)+1);
+
+       if (*dcs == NULL)
                return False;
 
-       /* We have a name so make the cache entry positive now */
-       fstrcpy(dcc->srv_name, srv_name);
+       fstrcpy((*dcs)[*num].name, dcname);
+       (*dcs)[*num].ip = ip;
+       *num += 1;
+       return True;
+}
+
+static BOOL add_string_to_array(TALLOC_CTX *mem_ctx,
+                               const char *str, char ***array, int *num)
+{
+       char *dup_str = talloc_strdup(mem_ctx, str);
 
-       DEBUG(3, ("cm_get_dc_name: Returning DC %s (%s) for domain %s\n", srv_name,
-                 inet_ntoa(dc_ip), domain));
+       *array = TALLOC_REALLOC_ARRAY(mem_ctx, *array, char *, (*num)+1);
 
-       *ip_out = dc_ip;
+       if ((*array == NULL) || (dup_str == NULL))
+               return False;
 
+       (*array)[*num] = dup_str;
+       *num += 1;
        return True;
 }
 
-/* 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 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);
 
-static void cm_get_ipc_userpass(char **username, char **domain, char **password)
+       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 BOOL get_dcs_1c(TALLOC_CTX *mem_ctx,
+                      const struct winbindd_domain *domain,
+                      struct dc_name_ip **dcs, int *num_dcs)
 {
-       *username = secrets_fetch(SECRETS_AUTH_USER, NULL);
-       *domain = secrets_fetch(SECRETS_AUTH_DOMAIN, NULL);
-       *password = secrets_fetch(SECRETS_AUTH_PASSWORD, NULL);
-       
-       if (*username && **username) {
+       struct ip_service *iplist = NULL;
+       int i, num = 0;
 
-               if (!*domain || !**domain)
-                       *domain = smb_xstrdup(lp_workgroup());
-               
-               if (!*password || !**password)
-                       *password = smb_xstrdup("");
+       if (!internal_resolve_name(domain->name, 0x1c, &iplist, &num,
+                                  lp_name_resolve_order()))
+               return False;
 
-               DEBUG(3, ("IPC$ connections done by user %s\\%s\n", 
-                         *domain, *username));
+       /* Now try to find the server names of at least one IP address, hosts
+        * not replying are cached as such */
 
-       } else {
-               DEBUG(3, ("IPC$ connections done anonymously\n"));
-               *username = smb_xstrdup("");
-               *domain = smb_xstrdup("");
-               *password = smb_xstrdup("");
+       for (i=0; i<num; i++) {
+
+               fstring dcname;
+
+               if (!name_status_find(domain->name, 0x1c, 0x20, iplist[i].ip,
+                                     dcname))
+                       continue;
+
+               if (add_one_dc_unique(mem_ctx, domain->name, dcname,
+                                     iplist[i].ip, dcs, num_dcs)) {
+                       /* One DC responded, so we assume that he will also
+                          work on 139/445 */
+                       break;
+               }
        }
+
+       return True;
 }
 
-/* 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. */
+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;
+       BOOL is_our_domain;
 
-#define FAILED_CONNECTION_CACHE_TIMEOUT 30 /* Seconds between attempts */
+       const char *p;
 
-struct failed_connection_cache {
-       fstring domain_name;
-       fstring controller;
-       time_t lookup_time;
-       NTSTATUS nt_status;
-       struct failed_connection_cache *prev, *next;
-};
+       is_our_domain = strequal(domain->name, lp_workgroup());
 
-static struct failed_connection_cache *failed_connection_cache;
+       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))
+                       return True;
 
-/* Add an entry to the failed conneciton cache */
+       if (!is_our_domain) {
+               /* NETLOGON to our own domain could not give us a DC name
+                * (which is an error), fall back to looking up domain#1c */
+               return get_dcs_1c(mem_ctx, domain, dcs, num_dcs);
+       }
 
-static void add_failed_connection_entry(struct winbindd_cm_conn *new_conn, 
-                                       NTSTATUS result) 
-{
-       struct failed_connection_cache *fcc;
+       if (must_use_pdc(domain->name) && get_pdc_ip(domain->name, &ip)) {
 
-       SMB_ASSERT(!NT_STATUS_IS_OK(result));
+               if (!name_status_find(domain->name, 0x1b, 0x20, ip, dcname))
+                       return False;
 
-       /* Check we already aren't in the cache */
+               if (add_one_dc_unique(mem_ctx, domain->name,
+                                     dcname, ip, dcs, num_dcs))
+                       return True;
+       }
 
-       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;
+       p = lp_passwordserver();
+
+       if (*p == 0)
+               return get_dcs_1c(mem_ctx, domain, dcs, num_dcs);
+
+       while (next_token(&p, dcname, LIST_SEP, sizeof(dcname))) {
+
+               if (strequal(dcname, "*")) {
+                       get_dcs_1c(mem_ctx, domain, dcs, num_dcs);
+                       continue;
                }
-       }
 
-       /* Create negative lookup cache entry for this domain and controller */
+               if (!resolve_name(dcname, &ip, 0x20))
+                       continue;
 
-       if (!(fcc = (struct failed_connection_cache *)
-             malloc(sizeof(struct failed_connection_cache)))) {
-               DEBUG(0, ("malloc failed in add_failed_connection_entry!\n"));
-               return;
+               add_one_dc_unique(mem_ctx, domain->name, dcname, ip,
+                                 dcs, num_dcs);
        }
-       
-       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);
+
+       return True;
 }
-       
-/* 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)
+static BOOL find_new_dc(TALLOC_CTX *mem_ctx,
+                       const struct winbindd_domain *domain,
+                       fstring dcname, struct sockaddr_in *addr, int *fd)
 {
-       struct failed_connection_cache *fcc;
-       NTSTATUS result;
-       char *ipc_username, *ipc_domain, *ipc_password;
-       struct in_addr dc_ip;
-       int i;
-       BOOL retry = True;
+       struct dc_name_ip *dcs = NULL;
+       int num_dcs = 0;
 
-       ZERO_STRUCT(dc_ip);
+       char **dcnames = NULL;
+       int num_dcnames = 0;
 
-       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.  */
+       struct sockaddr_in *addrs = NULL;
+       int num_addrs = 0;
 
-       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. */
+       int i, fd_index;
 
-       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 (!get_dcs(mem_ctx, domain, &dcs, &num_dcs) || (num_dcs == 0))
+               return False;
 
-               if ((time(NULL) - fcc->lookup_time) > 
-                   FAILED_CONNECTION_CACHE_TIMEOUT) {
+       for (i=0; i<num_dcs; i++) {
 
-                       /* Cache entry has expired, delete it */
+               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);
 
-                       DEBUG(10, ("cm_open_connection cache entry expired for %s, %s\n", domain, new_conn->controller));
+               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);
+       }
 
-                       DLIST_REMOVE(failed_connection_cache, fcc);
-                       free(fcc);
+       if ((num_dcnames == 0) || (num_dcnames != num_addrs))
+               return False;
 
-                       break;
+       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;
+       }
 
-               /* The timeout hasn't expired yet so return false */
+       fstrcpy(dcname, dcnames[fd_index]);
+       *addr = addrs[fd_index];
 
-               DEBUG(10, ("returning negative open_connection_cache entry for %s, %s\n", domain, new_conn->controller));
+       return True;
+}
 
-               result = fcc->nt_status;
-               SMB_ASSERT(!NT_STATUS_IS_OK(result));
-               return result;
-       }
+static NTSTATUS cm_open_connection(struct winbindd_domain *domain,
+                                  const int pipe_index,
+                                  struct winbindd_cm_conn *new_conn)
+{
+       TALLOC_CTX *mem_ctx;
+       NTSTATUS result;
 
-       /* Initialise SMB connection */
+       int retries;
 
-       cm_get_ipc_userpass(&ipc_username, &ipc_domain, &ipc_password);
+       if ((mem_ctx = talloc_init("cm_open_connection")) == NULL)
+               return NT_STATUS_NO_MEMORY;
 
-       DEBUG(5, ("connecting to %s from %s with username [%s]\\[%s]\n", 
-             new_conn->controller, global_myname(), ipc_domain, ipc_username));
+       for (retries = 0; retries < 3; retries++) {
 
-       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;
+               int fd = -1;
+               BOOL retry;
+
+               result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+
+               if ((strlen(domain->dcname) > 0) &&
+                   NT_STATUS_IS_OK(check_negative_conn_cache(domain->name,
+                                                             domain->dcname))) {
+                       int dummy;
+                       if (!open_any_socket_out(&domain->dcaddr, 1, 10000,
+                                                &dummy, &fd)) {
+                               fd = -1;
+                       }
                }
 
-               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 ((fd == -1) &&
+                   !find_new_dc(mem_ctx, domain, domain->dcname,
+                                &domain->dcaddr, &fd))
+                       break;
 
-               if (NT_STATUS_IS_OK(result))
+               new_conn->cli = NULL;
+
+               result = cm_prepare_connection(domain, fd, pipe_index,
+                                              domain->dcname,
+                                              &new_conn->cli, &retry);
+
+               if (NT_STATUS_IS_OK(result)) {
+                       fstrcpy(new_conn->domain, domain->name);
+                       /* Initialise SMB connection */
+                       fstrcpy(new_conn->pipe_name,
+                               get_pipe_name_from_index(pipe_index));
+                       break;
+               }
+
+               if (!retry)
                        break;
        }
 
-       SAFE_FREE(ipc_username);
-       SAFE_FREE(ipc_domain);
-       SAFE_FREE(ipc_password);
+       talloc_destroy(mem_ctx);
+       return result;
+}
 
-       if (!NT_STATUS_IS_OK(result)) {
-               add_failed_connection_entry(new_conn, result);
-               return result;
-       }
+/************************************************************************
+ Wrapper around statuc cm_open_connection to retreive a freshly
+ setup cli_state struct
+************************************************************************/
+
+NTSTATUS cm_fresh_connection(struct winbindd_domain *domain, const int pipe_index,
+                              struct cli_state **cli)
+{
+       NTSTATUS result;
+       struct winbindd_cm_conn conn;
        
-       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;
-       }
+       result = cm_open_connection( domain, pipe_index, &conn );
+       
+       if ( NT_STATUS_IS_OK(result) ) 
+               *cli = conn.cli;
 
-       return NT_STATUS_OK;
+       return result;
 }
 
 /* Return true if a connection is still alive */
@@ -415,21 +690,19 @@ static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
 static BOOL connection_ok(struct winbindd_cm_conn *conn)
 {
        if (!conn) {
-               smb_panic("Invalid paramater passed to conneciton_ok():  conn was NULL!\n");
+               smb_panic("Invalid parameter passed to connection_ok():  conn was NULL!\n");
                return False;
        }
 
        if (!conn->cli) {
-               DEBUG(0, ("Connection to %s for domain %s (pipe %s) has NULL conn->cli!\n", 
+               DEBUG(3, ("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!");
                return False;
        }
 
        if (!conn->cli->initialised) {
-               DEBUG(0, ("Connection to %s for domain %s (pipe %s) was never initialised!\n", 
+               DEBUG(3, ("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!");
                return False;
        }
 
@@ -442,95 +715,200 @@ static BOOL connection_ok(struct winbindd_cm_conn *conn)
        return True;
 }
 
-/* Get a connection to the remote DC and open the pipe.  If there is already a connection, use that */
+/* Search the cache for a connection. If there is a broken one,
+   shut it down properly and return NULL. */
 
-static NTSTATUS get_connection_from_cache(const char *domain, const char *pipe_name,
-               struct winbindd_cm_conn **conn_out) 
+static void find_cm_connection(struct winbindd_domain *domain, const char *pipe_name,
+                              struct winbindd_cm_conn **conn_out) 
 {
-       struct winbindd_cm_conn *conn, conn_temp;
-       NTSTATUS result;
+       struct winbindd_cm_conn *conn;
 
-       for (conn = cm_conns; conn; conn = conn->next) {
-               if (strequal(conn->domain, domain) && 
+       for (conn = cm_conns; conn; ) {
+               if (strequal(conn->domain, domain->name) && 
                    strequal(conn->pipe_name, pipe_name)) {
                        if (!connection_ok(conn)) {
+                               /* Dead connection - remove it. */
+                               struct winbindd_cm_conn *conn_temp = conn->next;
                                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 */
+                               conn = conn_temp;  /* Keep the loop moving */
+                               continue;
                        } else {
                                break;
                        }
                }
+               conn = conn->next;
        }
-       
-       if (!conn) {
-               if (!(conn = malloc(sizeof(*conn))))
-                       return NT_STATUS_NO_MEMORY;
+
+       *conn_out = conn;
+}
+
+/* Initialize a new connection up to the RPC BIND. */
+
+static NTSTATUS new_cm_connection(struct winbindd_domain *domain, const char *pipe_name,
+                                 struct winbindd_cm_conn **conn_out)
+{
+       struct winbindd_cm_conn *conn;
+       NTSTATUS result;
+
+       if (!(conn = SMB_MALLOC_P(struct winbindd_cm_conn)))
+               return NT_STATUS_NO_MEMORY;
                
-               ZERO_STRUCTP(conn);
+       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;
-               }
-               DLIST_ADD(cm_conns, 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->name, pipe_name, nt_errstr(result)));
+               SAFE_FREE(conn);
+               return result;
        }
-       
+       DLIST_ADD(cm_conns, conn);
+
        *conn_out = conn;
        return NT_STATUS_OK;
 }
 
+/* Get a connection to the remote DC and open the pipe.  If there is already a connection, use that */
+
+static NTSTATUS get_connection_from_cache(struct winbindd_domain *domain, const char *pipe_name,
+                                         struct winbindd_cm_conn **conn_out)
+{
+       find_cm_connection(domain, pipe_name, conn_out);
+
+       if (*conn_out != NULL)
+               return NT_STATUS_OK;
+
+       return new_cm_connection(domain, pipe_name, conn_out);
+}
 
 /**********************************************************************************
+ We can 'sense' certain things about the DC by it's replies to certain questions.
+
+ This tells us if this particular remote server is Active Directory, and if it is
+ native mode.
 **********************************************************************************/
 
-BOOL cm_check_for_native_mode_win2k( const char *domain )
+void set_dc_type_and_flags( struct winbindd_domain *domain )
 {
        NTSTATUS                result;
        struct winbindd_cm_conn conn;
        DS_DOMINFO_CTR          ctr;
-       BOOL                    ret = False;
+       TALLOC_CTX              *mem_ctx = NULL;
        
        ZERO_STRUCT( conn );
        ZERO_STRUCT( ctr );
        
+       domain->native_mode = False;
+       domain->active_directory = False;
+
+       if (domain->internal) {
+               domain->initialized = True;
+               return;
+       }
        
        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)));
-               return False;
+               DEBUG(5, ("set_dc_type_and_flags: Could not open a connection to %s for PIPE_LSARPC (%s)\n", 
+                         domain->name, nt_errstr(result)));
+               domain->initialized = True;
+               return;
        }
        
        if ( conn.cli ) {
                if ( !NT_STATUS_IS_OK(cli_ds_getprimarydominfo( conn.cli, 
                                conn.cli->mem_ctx, DsRolePrimaryDomainInfoBasic, &ctr)) ) {
-                       ret = False;
                        goto done;
                }
        }
                                
        if ( (ctr.basic->flags & DSROLE_PRIMARY_DS_RUNNING) 
                        && !(ctr.basic->flags & DSROLE_PRIMARY_DS_MIXED_MODE) )
-               ret = True;
+               domain->native_mode = True;
+
+       /* Cheat - shut down the DS pipe, and open LSA */
+
+       cli_nt_session_close(conn.cli);
+
+       if ( cli_nt_session_open (conn.cli, PI_LSARPC) ) {
+               char *domain_name = NULL;
+               char *dns_name = NULL;
+               DOM_SID *dom_sid = NULL;
+
+               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"));
+                       return;
+               }
+
+               result = cli_lsa_open_policy2(conn.cli, mem_ctx, True, 
+                                             SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                             &conn.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 = cli_lsa_query_info_policy2(conn.cli, mem_ctx, 
+                                                           &conn.pol,
+                                                           12, &domain_name,
+                                                           &dns_name, NULL,
+                                                           NULL, &dom_sid);
+               }
+
+               if (NT_STATUS_IS_OK(result)) {
+                       if (domain_name)
+                               fstrcpy(domain->name, domain_name);
+                       
+                       if (dns_name)
+                               fstrcpy(domain->alt_name, dns_name);
+
+                       if (dom_sid) 
+                               sid_copy(&domain->sid, dom_sid);
 
+                       domain->active_directory = True;
+               } else {
+                       
+                       result = cli_lsa_open_policy(conn.cli, mem_ctx, True, 
+                                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                                    &conn.pol);
+                       
+                       if (!NT_STATUS_IS_OK(result))
+                               goto done;
+                       
+                       result = cli_lsa_query_info_policy(conn.cli, mem_ctx, 
+                                                          &conn.pol, 5, &domain_name, 
+                                                          &dom_sid);
+                       
+                       if (NT_STATUS_IS_OK(result)) {
+                               if (domain_name)
+                                       fstrcpy(domain->name, domain_name);
+                               
+                               if (dom_sid) 
+                                       sid_copy(&domain->sid, dom_sid);
+                       }
+               }
+       }
+       
 done:
+       
+       /* close the connection;  no other calls use this pipe and it is called only
+          on reestablishing the domain list   --jerry */
+       
        if ( conn.cli )
                cli_shutdown( conn.cli );
        
-       return ret;
+       talloc_destroy(mem_ctx);
+
+       domain->initialized = True;
+       
+       return;
 }
 
 
 
 /* Return a LSA policy handle on a domain */
 
-CLI_POLICY_HND *cm_get_lsa_handle(const char *domain)
+NTSTATUS cm_get_lsa_handle(struct winbindd_domain *domain, CLI_POLICY_HND **return_hnd)
 {
        struct winbindd_cm_conn *conn;
        uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
@@ -540,13 +918,16 @@ CLI_POLICY_HND *cm_get_lsa_handle(const char *domain)
        /* Look for existing connections */
 
        if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_LSARPC, &conn)))
-               return NULL;
+               return result;
 
        /* This *shitty* code needs scrapping ! JRA */
+       
        if (policy_handle_is_valid(&conn->pol)) {
                hnd.pol = conn->pol;
                hnd.cli = conn->cli;
-               return &hnd;
+               *return_hnd = &hnd;
+
+               return NT_STATUS_OK;
        }
        
        result = cli_lsa_open_policy(conn->cli, conn->cli->mem_ctx, False, 
@@ -556,7 +937,7 @@ CLI_POLICY_HND *cm_get_lsa_handle(const char *domain)
                /* 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;
+                               return result;
 
                        result = cli_lsa_open_policy(conn->cli, conn->cli->mem_ctx, False, 
                                                     des_access, &conn->pol);
@@ -566,19 +947,21 @@ CLI_POLICY_HND *cm_get_lsa_handle(const char *domain)
                        cli_shutdown(conn->cli);
                        DLIST_REMOVE(cm_conns, conn);
                        SAFE_FREE(conn);
-                       return NULL;
+                       return result;
                }
        }       
 
        hnd.pol = conn->pol;
        hnd.cli = conn->cli;
 
-       return &hnd;
+       *return_hnd = &hnd;
+
+       return NT_STATUS_OK;
 }
 
 /* Return a SAM policy handle on a domain */
 
-CLI_POLICY_HND *cm_get_sam_handle(char *domain)
+NTSTATUS cm_get_sam_handle(struct winbindd_domain *domain, CLI_POLICY_HND **return_hnd)
 { 
        struct winbindd_cm_conn *conn;
        uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
@@ -588,277 +971,62 @@ CLI_POLICY_HND *cm_get_sam_handle(char *domain)
        /* Look for existing connections */
 
        if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_SAMR, &conn)))
-               return NULL;
+               return result;
        
        /* This *shitty* code needs scrapping ! JRA */
+       
        if (policy_handle_is_valid(&conn->pol)) {
                hnd.pol = conn->pol;
                hnd.cli = conn->cli;
-               return &hnd;
+               
+               *return_hnd = &hnd;
+
+               return NT_STATUS_OK;
        }
+       
        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;
+                               return result;
 
                        result = cli_samr_connect(conn->cli, conn->cli->mem_ctx,
                                                  des_access, &conn->pol);
                }
 
                if (!NT_STATUS_IS_OK(result)) {
+               
                        cli_shutdown(conn->cli);
                        DLIST_REMOVE(cm_conns, conn);
                        SAFE_FREE(conn);
-                       return NULL;
+                       
+                       return result;
                }
        }       
 
        hnd.pol = conn->pol;
        hnd.cli = conn->cli;
 
-       return &hnd;
-}
-
-#if 0  /* This code now *well* out of date */
-
-/* Return a SAM domain policy handle on a domain */
-
-CLI_POLICY_HND *cm_get_sam_dom_handle(char *domain, DOM_SID *domain_sid)
-{
-       struct winbindd_cm_conn *conn, *basic_conn = NULL;
-       static CLI_POLICY_HND hnd;
-       NTSTATUS result;
-       uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
-
-       /* Look for existing connections */
-
-       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) {
-
-                       if (!connection_ok(conn)) {
-                               /* Shutdown cli?  Free conn?  Allow retry of DC? */
-                               DLIST_REMOVE(cm_conns, conn);
-                               return NULL;
-                       }
-
-                       goto ok;
-               }
-       }
-
-       /* Create a basic handle to open a domain handle from */
-
-       if (!cm_get_sam_handle(domain))
-               return False;
-
-       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 (!(conn = (struct winbindd_cm_conn *)
-             malloc(sizeof(struct winbindd_cm_conn))))
-               return NULL;
-       
-       ZERO_STRUCTP(conn);
-
-       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_DOM;
-       conn->cli = basic_conn->cli;
-
-       result = cli_samr_open_domain(conn->cli, conn->cli->mem_ctx,
-                                     &basic_conn->pol, des_access, 
-                                     domain_sid, &conn->pol);
-
-       if (!NT_STATUS_IS_OK(result))
-               return NULL;
-
-       /* Add to list */
-
-       DLIST_ADD(cm_conns, conn);
-
- ok:
-       hnd.pol = conn->pol;
-       hnd.cli = conn->cli;
-
-       return &hnd;
-}
-
-/* Return a SAM policy handle on a domain user */
-
-CLI_POLICY_HND *cm_get_sam_user_handle(char *domain, DOM_SID *domain_sid,
-                                      uint32 user_rid)
-{
-       struct winbindd_cm_conn *conn, *basic_conn = NULL;
-       static CLI_POLICY_HND hnd;
-       NTSTATUS result;
-       uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
-
-       /* Look for existing connections */
-
-       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 (!connection_ok(conn)) {
-                               /* Shutdown cli?  Free conn?  Allow retry of DC? */
-                               DLIST_REMOVE(cm_conns, conn);
-                               return NULL;
-                       }
-               
-                       goto ok;
-               }
-       }
-
-       /* Create a domain handle to open a user handle from */
-
-       if (!cm_get_sam_dom_handle(domain, domain_sid))
-               return NULL;
-
-       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;
-       }
-       
-       if (!basic_conn) {
-               DEBUG(0, ("No domain sam handle was created!\n"));
-               return NULL;
-       }
-
-       if (!(conn = (struct winbindd_cm_conn *)
-             malloc(sizeof(struct winbindd_cm_conn))))
-               return NULL;
-       
-       ZERO_STRUCTP(conn);
-
-       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;
-
-       result = cli_samr_open_user(conn->cli, conn->cli->mem_ctx,
-                                   &basic_conn->pol, des_access, user_rid,
-                                   &conn->pol);
-
-       if (!NT_STATUS_IS_OK(result))
-               return NULL;
-
-       /* Add to list */
-
-       DLIST_ADD(cm_conns, conn);
-
- ok:
-       hnd.pol = conn->pol;
-       hnd.cli = conn->cli;
-
-       return &hnd;
-}
-
-/* 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)
-{
-       struct winbindd_cm_conn *conn, *basic_conn = NULL;
-       static CLI_POLICY_HND hnd;
-       NTSTATUS result;
-       uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
-
-       /* Look for existing connections */
-
-       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) {
-
-                       if (!connection_ok(conn)) {
-                               /* Shutdown cli?  Free conn?  Allow retry of DC? */
-                               DLIST_REMOVE(cm_conns, conn);
-                               return NULL;
-                       }
-               
-                       goto ok;
-               }
-       }
-
-       /* Create a domain handle to open a user handle from */
-
-       if (!cm_get_sam_dom_handle(domain, domain_sid))
-               return NULL;
-
-       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;
-       }
-       
-       if (!basic_conn) {
-               DEBUG(0, ("No domain sam handle was created!\n"));
-               return NULL;
-       }
-
-       if (!(conn = (struct winbindd_cm_conn *)
-             malloc(sizeof(struct winbindd_cm_conn))))
-               return NULL;
-       
-       ZERO_STRUCTP(conn);
-
-       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;
-
-       result = cli_samr_open_group(conn->cli, conn->cli->mem_ctx,
-                                   &basic_conn->pol, des_access, group_rid,
-                                   &conn->pol);
-
-       if (!NT_STATUS_IS_OK(result))
-               return NULL;
-
-       /* Add to list */
-
-       DLIST_ADD(cm_conns, conn);
-
- ok:
-       hnd.pol = conn->pol;
-       hnd.cli = conn->cli;
+       *return_hnd = &hnd;
 
-       return &hnd;
+       return NT_STATUS_OK;
 }
 
-#endif
-
 /* 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. */
 
-NTSTATUS cm_get_netlogon_cli(const char *domain, const unsigned char *trust_passwd,
+NTSTATUS cm_get_netlogon_cli(struct winbindd_domain *domain, 
+                            const unsigned char *trust_passwd, 
+                            uint32 sec_channel_type,
+                            BOOL fresh,
                             struct cli_state **cli)
 {
        NTSTATUS result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
        struct winbindd_cm_conn *conn;
-       uint32 neg_flags = 0x000001ff;
        fstring lock_name;
        BOOL got_mutex;
 
@@ -867,47 +1035,55 @@ NTSTATUS cm_get_netlogon_cli(const char *domain, const unsigned char *trust_pass
 
        /* Open an initial conection - keep the mutex. */
 
-       if (!NT_STATUS_IS_OK(result = get_connection_from_cache(domain, PIPE_NETLOGON, &conn)))
+       find_cm_connection(domain, PIPE_NETLOGON, &conn);
+
+       if ( fresh && (conn != NULL) ) {
+               cli_shutdown(conn->cli);
+               conn->cli = NULL;
+
+               conn = NULL;
+
+               /* purge connection from cache */
+               find_cm_connection(domain, PIPE_NETLOGON, &conn);
+               if (conn != NULL) {
+                       DEBUG(0,("Could not purge connection\n"));
+                       return NT_STATUS_UNSUCCESSFUL;
+               }
+       }
+
+       if (conn != NULL) {
+               *cli = conn->cli;
+               return NT_STATUS_OK;
+       }
+
+       result = new_cm_connection(domain, PIPE_NETLOGON, &conn);
+
+       if (!NT_STATUS_IS_OK(result))
                return result;
        
-       snprintf(lock_name, sizeof(lock_name), "NETLOGON\\%s", conn->controller);
+       fstr_sprintf(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));
        }
+       
+       if ( sec_channel_type == SEC_CHAN_DOMAIN )
+               fstr_sprintf(conn->cli->mach_acct, "%s$", lp_workgroup());
                        
-       result = cli_nt_setup_creds(conn->cli, get_sec_chan(), trust_passwd, &neg_flags, 2);
+       /* This must be the remote domain (not ours) for schannel */
 
+       fstrcpy( conn->cli->domain, domain->name);
+       
+       result = cli_nt_establish_netlogon(conn->cli, sec_channel_type, trust_passwd);
+       
        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, get_sec_chan(),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;
-               }
+               cli_shutdown(conn->cli);
+               DLIST_REMOVE(cm_conns, conn);
+               SAFE_FREE(conn);
+               return result;
        }
 
        *cli = conn->cli;
@@ -948,3 +1124,34 @@ void winbindd_cm_status(void)
        else
                DEBUG(0, ("\tNo active connections\n"));
 }
+
+/* Close all cached connections */
+
+void winbindd_cm_flush(void)
+{
+       struct winbindd_cm_conn *conn, tmp;
+
+       /* Flush connection cache */
+
+       for (conn = cm_conns; conn; conn = conn->next) {
+
+               if (!connection_ok(conn))
+                       continue;
+
+               DEBUG(10, ("Closing connection to %s on %s\n",
+                       conn->pipe_name, conn->controller));
+
+               if (conn->cli)
+                       cli_shutdown(conn->cli);
+
+               tmp.next = conn->next;
+
+               DLIST_REMOVE(cm_conns, conn);
+               SAFE_FREE(conn);
+               conn = &tmp;
+       }
+
+       /* Flush failed connection cache */
+
+       flush_negative_conn_cache();
+}