Changeset 228 for branches/samba-3.2.x/source/utils/net_dns.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/utils/net_dns.c (modified) (2 diffs)

branches/samba-3.2.x/source/utils/net_dns.c

@@ -146 +146 @@
 
 {
-        struct iface_struct nics[MAX_INTERFACES];
         int i, n;
         struct sockaddr_storage *list = NULL;
         int count = 0;
 
-        /* find the first non-loopback address from our list of interfaces */
-
-        n = get_interfaces(nics, MAX_INTERFACES);
+        /* Honor the configured list of interfaces to register */
+
+        load_interfaces();
+        n = iface_count();
 
         if (n <= 0) {
@@ -164 +164 @@
 
         for ( i=0; i<n; i++ ) {
-                if (is_loopback_addr(&nics[i].ip)) {
+                const struct sockaddr_storage *nic_sa_storage = NULL;
+
+                if ((nic_sa_storage = iface_n_sockaddr_storage(i)) == NULL)
+                        continue;
+
+                /* Don't register loopback addresses */
+                if (is_loopback_addr(nic_sa_storage)) {
                         continue;
                 }
-#if defined(HAVE_IPV6)
-                if ((nics[i].ip.ss_family == AF_INET6)) {
-                        memcpy(&list[count++], &nics[i].ip,
-                               sizeof(struct sockaddr_storage));
-                } else
-#endif
-                if (nics[i].ip.ss_family == AF_INET) {
-                        memcpy(&list[count++], &nics[i].ip,
-                               sizeof(struct sockaddr_storage));
-                }
+
+                memcpy(&list[count++], nic_sa_storage, sizeof(struct sockaddr_storage));
         }
         *pp_ss = list;