Changeset 228 for branches/samba-3.2.x/source/lib/interface.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/lib/interface.c (modified) (5 diffs)

branches/samba-3.2.x/source/lib/interface.c

@@ -34 +34 @@
         struct interface *i;
         for (i=local_interfaces;i;i=i->next) {
-                if (addr_equal(&i->ip,ip)) {
+                if (sockaddr_equal(&i->ip,ip)) {
                         return true;
                 }
@@ -66 +66 @@
                                 return i;
                         }
-                } else if (addr_equal(&i->ip, ip)) {
+                } else if (sockaddr_equal(&i->ip, ip)) {
                         return i;
                 }
@@ -94 +94 @@
         struct interface *i;
         for (i=local_interfaces;i;i=i->next) {
-                if (addr_equal(&i->ip,pss)) {
+                if (sockaddr_equal(&i->ip,pss)) {
                         struct sockaddr_in6 *psa6 =
                                 (struct sockaddr_in6 *)pss;
@@ -389 +389 @@
 
                 for (i=0;i<total_probed;i++) {
-                        if (addr_equal(&ss, &probed_ifaces[i].ip)) {
+                        if (sockaddr_equal(&ss, &probed_ifaces[i].ip)) {
                                 add_interface(&probed_ifaces[i]);
                                 return;
@@ -442 +442 @@
 
         /* Maybe the first component was a broadcast address. */
-        if (addr_equal(&ss_bcast, &ss) || addr_equal(&ss_net, &ss)) {
+        if (sockaddr_equal(&ss_bcast, &ss) || sockaddr_equal(&ss_net, &ss)) {
                 for (i=0;i<total_probed;i++) {
                         if (same_net(&ss, &probed_ifaces[i].ip, &ss_mask)) {