r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation
[tprouty/samba.git] / source / nsswitch / winbindd_cm.c
index 8513a46f8f2ebb2514a43f7181c98440c2e55193..1843ec188b03479bfa058f37e091b751f359e699 100644 (file)
@@ -56,6 +56,7 @@
 
  */
 
+#include "includes.h"
 #include "winbindd.h"
 
 #undef DBGC_CLASS
@@ -69,13 +70,15 @@ 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;
 
+static NTSTATUS get_connection_from_cache(struct winbindd_domain *domain,
+                                         const char *pipe_name,
+                                         struct winbindd_cm_conn **conn_out);
 
 /* Choose between anonymous or authenticated connections.  We need to use
    an authenticated connection if DCs have the RestrictAnonymous registry
@@ -110,182 +113,557 @@ static void cm_get_ipc_userpass(char **username, char **domain, char **password)
        }
 }
 
-/* Open a connction to the remote server, cache failures for 30 seconds */
+/*
+  setup for schannel on any pipes opened on this connection
+*/
+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;
+               }
+       }
 
-static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
-                              struct winbindd_cm_conn *new_conn)
+       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)
 {
+       struct winbindd_domain *our_domain;
        NTSTATUS result;
-       char *machine_password; 
-       char *machine_krb5_principal, *ipc_username, *ipc_domain, *ipc_password;
-       struct in_addr dc_ip;
-       int i;
-       BOOL retry = True;
+       struct winbindd_cm_conn *conn;
+       TALLOC_CTX *mem_ctx;
 
-       ZERO_STRUCT(dc_ip);
+       fstring tmp;
+       char *p;
 
-       fstrcpy(new_conn->domain, domain);
-       fstrcpy(new_conn->pipe_name, get_pipe_name_from_index(pipe_index));
-       
-       /* connection failure cache has been moved inside of get_dc_name
-          so we can deal with half dead DC's   --jerry */
+       if (IS_DC)
+               return False;
 
-       if (!get_dc_name(domain, new_conn->controller, &dc_ip)) {
-               result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
-               add_failed_connection_entry(domain, "", result);
-               return result;
-       }
-               
-       /* Initialise SMB connection */
+       if (domain->primary)
+               return False;
+
+       if ((our_domain = find_our_domain()) == NULL)
+               return False;
+
+       result = get_connection_from_cache(our_domain, PIPE_NETLOGON, &conn);
+       if (!NT_STATUS_IS_OK(result))
+               return False;
+
+       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;
+
+       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;
+
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+       struct sockaddr peeraddr;
+       socklen_t peeraddr_len;
+
+       struct sockaddr_in *peeraddr_in = (struct sockaddr_in *)&peeraddr;
 
-       /* grab stored passwords */
-       machine_password = secrets_fetch_machine_password(lp_workgroup(), NULL, NULL);
+       machine_password = secrets_fetch_machine_password(lp_workgroup(), NULL,
+                                                         NULL);
        
-       if (asprintf(&machine_krb5_principal, "%s$@%s", global_myname(), lp_realm()) == -1) {
+       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);
 
-       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;
+       *retry = True;
+
+       got_mutex = secrets_named_mutex(controller,
+                                       WINBIND_SERVER_MUTEX_WAIT_TIME);
+
+       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;
+       }
+
+       (*cli)->timeout = 10000;        /* 10 seconds */
+       (*cli)->fd = sockfd;
+       fstrcpy((*cli)->desthost, controller);
+       (*cli)->use_kerberos = True;
+
+       peeraddr_len = sizeof(peeraddr);
+
+       if ((getpeername((*cli)->fd, &peeraddr, &peeraddr_len) != 0) ||
+           (peeraddr_len != sizeof(struct sockaddr_in)) ||
+           (peeraddr_in->sin_family != PF_INET))
+               goto done;
+
+       if (ntohs(peeraddr_in->sin_port) == 139) {
+               struct nmb_name calling;
+               struct nmb_name called;
+
+               make_nmb_name(&calling, global_myname(), 0x0);
+               make_nmb_name(&called, "*SMBSERVER", 0x20);
+
+               if (!cli_session_request(*cli, &calling, &called)) {
+                       DEBUG(8, ("cli_session_request failed for %s\n",
+                                 controller));
+                       goto done;
                }
-               
-               new_conn->cli = NULL;
-               result = cli_start_connection(&new_conn->cli, global_myname(), 
-                                             new_conn->controller, 
-                                             &dc_ip, 0, Undefined, 
-                                             CLI_FULL_CONNECTION_USE_KERBEROS, 
-                                             &retry);
+       }
 
