[SCM] Resolv Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  826e765 cmake: Add missing HAVE_RESOLV_H define
       via  c083b47 rwrap: AIX compatibility fix, missing headers, bad directive
      from  01f13dd Fix typos

https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 826e7658fea892ad452c9d830674c09777b890b1
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 2 13:08:48 2016 +0100

    cmake: Add missing HAVE_RESOLV_H define
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit c083b478f855327ab8ec41bee42e4940bae8bef7
Author: Guillaume Xavier Taillon <gtaillon at ca.ibm.com>
Date:   Tue Mar 1 11:13:34 2016 -0500

    rwrap: AIX compatibility fix, missing headers, bad directive
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11765
    
    Signed-off-by: Guillaume Xavier Taillon <gtaillon at ca.ibm.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 ConfigureChecks.cmake | 1 +
 config.h.cmake        | 2 ++
 src/resolv_wrapper.c  | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index be2f04c..44de342 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -49,6 +49,7 @@ endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW AND NOT OS2)
 # HEADERS
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(resolv.h HAVE_RESOLV_H)
+check_include_file(arpa/nameser.h HAVE_ARPA_NAMESER_H)
 
 # FUNCTIONS
 set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/config.h.cmake b/config.h.cmake
index 31e2855..e3acc8a 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -15,6 +15,8 @@
 /************************** HEADER FILES *************************/
 
 #cmakedefine HAVE_SYS_TYPES_H 1
+#cmakedefine HAVE_RESOLV_H 1
+#cmakedefine HAVE_ARPA_NAMESER_H 1
 
 /*************************** FUNCTIONS ***************************/
 
diff --git a/src/resolv_wrapper.c b/src/resolv_wrapper.c
index 77baa45..72005fa 100644
--- a/src/resolv_wrapper.c
+++ b/src/resolv_wrapper.c
@@ -36,7 +36,11 @@
 
 #include <errno.h>
 #include <arpa/inet.h>
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif /* HAVE_ARPA_NAMESER_H */
 #include <netinet/in.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -1421,8 +1425,8 @@ static int rwrap_res_ninit(struct __res_state *state)
 			state->nscount = 0;
 			memset(state->nsaddr_list, 0, sizeof(state->nsaddr_list));
 
-			state->_u._ext.nscount = 0;
 #ifdef HAVE_RESOLV_IPV6_NSADDRS
+			state->_u._ext.nscount = 0;
 			for (i = 0; i < state->_u._ext.nscount; i++) {
 				SAFE_FREE(state->_u._ext.nsaddrs[i]);
 			}


-- 
Resolv Wrapper Repository