svn commit: samba r18548 - in branches/SAMBA_4_0/source/lib/socket: .

metze at samba.org metze at samba.org
Fri Sep 15 09:30:32 GMT 2006


Author: metze
Date: 2006-09-15 09:30:32 +0000 (Fri, 15 Sep 2006)
New Revision: 18548

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

Log:
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

Modified:
   branches/SAMBA_4_0/source/lib/socket/netif.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket/netif.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/netif.c	2006-09-15 09:06:36 UTC (rev 18547)
+++ branches/SAMBA_4_0/source/lib/socket/netif.c	2006-09-15 09:30:32 UTC (rev 18548)
@@ -152,7 +152,9 @@
 	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 @@
 	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 @@
 	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;



More information about the samba-cvs mailing list