-               if (NT_STATUS_IS_OK(result)) {
+       cli_setup_signing_state(*cli, Undefined);
 
-                       /* reset the error code */
-                       result = NT_STATUS_UNSUCCESSFUL; 
+       if (!cli_negprot(*cli)) {
+               DEBUG(1, ("cli_negprot failed\n"));
+               cli_shutdown(*cli);
+               goto done;
+       }
 
-                       /* Krb5 session */
-                       
-                       if ((lp_security() == SEC_ADS) 
-                               && (new_conn->cli->protocol >= PROTOCOL_NT1 && new_conn->cli->capabilities & CAP_EXTENDED_SECURITY)) {
-                               new_conn->cli->use_kerberos = True;
-                               DEBUG(5, ("connecting to %s from %s with kerberos principal [%s]\n", 
-                                         new_conn->controller, global_myname(), machine_krb5_principal));
-
-                               result = NT_STATUS_OK;
-
-                               if (!cli_session_setup_spnego(new_conn->cli, machine_krb5_principal, 
-                                                             machine_password, 
-                                                             domain)) {
-                                       result = cli_nt_error(new_conn->cli);
-                                       DEBUG(4,("failed kerberos session setup with %s\n", nt_errstr(result)));
-                                       if (NT_STATUS_IS_OK(result)) 
-                                               result = NT_STATUS_UNSUCCESSFUL;
-                               }
-                       }
-                       new_conn->cli->use_kerberos = False;
+       /* Krb5 session */
                        
-                       /* only do this is we have a username/password for thr IPC$ connection */
-                       
-                       if ( !NT_STATUS_IS_OK(result) 
-                               && new_conn->cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE
-                               && strlen(ipc_username) )
-                       {       
-                               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;
-
-                               if (!cli_session_setup(new_conn->cli, ipc_username, 
-                                                      ipc_password, strlen(ipc_password)+1, 
-                                                      ipc_password, strlen(ipc_password)+1, 
-                                                      domain)) {
-                                       result = cli_nt_error(new_conn->cli);
-                                       DEBUG(4,("failed authenticated session setup with %s\n", nt_errstr(result)));
-                                       if (NT_STATUS_IS_OK(result)) 
-                                               result = NT_STATUS_UNSUCCESSFUL;
-                               }
-                       }
-                       
-                       /* anonymous is all that is left if we get to here */
-                       
-                       if (!NT_STATUS_IS_OK(result)) { 
-                       
-                               DEBUG(5, ("anonymous connection attempt to %s from %s\n", 
-                                         new_conn->controller, global_myname()));
-                                         
-                               result = NT_STATUS_OK;
-
-                               if (!cli_session_setup(new_conn->cli, "", NULL, 0, NULL, 0, "")) 
-                               {
-                                       result = cli_nt_error(new_conn->cli);
-                                       DEBUG(4,("failed anonymous session setup with %s\n", nt_errstr(result)));
-                                       if (NT_STATUS_IS_OK(result)) 
-                                               result = NT_STATUS_UNSUCCESSFUL;
-                               } 
-                               
-                       }
+       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) && !cli_send_tconX(new_conn->cli, "IPC$", "IPC",
-                                                                      "", 0)) {
-                               result = cli_nt_error(new_conn->cli);
-                               DEBUG(1,("failed tcon_X with %s\n", nt_errstr(result)));
-                               cli_shutdown(new_conn->cli);
-                               if (NT_STATUS_IS_OK(result)) {
-                                       result = NT_STATUS_UNSUCCESSFUL;
-                               }
-                       }
-               }
+       if (NT_STATUS_IS_OK(result))
+               goto session_setup_done;
 
