System headers must come before ntp headers in ntp_intres.c

bk: 4b3317ebT6_Kee7Qhda0D_VF4YAGKA

diff --git a/ChangeLog b/ChangeLog
index 83fa2c1077f851aeb1296d85252813153de65c1e..9b7f10885c948f211e04af684627fb0bd848a17a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 * [Bug 1426] scripts/VersionName needs . on the search path.
 * [Bug 1427] quote missing in ./build - shows up on NetBSD.
 * [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
+* [Bug 1431] System headers must come before ntp headers in ntp_intres.c .
 
 ---
 (4.2.6p1-RC1) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/include/Makefile.am b/include/Makefile.am
index 206021266c8fd3927ef06ef12d2629643aa17130..80113226c07a8be667251863f5e645e8e22913a3 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -34,6 +34,7 @@ noinst_HEADERS =      \
        ntp_filegen.h   \
        ntp_fp.h        \
        ntp_if.h        \
+       ntp_intres.h    \
        ntp_io.h        \
        ntp_lineedit.h  \
        ntp_lists.h     \

diff --git a/include/ntp_config.h b/include/ntp_config.h
index 4a9be31a45e3bb4fa4f9c8f58713d33b8488fcab..bb002415bf135a553c20b3de00896837a03ef39f 100644 (file)
--- a/include/ntp_config.h
+++ b/include/ntp_config.h
@@ -53,16 +53,6 @@
 #define FREE_CFG_T
 #endif
 
-/*
- * Some systems do not support fork() and don't have an alternate
- * threads implementation of ntp_intres.  Such systems are limited
- * to using numeric IP addresses.
- */
-#if defined(VMS) || defined (SYS_VXWORKS) || \
-    (!defined(HAVE_FORK) && !defined(SYS_WINNT))
-#define NO_INTRES
-#endif
-
 /* Limits */
 #define MAXLINE 1024
 

diff --git a/include/ntp_intres.h b/include/ntp_intres.h
new file mode 100644 (file)
index 0000000..1072833
--- /dev/null
+++ b/include/ntp_intres.h
@@ -0,0 +1,14 @@
+#ifndef NTP_INTRES_H
+#define NTP_INTRES_H
+
+/*
+ * Some systems do not support fork() and don't have an alternate
+ * threads implementation of ntp_intres.  Such systems are limited
+ * to using numeric IP addresses.
+ */
+#if defined(VMS) || defined (SYS_VXWORKS) || \
+    (!defined(HAVE_FORK) && !defined(SYS_WINNT))
+#define NO_INTRES
+#endif
+
+#endif /* !defined(NTP_INTRES_H) */

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 414dcabf1f5280ee78b4e1e805d17c52b139036d..7cc93f1725342c54089bcd45574e2a6603c596af 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -28,6 +28,7 @@
 #include "ntpsim.h"
 #include "ntpd-opts.h"
 #include <ntp_random.h>
+#include "ntp_intres.h"
 #include <isc/net.h>
 #include <isc/result.h>
 

diff --git a/ntpd/ntp_intres.c b/ntpd/ntp_intres.c
index bb8f107afa5380f50e07d47849d659fe0cdbd258..f98cc99e2e8f57c2f8518d9c52c738fb09de8a6b 100644 (file)
--- a/ntpd/ntp_intres.c
+++ b/ntpd/ntp_intres.c
@@ -20,15 +20,9 @@
 # include <config.h>
 #endif
 
-#include "ntp_machine.h"
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_request.h"
-#include "ntp_stdlib.h"
-#include "ntp_syslog.h"
-#include "ntp_config.h"
+#include "ntp_intres.h"
 
-#ifndef NO_INTRES              /* from ntp_config.h */
+#ifndef NO_INTRES
 
 #include <stdio.h>
 #include <ctype.h>
@@ -61,6 +55,14 @@
 # include <resolv.h>
 #endif
 
+#include "ntp_machine.h"
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_request.h"
+#include "ntp_stdlib.h"
+#include "ntp_syslog.h"
+#include "ntp_config.h"
+
 #include <isc/net.h>
 #include <isc/result.h>