sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r18548: don't use #elif as we don't notice when 2 HAVE_IFACE_ versions are defined

Browse Source 
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 8fa9852160)
This commit is contained in:
Stefan Metzmacher 2006-09-15 09:30:32 +00:00 committed by Gerald (Jerry) Carter
parent e310cce43f
commit f8079a6386
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/lib/socket/netif.c
View File

@ -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;