-               if (NT_STATUS_IS_OK(result)) {
-                       struct ntuser_creds creds;
-                       init_creds(&creds, ipc_username, ipc_domain, ipc_password);
-                       cli_init_creds(new_conn->cli, &creds);
+       /* 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;
                }
+       }
+
+       /* 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;
+       }
+
+       result = cli_nt_error(*cli);
+
+       if (NT_STATUS_IS_OK(result))
+               result = NT_STATUS_UNSUCCESSFUL;
+
+       /* We can't session setup */
+
+       goto done;
 
-               if (got_mutex)
-                       secrets_named_mutex_release(new_conn->controller);
+ session_setup_done:
+
+       if (!cli_send_tconX(*cli, "IPC$", "IPC", "", 0)) {
+
+               result = cli_nt_error(*cli);
+
+               DEBUG(1,("failed tcon_X with %s\n", nt_errstr(result)));
 
                if (NT_STATUS_IS_OK(result))
-                       break;
+                       result = NT_STATUS_UNSUCCESSFUL;
+
+               cli_shutdown(*cli);
+               goto done;
+       }
+
+       init_creds(&creds, ipc_username, ipc_domain, ipc_password);
+       cli_init_creds(*cli, &creds);
+
+       secrets_named_mutex_release(controller);
+       got_mutex = False;
+       *retry = False;
+
+       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)));
+               }
+       }
+
+       /* 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);
-       SAFE_FREE(machine_password);
 
-       if (!NT_STATUS_IS_OK(result)) {
-               add_failed_connection_entry(domain, new_conn->controller, result);
-               return result;
+       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;
+
+       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);
+
+       *array = TALLOC_REALLOC_ARRAY(mem_ctx, *array, char *, (*num)+1);
+
+       if ((*array == NULL) || (dup_str == NULL))
+               return False;
+
+       (*array)[*num] = dup_str;
+       *num += 1;
+       return True;
+}
+
+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 BOOL get_dcs_1c(TALLOC_CTX *mem_ctx,
+                      const struct winbindd_domain *domain,
+                      struct dc_name_ip **dcs, int *num_dcs)
+{
+       struct ip_service *iplist = NULL;
+       int i, num = 0;
+
+       if (!internal_resolve_name(domain->name, 0x1c, &iplist, &num,
+                                  lp_name_resolve_order()))
+               return False;
+
+       /* Now try to find the server names of at least one IP address, hosts
+        * not replying are cached as such */
+
+       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;
+               }
        }
-       
-       /* set the domain if empty; needed for schannel connections */
-       if ( !*new_conn->cli->domain )
-               fstrcpy( new_conn->cli->domain, domain );
-               
-       
-       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(domain, new_conn->controller, result);
-               cli_shutdown(new_conn->cli);
-               return result;
+
+       return True;
+}
+
+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;
+
+       const char *p;
+
+       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))
+                       return True;
+
+       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);
        }
 
-       return NT_STATUS_OK;
+       if (must_use_pdc(domain->name) && get_pdc_ip(domain->name, &ip)) {
+
+               if (!name_status_find(domain->name, 0x1b, 0x20, ip, dcname))
+                       return False;
+
+               if (add_one_dc_unique(mem_ctx, domain->name,
+                                     dcname, ip, dcs, num_dcs))
+                       return True;
+       }
+
+       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;
+               }
+
+               if (!resolve_name(dcname, &ip, 0x20))
+                       continue;
+
+               add_one_dc_unique(mem_ctx, domain->name, dcname, ip,
+                                 dcs, num_dcs);
+       }
+
+       return True;
+}
+
+static BOOL find_new_dc(TALLOC_CTX *mem_ctx,
+                       const struct winbindd_domain *domain,
+                       fstring dcname, struct sockaddr_in *addr, int *fd)
+{
+       struct dc_name_ip *dcs = NULL;
+       int num_dcs = 0;
+
+       char **dcnames = NULL;
+       int num_dcnames = 0;
+
+       struct sockaddr_in *addrs = NULL;
+       int num_addrs = 0;
+
+       int i, fd_index;
+
+       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 ((num_dcnames == 0) || (num_dcnames != num_addrs))
+               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;
+       }
+
+       fstrcpy(dcname, dcnames[fd_index]);
+       *addr = addrs[fd_index];
+
+       return True;
+}
+
+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;
+
+       int retries;
+
+       if ((mem_ctx = talloc_init("cm_open_connection")) == NULL)
+               return NT_STATUS_NO_MEMORY;
+
+       for (retries = 0; retries < 3; retries++) {
+
+               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;
+                       }
+               }
+
+               if ((fd == -1) &&
+                   !find_new_dc(mem_ctx, domain, domain->dcname,
+                                &domain->dcaddr, &fd))
+                       break;
+
+               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;
+       }
+
+       talloc_destroy(mem_ctx);
+       return result;
 }
 
 /************************************************************************
@@ -293,7 +671,7 @@ static NTSTATUS cm_open_connection(const char *domain, const int pipe_index,
  setup cli_state struct
 ************************************************************************/
 
