[SCM] NSS Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  20f4de9 cmake: Check for getnameinfo on older distributions.
       via  93adc03 Add .gitignore.
      from  7e63f09 nwrap: Try to fix some compile warning.

http://gitweb.samba.org/?p=nss_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 20f4de9ddc8888490caf8df57eb01240527a54b0
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Wed Dec 4 16:44:13 2013 +0100

    cmake: Check for getnameinfo on older distributions.
    
    This should fix the build on CentOS 5.5.

commit 93adc03b15c39b8537a9ccdf4f0033009f64fb89
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Wed Dec 4 16:43:43 2013 +0100

    Add .gitignore.

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

Summary of changes:
 .gitignore            |    9 +++++++++
 ConfigureChecks.cmake |    6 ++++++
 config.h.cmake        |    1 +
 src/nss_wrapper.c     |    5 +++++
 4 files changed, 21 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8fd1310
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+*.a
+*.o
+.*
+*.swp
+*~$
+build
+obj
+cscope.*
+tags
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index ef689b8..8c7539a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -177,6 +177,12 @@ check_prototype_definition(getnameinfo
     "unistd.h;netdb.h"
     HAVE_LINUX_GETNAMEINFO)
 
+check_prototype_definition(getnameinfo
+    "int getnameinfo (const struct sockaddr *sa, socklen_t salen, char *host, socklen_t __hostlen, char *serv, socklen_t servlen, unsigned int flags)"
+    "-1"
+    "unistd.h;netdb.h"
+    HAVE_LINUX_GETNAMEINFO_UNSIGNED)
+
 # STRUCT MEMBERS
 check_struct_has_member("struct sockaddr" sa_len "sys/socket.h netinet/in.h" HAVE_STRUCT_SOCKADDR_SA_LEN)
 
diff --git a/config.h.cmake b/config.h.cmake
index c1523ae..1fd9281 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -73,6 +73,7 @@
 #cmakedefine HAVE_SOLARIS_GETHOSTNAME 1
 #cmakedefine HAVE_BSD_SETGRENT 1
 #cmakedefine HAVE_LINUX_GETNAMEINFO 1
+#cmakedefine HAVE_LINUX_GETNAMEINFO_UNSIGNED 1
 
 #cmakedefine HAVE_STRUCT_SOCKADDR_SA_LEN 1
 #cmakedefine HAVE_IPV6 1
diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
index 546fa10..c00e5cb 100644
--- a/src/nss_wrapper.c
+++ b/src/nss_wrapper.c
@@ -3745,6 +3745,11 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen,
 		char *host, socklen_t hostlen,
 		char *serv, socklen_t servlen,
 		int flags)
+#elif defined(HAVE_LINUX_GETNAMEINFO_UNSIGNED)
+int getnameinfo(const struct sockaddr *sa, socklen_t salen,
+		char *host, socklen_t hostlen,
+		char *serv, socklen_t servlen,
+		unsigned int flags)
 #else
 int getnameinfo(const struct sockaddr *sa, socklen_t salen,
 		char *host, size_t hostlen,


-- 
NSS Wrapper Repository