rwrap: If we do not have ns_name_compress() use dn_comp().

This should fix older Linux versions which do not export
ns_name_compress(). In newer glibc versions dn_comp() calls
ns_name_compress().

Reviewed-by: Jakub Hrozek <jakub.hrozek@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 41bed3a1f9051a0e48e222de061ed89636cfee0f..a68959f87de62e70e91deb5754b5810cb1d2c980 100644 (file)
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -94,6 +94,8 @@ check_function_exists(__res_search HAVE___RES_SEARCH)
 check_function_exists(res_nsearch HAVE_RES_NSEARCH)
 check_function_exists(__res_nsearch HAVE___RES_NSEARCH)
 
+check_function_exists(ns_name_compress HAVE_NS_NAME_COMPRESS)
+
 if (UNIX)
     if (NOT LINUX)
         # libsocket (Solaris)

diff --git a/config.h.cmake b/config.h.cmake
index aad83e3a57c40737f3551336b2a468010f5d3b9c..31e2855ef172db355789be1b284cc6349471eb6c 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -44,6 +44,8 @@
 #cmakedefine HAVE_RES_NSEARCH 1
 #cmakedefine HAVE___RES_NSEARCH 1
 
+#cmakedefine HAVE_NS_NAME_COMPRESS 1
+
 /*************************** LIBRARIES ***************************/
 
 #cmakedefine HAVE_LIBRESOLV 1

diff --git a/src/resolv_wrapper.c b/src/resolv_wrapper.c
index 7211ad087a4bcb286a4cc162aee465d53748e849..c70ca64e92b7737e3cd5b972cd719fdb1352d20c 100644 (file)
--- a/src/resolv_wrapper.c
+++ b/src/resolv_wrapper.c
@@ -65,6 +65,10 @@
 #define RWRAP_DEFAULT_FAKE_TTL 600
 #endif  /* RWRAP_DEFAULT_FAKE_TTL */
 
+#ifndef HAVE_NS_NAME_COMPRESS
+#define ns_name_compress dn_comp
+#endif
+
 enum rwrap_dbglvl_e {
        RWRAP_LOG_ERROR = 0,
        RWRAP_LOG_WARN,