svn commit: samba r8540 - in branches/SAMBA_4_0/source: build/m4 lib/netif

[tridge at samba.org]

Author: tridge
Date: 2005-07-18 09:46:52 +0000 (Mon, 18 Jul 2005)
New Revision: 8540

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8540

Log:
fixed network interface detection on several hosts

Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4
   branches/SAMBA_4_0/source/lib/netif/netif.c
   branches/SAMBA_4_0/source/lib/netif/netif.h


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4	2005-07-18 08:30:32 UTC (rev 8539)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4	2005-07-18 09:46:52 UTC (rev 8540)
@@ -651,7 +651,6 @@
 #define HAVE_IFACE_AIX 1
 #define AUTOCONF_TEST 1
 #include "confdefs.h"
-#include "${srcdir-.}/lib/netif/netif.h"
 #include "${srcdir-.}/lib/netif/netif.c"],
            samba_cv_HAVE_IFACE_AIX=yes,samba_cv_HAVE_IFACE_AIX=no,samba_cv_HAVE_IFACE_AIX=cross)])
 if test x"$samba_cv_HAVE_IFACE_AIX" = x"yes"; then
@@ -664,7 +663,6 @@
 #define HAVE_IFACE_IFCONF 1
 #define AUTOCONF_TEST 1
 #include "confdefs.h"
-#include "${srcdir-.}/lib/netif/netif.h"
 #include "${srcdir-.}/lib/netif/netif.c"],
            samba_cv_HAVE_IFACE_IFCONF=yes,samba_cv_HAVE_IFACE_IFCONF=no,samba_cv_HAVE_IFACE_IFCONF=cross)])
 if test x"$samba_cv_HAVE_IFACE_IFCONF" = x"yes"; then
@@ -678,7 +676,6 @@
 #define HAVE_IFACE_IFREQ 1
 #define AUTOCONF_TEST 1
 #include "confdefs.h"
-#include "${srcdir-.}/lib/netif/netif.h"
 #include "${srcdir-.}/lib/netif/netif.c"],
            samba_cv_HAVE_IFACE_IFREQ=yes,samba_cv_HAVE_IFACE_IFREQ=no,samba_cv_HAVE_IFACE_IFREQ=cross)])
 if test x"$samba_cv_HAVE_IFACE_IFREQ" = x"yes"; then

Modified: branches/SAMBA_4_0/source/lib/netif/netif.c
===================================================================
--- branches/SAMBA_4_0/source/lib/netif/netif.c	2005-07-18 08:30:32 UTC (rev 8539)
+++ branches/SAMBA_4_0/source/lib/netif/netif.c	2005-07-18 09:46:52 UTC (rev 8540)
@@ -35,15 +35,15 @@
 #include <sys/types.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
 #include <net/if.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #ifndef AUTOCONF_TEST
-#include "lib/netif/netif.h"
 #include "config.h"
 #endif
 
@@ -77,6 +77,8 @@
 #define QSORT_CAST (int (*)(const void *, const void *))
 #endif
 
+#include "netif.h"
+
 #if HAVE_IFACE_IFCONF
 
 /* this works for Linux 2.2, Solaris 2.5, SunOS4, HPUX 10.20, OSF1

Modified: branches/SAMBA_4_0/source/lib/netif/netif.h
===================================================================
--- branches/SAMBA_4_0/source/lib/netif/netif.h	2005-07-18 08:30:32 UTC (rev 8539)
+++ branches/SAMBA_4_0/source/lib/netif/netif.h	2005-07-18 09:46:52 UTC (rev 8540)
@@ -20,10 +20,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 struct iface_struct {
 	char name[16];
 	struct in_addr ip;