[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-899-g38e178d

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  38e178df12d30672f74bf272338954c7917b59e3 (commit)
       via  acb560900be29c407e7da955d16c2de7898e49b8 (commit)
      from  72dc71710813ea9f1d8864c4401fef25a25577bd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 38e178df12d30672f74bf272338954c7917b59e3
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 25 12:00:53 2007 +0100

    Interface detection should not go through the socket wrapper
    
    Next try to get the build farm more in line again than it is now

commit acb560900be29c407e7da955d16c2de7898e49b8
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 25 11:59:34 2007 +0100

    Revert "Attempt to fix the ifreq detection"
    
    This reverts commit 2d08959685b495caf1884babbece27775d8bcb4f.

-----------------------------------------------------------------------

Summary of changes:
 source/configure.in     |    2 --
 source/lib/interfaces.c |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index a93e6fb..1906d74 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -3026,12 +3026,10 @@ AC_CACHE_CHECK([for iface ifreq],samba_cv_HAVE_IFACE_IFREQ,[
 SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
 AC_TRY_RUN([
-#undef SOCKET_WRAPPER
 #define NO_CONFIG_H 1
 #define HAVE_IFACE_IFREQ 1
 #define AUTOCONF_TEST 1
 #include "${srcdir-.}/lib/replace/replace.c"
-#undef getnameinfo
 #include "${srcdir-.}/lib/interfaces.c"],
            samba_cv_HAVE_IFACE_IFREQ=yes,samba_cv_HAVE_IFACE_IFREQ=no,samba_cv_HAVE_IFACE_IFREQ=cross)])
 CPPFLAGS="$SAVE_CPPFLAGS"
diff --git a/source/lib/interfaces.c b/source/lib/interfaces.c
index 722ab56..3797fc6 100644
--- a/source/lib/interfaces.c
+++ b/source/lib/interfaces.c
@@ -84,6 +84,7 @@
 #include <net/if.h>
 #endif
 
+#define SOCKET_WRAPPER_NOT_REPLACE
 #include "interfaces.h"
 #include "lib/replace/replace.h"
 


-- 
Samba Shared Repository