summaryrefslogtreecommitdiff
path: root/source4/lib/socket
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-15 09:30:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:45 -0500
commitf8079a63863ab1dfb604ec4c2e3cd6a50bb01e23 (patch)
tree9319f096f18a447e90b2c21cf958936cc8677ebb /source4/lib/socket
parente310cce43f0052c35c28abd74f1815afbc77fe58 (diff)
downloadsamba-f8079a63863ab1dfb604ec4c2e3cd6a50bb01e23.tar.gz
samba-f8079a63863ab1dfb604ec4c2e3cd6a50bb01e23.tar.bz2
samba-f8079a63863ab1dfb604ec4c2e3cd6a50bb01e23.zip
r18548: don't use #elif as we don't notice when 2 HAVE_IFACE_ versions are defined
try to find the problem on Tru64...where configure says the AIX method finds 1 interface but later can't compile netif.c. (revision 18486 was the last that detects ifconf with 2 interfaces) metze (This used to be commit 8fa9852160680054ddb5316c4ee03a03f8553a37)
Diffstat (limited to 'source4/lib/socket')
-rw-r--r--source4/lib/socket/netif.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/source4/lib/socket/netif.c b/source4/lib/socket/netif.c
index 0344febf38..7484baa681 100644
--- a/source4/lib/socket/netif.c
+++ b/source4/lib/socket/netif.c
@@ -152,7 +152,9 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
return total;
}
-#elif HAVE_IFACE_IFREQ
+#define _FOUND_IFACE_ANY
+#endif /* HAVE_IFACE_IFCONF */
+#ifdef HAVE_IFACE_IFREQ
#ifndef I_STR
#include <sys/stropts.h>
@@ -247,7 +249,9 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
return total;
}
-#elif HAVE_IFACE_AIX
+#define _FOUND_IFACE_ANY
+#endif /* HAVE_IFACE_IFREQ */
+#ifdef HAVE_IFACE_AIX
/****************************************************************************
this one is for AIX (tested on 4.2)
@@ -335,7 +339,9 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
return total;
}
-#else /* a dummy version */
+#define _FOUND_IFACE_ANY
+#endif /* HAVE_IFACE_AIX */
+#ifndef _FOUND_IFACE_ANY
static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
{
return -1;