[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-904-ge33286f

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  e33286f4a68352e55df081d06307f64f190773b3 (commit)
       via  3e5788cc9665acb450be793fb88db8e2a871aaa5 (commit)
      from  e85290550ad33433f584009ffce34c81bea5b164 (commit)

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


- Log -----------------------------------------------------------------
commit e33286f4a68352e55df081d06307f64f190773b3
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 25 18:37:42 2007 +0100

    Host SerNet-AIX has __ss_family instead of ss_family in sockaddr_storage

commit 3e5788cc9665acb450be793fb88db8e2a871aaa5
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 25 18:36:49 2007 +0100

    AIX iface test needs rep_vasprintf

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

Summary of changes:
 source/configure.in                 |   10 ++++++++++
 source/lib/replace/system/network.h |    4 ++++
 2 files changed, 14 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index 416453f..d7fde01 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -3042,6 +3042,15 @@ if test x"$samba_cv_HAVE_IFACE_IFREQ" = x"yes"; then
 fi
 fi
 
+dnl AIX 5.3.0.0
+AC_TRY_COMPILE([#include <sys/socket.h>],[
+struct sockaddr_storage s; s.__ss_family = 0],
+samba_cv_have_aix_sockaddr_storage=yes,samba_cv_have_aix_sockaddr_storage=no)
+
+if test x"$samba_cv_have_aix_sockaddr_storage" = x"yes"; then
+   AC_DEFINE(HAVE_AIX_SOCKADDR_STORAGE, 1, [Whether struct sockaddr_storage has __sa_family])
+fi
+
 if test $iface = no; then
 AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[
 SAVE_CPPFLAGS="$CPPFLAGS"
@@ -3053,6 +3062,7 @@ AC_TRY_RUN([
 #undef _XOPEN_SOURCE_EXTENDED
 #define SOCKET_WRAPPER_NOT_REPLACE
 #include "${srcdir-.}/lib/replace/replace.c"
+#include "${srcdir-.}/lib/replace/snprintf.c"
 #include "${srcdir-.}/lib/interfaces.c"],
            samba_cv_HAVE_IFACE_AIX=yes,samba_cv_HAVE_IFACE_AIX=no,samba_cv_HAVE_IFACE_AIX=cross)])
 CPPFLAGS="$SAVE_CPPFLAGS"
diff --git a/source/lib/replace/system/network.h b/source/lib/replace/system/network.h
index 9087c02..b6ae3c7 100644
--- a/source/lib/replace/system/network.h
+++ b/source/lib/replace/system/network.h
@@ -233,6 +233,10 @@ typedef unsigned short int sa_family_t;
 #endif
 #endif
 
+#ifdef HAVE_AIX_SOCKADDR_STORAGE
+#define ss_family __ss_family
+#endif
+
 #ifndef HAVE_STRUCT_ADDRINFO
 #define HAVE_STRUCT_ADDRINFO
 struct addrinfo {


-- 
Samba Shared Repository