Changeset 599 for trunk/server/source3/lib/util_sock.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/source3/lib/util_sock.c (modified) (3 diffs)

trunk/server/source3/lib/util_sock.c

@@ -1846 +1846 @@
 
 /************************************************************
+ Is this my ip address ?
+************************************************************/
+
+static bool is_my_ipaddr(const char *ipaddr_str)
+{
+        struct sockaddr_storage ss;
+        struct iface_struct *nics;
+        int i, n;
+
+        if (!interpret_string_addr(&ss, ipaddr_str, AI_NUMERICHOST)) {
+                return false;
+        }
+
+        if (ismyaddr((struct sockaddr *)&ss)) {
+                return true;
+        }
+
+        if (is_zero_addr((struct sockaddr *)&ss) ||
+                is_loopback_addr((struct sockaddr *)&ss)) {
+                return false;
+        }
+
+        n = get_interfaces(talloc_tos(), &nics);
+        for (i=0; i<n; i++) {
+                if (sockaddr_equal((struct sockaddr *)&nics[i].ip, (struct sockaddr *)&ss)) {
+                        TALLOC_FREE(nics);
+                        return true;
+                }
+        }
+        TALLOC_FREE(nics);
+        return false;
+}
+
+/************************************************************
  Is this my name ?
 ************************************************************/
@@ -1852 +1886 @@
 {
         TALLOC_CTX *ctx = talloc_tos();
-        char addr[INET6_ADDRSTRLEN];
         char *name = NULL;
         const char *dnsname;
@@ -1900 +1933 @@
         }
 
-        /* Handle possible CNAME records - convert to an IP addr. */
+        /* Handle possible CNAME records - convert to an IP addr. list. */
         if (!is_ipaddress(servername)) {
-                /* Use DNS to resolve the name, but only the first address */
-                struct sockaddr_storage ss;
-                if (interpret_string_addr(&ss, servername, 0)) {
+                /* Use DNS to resolve the name, check all addresses. */
+                struct addrinfo *p = NULL;
+                struct addrinfo *res = NULL;
+
+                if (!interpret_string_addr_internal(&res,
+                                servername,
+                                AI_ADDRCONFIG)) {
+                        return false;
+                }
+
+                for (p = res; p; p = p->ai_next) {
+                        char addr[INET6_ADDRSTRLEN];
+                        struct sockaddr_storage ss;
+
+                        ZERO_STRUCT(ss);
+                        memcpy(&ss, p->ai_addr, p->ai_addrlen);
                         print_sockaddr(addr,
                                         sizeof(addr),
                                         &ss);
-                        servername = addr;
-                }
+                        if (is_my_ipaddr(addr)) {
+                                freeaddrinfo(res);
+                                return true;
+                        }
+                }
+                freeaddrinfo(res);
         }
 
         /* Maybe its an IP address? */
         if (is_ipaddress(servername)) {
-                struct sockaddr_storage ss;
-                struct iface_struct *nics;
-                int i, n;
-
-                if (!interpret_string_addr(&ss, servername, AI_NUMERICHOST)) {
-                        return false;
-                }
-
-                if (ismyaddr((struct sockaddr *)&ss)) {
-                        return true;
-                }
-
-                if (is_zero_addr((struct sockaddr *)&ss) || 
-                        is_loopback_addr((struct sockaddr *)&ss)) {
-                        return false;
-                }
-
-                n = get_interfaces(talloc_tos(), &nics);
-                for (i=0; i<n; i++) {
-                        if (sockaddr_equal((struct sockaddr *)&nics[i].ip, (struct sockaddr *)&ss)) {
-                                TALLOC_FREE(nics);
-                                return true;
-                        }
-                }
-                TALLOC_FREE(nics);
+                return is_my_ipaddr(servername);
         }