diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-18 09:46:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:36 -0500 |
| commit | d1f9224f5824856339d80cf93f1bf4fcee57ce8f (patch) | |
| tree | 70949fd540043cdd926dac6be9f414afb11c487d | |
| parent | f293c2d16390deb9f001b7b8c6242ec0e969b879 (diff) | |
| download | samba-d1f9224f5824856339d80cf93f1bf4fcee57ce8f.tar.gz samba-d1f9224f5824856339d80cf93f1bf4fcee57ce8f.tar.bz2 samba-d1f9224f5824856339d80cf93f1bf4fcee57ce8f.zip | |
r8540: fixed network interface detection on several hosts
(This used to be commit 777ac8496b400b0ed348995feed83c22c5b344b3)
| -rw-r--r-- | source4/build/m4/rewrite.m4 | 3 | ||||
| -rw-r--r-- | source4/lib/netif/netif.c | 8 | ||||
| -rw-r--r-- | source4/lib/netif/netif.h | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index c6af661c43..35482b6cec 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -651,7 +651,6 @@ AC_TRY_RUN([ #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 @@ AC_TRY_RUN([ #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 @@ AC_TRY_RUN([ #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 diff --git a/source4/lib/netif/netif.c b/source4/lib/netif/netif.c index 2a87a7a610..b197178880 100644 --- a/source4/lib/netif/netif.c +++ b/source4/lib/netif/netif.c @@ -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 diff --git a/source4/lib/netif/netif.h b/source4/lib/netif/netif.h index d25294f8c2..7efe5a9b19 100644 --- a/source4/lib/netif/netif.h +++ b/source4/lib/netif/netif.h @@ -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; |