[Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h

bk: 4b3018f7wlxH1_ROCvsEF-mSz9H67g

diff --git a/ChangeLog b/ChangeLog
index cb369a3ffceed3743e070bee5f6714e5fb341a56..b227374bf6d41057bf5a8565b1b79dc5c85504a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+
+* [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
+
 ---
 (4.2.6p1-RC1) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/configure.ac b/configure.ac
index 53f3bd9b2f1bc3c6781841b827839f596810e720..928e6a20fd912933884ca39f95b3f443b40fb9fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -415,6 +415,7 @@ case "$host" in
     AC_CHECK_LIB([resolv],[res_9_init])
     ;;
 esac
+AC_HEADER_RESOLV
 AC_CHECK_FUNCS(res_init __res_init)
 
 AC_HEADER_STDC

diff --git a/ntpd/ntp_intres.c b/ntpd/ntp_intres.c
index bf13faa9ac5044fd1d1da4c875b4020c7ac35ecc..bb8f107afa5380f50e07d47849d659fe0cdbd258 100644 (file)
--- a/ntpd/ntp_intres.c
+++ b/ntpd/ntp_intres.c
@@ -44,8 +44,21 @@
 # include <sys/param.h>                /* MAXHOSTNAMELEN (often) */
 #endif
 
-#if defined(HAVE_RES_INIT) || defined(HAVE___RES_INIT)
-#include <resolv.h>
+#if !defined(HAVE_RES_INIT) && defined(HAVE___RES_INIT)
+# define HAVE_RES_INIT
+#endif
+
+#if defined(HAVE_RESOLV_H) && defined(HAVE_RES_INIT)
+# ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+# endif
+# ifdef HAVE_ARPA_NAMESER_H
+#  include <arpa/nameser.h> /* DNS HEADER struct */
+# endif
+# ifdef HAVE_NETDB_H
+#  include <netdb.h>
+# endif
+# include <resolv.h>
 #endif
 
 #include <isc/net.h>
@@ -1228,7 +1241,7 @@ doconfigure(
                            dores ? "with" : "without" );
 #endif
 
-#if defined(HAVE_RES_INIT) || defined(HAVE___RES_INIT)
+#if defined(HAVE_RES_INIT)
        if (dores)         /* Reload /etc/resolv.conf - bug 1226 */
                res_init();
 #endif