Changeset 221 for branches/samba-3.3.x/source/lib/replace

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

Location:

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

Files:

• getifaddrs.c (modified) (3 diffs)
• libreplace_ld.m4 (modified) (1 diff)
• libreplace_network.m4 (modified) (2 diffs)

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

@@ -85 +85 @@
         int fd, i, n;
         struct ifreq *ifr=NULL;
-        struct in_addr ipaddr;
-        struct in_addr nmask;
-        char *iname;
         struct ifaddrs *curif;
         struct ifaddrs *lastif = NULL;
@@ -165 +162 @@
         int fd, i, n;
         struct ifreq *ifr=NULL;
-        struct in_addr ipaddr;
-        struct in_addr nmask;
-        char *iname;
         struct ifaddrs *curif;
         struct ifaddrs *lastif = NULL;
@@ -266 +260 @@
         struct ifconf ifc;
         struct ifreq *ifr=NULL;
-        struct in_addr ipaddr;
-        struct in_addr nmask;
-        char *iname;
         struct ifaddrs *curif;
         struct ifaddrs *lastif = NULL;

branches/samba-3.3.x/source/lib/replace/libreplace_ld.m4

@@ -293 +293 @@
                         LIB_PATH_VAR=LD_LIBRARY_PATH
                 ;;
-                *netbsd*)
+                *bsd*)
                         LIB_PATH_VAR=LD_LIBRARY_PATH
                 ;;

branches/samba-3.3.x/source/lib/replace/libreplace_network.m4

@@ -8 +8 @@
 
 AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
-AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
+AC_CHECK_HEADERS(netinet/in_systm.h)
+AC_CHECK_HEADERS([netinet/ip.h], [], [], [#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif])
+AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h)
 AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
 
@@ -347 +354 @@
 #include <sys/types.h>
 #include <netdb.h>
+#include <netinet/in.h>
                 ],
                 [