-NTSTATUS cm_fresh_connection(const char *domain, const int pipe_index,
+NTSTATUS cm_fresh_connection(struct winbindd_domain *domain, const int pipe_index,
                               struct cli_state **cli)
 {
        NTSTATUS result;
@@ -340,13 +718,13 @@ static BOOL connection_ok(struct winbindd_cm_conn *conn)
 /* Search the cache for a connection. If there is a broken one,
    shut it down properly and return NULL. */
 
-static void find_cm_connection(const char *domain, const char *pipe_name,
+static void find_cm_connection(struct winbindd_domain *domain, const char *pipe_name,
                               struct winbindd_cm_conn **conn_out) 
 {
        struct winbindd_cm_conn *conn;
 
        for (conn = cm_conns; conn; ) {
-               if (strequal(conn->domain, domain) && 
+               if (strequal(conn->domain, domain->name) && 
                    strequal(conn->pipe_name, pipe_name)) {
                        if (!connection_ok(conn)) {
                                /* Dead connection - remove it. */
@@ -369,20 +747,20 @@ static void find_cm_connection(const char *domain, const char *pipe_name,
 
 /* Initialize a new connection up to the RPC BIND. */
 
-static NTSTATUS new_cm_connection(const char *domain, const char *pipe_name,
+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 = malloc(sizeof(*conn))))
+       if (!(conn = SMB_MALLOC_P(struct winbindd_cm_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)));
+                         domain->name, pipe_name, nt_errstr(result)));
                SAFE_FREE(conn);
                return result;
        }
@@ -394,7 +772,7 @@ static NTSTATUS new_cm_connection(const char *domain, const char *pipe_name,
 
 /* 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(const char *domain, const char *pipe_name,
+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);
@@ -406,53 +784,131 @@ static NTSTATUS get_connection_from_cache(const char *domain, const char *pipe_n
 }
 
 /**********************************************************************************
+ 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;
 
-done:
+       /* Cheat - shut down the DS pipe, and open LSA */
 
-       /* close the connection;  no other cals use this pipe and it is called only
-          on reestablishing the domain list   --jerry */
+       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 */
 
-NTSTATUS cm_get_lsa_handle(const char *domain, CLI_POLICY_HND **return_hnd)
+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;
@@ -505,7 +961,7 @@ NTSTATUS cm_get_lsa_handle(const char *domain, CLI_POLICY_HND **return_hnd)
 
 /* Return a SAM policy handle on a domain */
 
-NTSTATUS cm_get_sam_handle(char *domain, CLI_POLICY_HND **return_hnd)
+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;
@@ -563,7 +1019,7 @@ NTSTATUS cm_get_sam_handle(char *domain, CLI_POLICY_HND **return_hnd)
 /* 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, 
+NTSTATUS cm_get_netlogon_cli(struct winbindd_domain *domain, 
                             const unsigned char *trust_passwd, 
                             uint32 sec_channel_type,
                             BOOL fresh,
@@ -573,7 +1029,6 @@ NTSTATUS cm_get_netlogon_cli(const char *domain,
        struct winbindd_cm_conn *conn;
        fstring lock_name;
        BOOL got_mutex;
-       struct winbindd_domain *wb_domain = NULL;
 
        if (!cli)
                return NT_STATUS_INVALID_PARAMETER;
@@ -615,16 +1070,9 @@ NTSTATUS cm_get_netlogon_cli(const char *domain,
        if ( sec_channel_type == SEC_CHAN_DOMAIN )
                fstr_sprintf(conn->cli->mach_acct, "%s$", lp_workgroup());
                        
-       /* we need the short form of the domain name for the schanel
-          rpc bind.  What if we fail?  I don't think we should ever get 
-          a request for a domain name not in our list but I'm not bailing 
-          out if we do since I'm not 10% certain about this   --jerry */
-          
-       if ( (wb_domain = find_domain_from_name( domain )) != NULL ) {
-               DEBUG(5,("cm_get_netlogon_cli: Using short for of domain name [%s] for netlogon rpc bind\n",
-                       wb_domain->name));
-               fstrcpy( conn->cli->domain, wb_domain->name);
-       }
+       /* 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);