aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Xavier Taillon <gtaillon@ca.ibm.com>2016-03-01 11:13:34 -0500
committerAndreas Schneider <asn@samba.org>2016-03-02 13:08:24 +0100
commitc083b478f855327ab8ec41bee42e4940bae8bef7 (patch)
tree5ed83eca1ca1f114e40d4d8a5f46a01bca09e5d7
parent01f13dd14cccb360e2220cb42f955ee8493934e4 (diff)
downloadresolv_wrapper-c083b478f855327ab8ec41bee42e4940bae8bef7.tar.gz
resolv_wrapper-c083b478f855327ab8ec41bee42e4940bae8bef7.tar.xz
resolv_wrapper-c083b478f855327ab8ec41bee42e4940bae8bef7.zip
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@ca.ibm.com> Reviewed-by: Andreas Schneider <asn@samba.org>
-rw-r--r--ConfigureChecks.cmake1
-rw-r--r--config.h.cmake1
-rw-r--r--src/resolv_wrapper.c6
3 files changed, 7 insertions, 1 deletions
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..adc7870 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -15,6 +15,7 @@
/************************** HEADER FILES *************************/
#cmakedefine HAVE_SYS_TYPES_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]);
}