Changeset 258

Timestamp:

Jun 10, 2009, 5:36:01 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for interface list (by diver) in 3.3 branch

File:

• branches/samba-3.3.x/source/lib/replace/getifaddrs.c (modified) (6 diffs)

branches/samba-3.3.x/source/lib/replace/getifaddrs.c

@@ -262 +262 @@
         struct ifaddrs *curif;
         struct ifaddrs *lastif = NULL;
+#ifdef __OS2__
+        int total = 0;
+#endif
 
         *ifap = NULL;
@@ -288 +291 @@
 
                 if (ioctl(fd, SIOCGIFADDR, ifr) != 0) {
+#ifndef __OS2__
                         freeaddrinfo(*ifap);
                         return -1;
+#else
+   goto next;
+#endif
                 }
 
@@ -307 +314 @@
 
                 if (ioctl(fd, SIOCGIFFLAGS, ifr) != 0) {
+#ifndef __OS2__
                         freeaddrinfo(*ifap);
                         return -1;
+#else
+   goto next;
+#endif
                 }
 
@@ -314 +325 @@
 
                 if (ioctl(fd, SIOCGIFNETMASK, ifr) != 0) {
+#ifndef __OS2__
                         freeaddrinfo(*ifap);
                         return -1;
+#else
+   goto next;
+#endif
                 }
 
@@ -321 +336 @@
 
                 lastif = curif;
+  total ++;
 
         next:
@@ -339 +355 @@
 
         close(fd);
+#ifndef __OS2__
         return 0;
+#else
+   if (total == 0) {
+                          freeifaddrs(*ifap);
+                          return -1;
+     }
+#endif
 }