[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1131-g0aff54a

[Michael Adam]

The branch, v4-0-test has been updated
       via  0aff54a12e20d5e91fcdec7aaec103fb9a371a23 (commit)
       via  54cc0df4dbf6d63a9b94e1ac6af4ec7f7803bc30 (commit)
      from  0cbb87453beb52c6b0bc3a48791f49678f4030c5 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 0aff54a12e20d5e91fcdec7aaec103fb9a371a23
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Fri Feb 29 02:46:14 2008 +0100

    libreplace: add snprintf.c to test code for getifaddrs - needed on some 
systems.
    
    Michael

commit 54cc0df4dbf6d63a9b94e1ac6af4ec7f7803bc30
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Fri Feb 29 02:43:24 2008 +0100

    libreplace: ifdef out ip6 code if unsupported.
    
    Michael

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

Summary of changes:
 source/lib/replace/getifaddrs.m4     |    4 ++++
 source/lib/replace/test/getifaddrs.c |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/getifaddrs.m4 b/source/lib/replace/getifaddrs.m4
index 1fa168b..6cca155 100644
--- a/source/lib/replace/getifaddrs.m4
+++ b/source/lib/replace/getifaddrs.m4
@@ -50,6 +50,7 @@ AC_TRY_RUN([
 #define SOCKET_WRAPPER_NOT_REPLACE
 #include "$libreplacedir/replace.c"
 #include "$libreplacedir/inet_ntop.c"
+#include "$libreplacedir/snprintf.c"
 #include "$libreplacedir/getifaddrs.c"
 #define getifaddrs_test main
 #include "$libreplacedir/test/getifaddrs.c"],
@@ -71,6 +72,7 @@ AC_TRY_RUN([
 #define SOCKET_WRAPPER_NOT_REPLACE
 #include "$libreplacedir/replace.c"
 #include "$libreplacedir/inet_ntop.c"
+#include "$libreplacedir/snprintf.c"
 #include "$libreplacedir/getifaddrs.c"
 #define getifaddrs_test main
 #include "$libreplacedir/test/getifaddrs.c"],
@@ -91,6 +93,7 @@ AC_TRY_RUN([
 #define SOCKET_WRAPPER_NOT_REPLACE
 #include "$libreplacedir/replace.c"
 #include "$libreplacedir/inet_ntop.c"
+#include "$libreplacedir/snprintf.c"
 #include "$libreplacedir/getifaddrs.c"
 #define getifaddrs_test main
 #include "$libreplacedir/test/getifaddrs.c"],
@@ -110,6 +113,7 @@ AC_TRY_RUN([
 #define SOCKET_WRAPPER_NOT_REPLACE
 #include "$libreplacedir/replace.c"
 #include "$libreplacedir/inet_ntop.c"
+#include "$libreplacedir/snprintf.c"
 #include "$libreplacedir/getifaddrs.c"
 #define getifaddrs_test main
 #include "$libreplacedir/test/getifaddrs.c"],
diff --git a/source/lib/replace/test/getifaddrs.c 
b/source/lib/replace/test/getifaddrs.c
index c78c9b5..8b00ac2 100644
--- a/source/lib/replace/test/getifaddrs.c
+++ b/source/lib/replace/test/getifaddrs.c
@@ -39,11 +39,13 @@ static const char *format_sockaddr(struct sockaddr *addr,
                                       &((struct sockaddr_in *)addr)->sin_addr,
                                       addrstring,
                                       addrlen);
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
        } else if (addr->sa_family == AF_INET6) {
                result = rep_inet_ntop(AF_INET6,
                                       &((struct sockaddr_in6 
*)addr)->sin6_addr,
                                       addrstring,
                                       addrlen);
+#endif
        }
        return result;
 }


-- 
Samba Shared Repository