Changeset 204 for branches/samba-3.2.x/source/winbindd/winbindd_cm.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/winbindd/winbindd_cm.c (modified) (11 diffs)

branches/samba-3.2.x/source/winbindd/winbindd_cm.c

@@ -847 +847 @@
                         if (NT_STATUS_IS_OK(result)) {
                                 /* Ensure creds are stored for NTLMSSP authenticated pipe access. */
-                                cli_init_creds(*cli, machine_account, domain->name, machine_password);
+                                cli_init_creds(*cli, machine_account, lp_workgroup(), machine_password);
                                 goto session_setup_done;
                         }
@@ -872 +872 @@
                 if (NT_STATUS_IS_OK(result)) {
                         /* Ensure creds are stored for NTLMSSP authenticated pipe access. */
-                        cli_init_creds(*cli, machine_account, domain->name, machine_password);
+                        cli_init_creds(*cli, machine_account, lp_workgroup(), machine_password);
                         goto session_setup_done;
                 }
@@ -909 +909 @@
 
         /* Fall back to anonymous connection, this might fail later */
+        DEBUG(10,("cm_prepare_connection: falling back to anonymous "
+                "connection for DC %s\n",
+                controller ));
 
         if (NT_STATUS_IS_OK(cli_session_setup(*cli, "", NULL, 0,
@@ -979 +982 @@
 }
 
+/*******************************************************************
+ Add a dcname and sockaddr_storage pair to the end of a dc_name_ip
+ array.
+
+ Keeps the list unique by not adding duplicate entries.
+
+ @param[in] mem_ctx talloc memory context to allocate from
+ @param[in] domain_name domain of the DC
+ @param[in] dcname name of the DC to add to the list
+ @param[in] pss Internet address and port pair to add to the list
+ @param[in,out] dcs array of dc_name_ip structures to add to
+ @param[in,out] num_dcs number of dcs returned in the dcs array
+ @return true if the list was added to, false otherwise
+*******************************************************************/
+
 static bool add_one_dc_unique(TALLOC_CTX *mem_ctx, const char *domain_name,
                               const char *dcname, struct sockaddr_storage *pss,
                               struct dc_name_ip **dcs, int *num)
 {
+        int i = 0;
+
         if (!NT_STATUS_IS_OK(check_negative_conn_cache(domain_name, dcname))) {
                 DEBUG(10, ("DC %s was in the negative conn cache\n", dcname));
                 return False;
         }
+
+        /* Make sure there's no duplicates in the list */
+        for (i=0; i<*num; i++)
+                if (addr_equal(&(*dcs)[i].ss, pss))
+                        return False;
 
         *dcs = TALLOC_REALLOC_ARRAY(mem_ctx, *dcs, struct dc_name_ip, (*num)+1);
@@ -1118 +1143 @@
 
 /*******************************************************************
- Retreive a list of IP address for domain controllers.  Fill in 
- the dcs[]  with results.
+ Retrieve a list of IP addresses for domain controllers.
+
+ The array is sorted in the preferred connection order.
+
+ @param[in] mem_ctx talloc memory context to allocate from
+ @param[in] domain domain to retrieve DCs for
+ @param[out] dcs array of dcs that will be returned
+ @param[out] num_dcs number of dcs returned in the dcs array
+ @return always true
 *******************************************************************/
 
@@ -1135 +1167 @@
         is_our_domain = strequal(domain->name, lp_workgroup());
 
+        /* If not our domain, get the preferred DC, by asking our primary DC */
         if ( !is_our_domain
                 && get_dc_name_via_netlogon(domain, dcname, &ss)
-                && add_one_dc_unique(mem_ctx, domain->name, dcname, &ss, dcs, num_dcs) )
+                && add_one_dc_unique(mem_ctx, domain->name, dcname, &ss, dcs,
+                       num_dcs) )
         {
                 char addr[INET6_ADDRSTRLEN];
@@ -1164 +1198 @@
 
                         /* Do the site-specific AD dns lookup first. */
-                        get_sorted_dc_list(domain->alt_name, sitename, &ip_list, &iplist_size, True);
-
+                        get_sorted_dc_list(domain->alt_name, sitename, &ip_list,
+                               &iplist_size, True);
+
+                        /* Add ips to the DC array.  We don't look up the name
+                           of the DC in this function, but we fill in the char*
+                           of the ip now to make the failed connection cache
+                           work */
                         for ( i=0; i<iplist_size; i++ ) {
                                 char addr[INET6_ADDRSTRLEN];
@@ -1183 +1222 @@
                 }
 
-                /* Now we add DCs from the main AD dns lookup. */
-                get_sorted_dc_list(domain->alt_name, NULL, &ip_list, &iplist_size, True);
+                /* Now we add DCs from the main AD DNS lookup. */
+                get_sorted_dc_list(domain->alt_name, NULL, &ip_list,
+                        &iplist_size, True);
 
                 for ( i=0; i<iplist_size; i++ ) {
@@ -1197 +1237 @@
                                         num_dcs);
                 }
+
+                SAFE_FREE(ip_list);
+                iplist_size = 0;
         }
 
-        /* try standard netbios queries if no ADS */
-
-        if (iplist_size==0) {
-                get_sorted_dc_list(domain->name, NULL, &ip_list, &iplist_size, False);
-        }
-
-        /* FIXME!! this is where we should re-insert the GETDC requests --jerry */
-
-        /* now add to the dc array.  We'll wait until the last minute 
-           to look up the name of the DC.  But we fill in the char* for 
-           the ip now in to make the failed connection cache work */
-
-        for ( i=0; i<iplist_size; i++ ) {
-                char addr[INET6_ADDRSTRLEN];
-                print_sockaddr(addr, sizeof(addr),
-                                &ip_list[i].ss);
-                add_one_dc_unique(mem_ctx, domain->name, addr,
-                        &ip_list[i].ss, dcs, num_dcs);
-        }
-
-        SAFE_FREE( ip_list );
+        /* Try standard netbios queries if no ADS */
+        if (*num_dcs == 0) {
+                get_sorted_dc_list(domain->name, NULL, &ip_list, &iplist_size,
+                       False);
+
+                for ( i=0; i<iplist_size; i++ ) {
+                        char addr[INET6_ADDRSTRLEN];
+                        print_sockaddr(addr, sizeof(addr),
+                                        &ip_list[i].ss);
+                        add_one_dc_unique(mem_ctx,
+                                        domain->name,
+                                        addr,
+                                        &ip_list[i].ss,
+                                        dcs,
+                                        num_dcs);
+                }
+
+                SAFE_FREE(ip_list);
+                iplist_size = 0;
+        }
 
         return True;
 }
+
+/*******************************************************************
+ Find and make a connection to a DC in the given domain.
+
+ @param[in] mem_ctx talloc memory context to allocate from
+ @param[in] domain domain to find a dc in
+ @param[out] dcname NetBIOS or FQDN of DC that's connected to
+ @param[out] pss DC Internet address and port
+ @param[out] fd fd of the open socket connected to the newly found dc
+ @return true when a DC connection is made, false otherwise
+*******************************************************************/
 
 static bool find_new_dc(TALLOC_CTX *mem_ctx,
@@ -1901 +1954 @@
            netlogon pipe. */
 
+        if (!domain->conn.netlogon_pipe->dc) {
+                return false;
+        }
+
         *ppdc = domain->conn.netlogon_pipe->dc;
         return True;
@@ -1926 +1983 @@
                 goto done;
         }
+
 
         /*