ChangeLog, configure, configure.in, ntp_config.c:

  * configure.in: 4.0.98a
  * ntpd/ntp_config.c (getconfig): Fix typo.
  From: "David E. Myers" <dem@skyline.rtp.nc.us>
  From: David Godfrey <dave@delta.demon.co.uk>
  From: Geoffrey Sisson <geoff@nominet.org.uk>

bk: 37e46ed1efgQNtue6aIJaeLHtyx2BQ

diff --git a/ChangeLog b/ChangeLog
index e1ab0afd4ad81833d47d721bd2970b8f536af7eb..eb26fc4c911166f4daf8c1d5b496cb41e1d4d60c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-09-19  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * configure.in: 4.0.98a
+
+       * ntpd/ntp_config.c (getconfig): Fix typo.
+       From: "David E. Myers" <dem@skyline.rtp.nc.us> 
+       From: David Godfrey <dave@delta.demon.co.uk>
+       From: Geoffrey Sisson <geoff@nominet.org.uk>
+
 1999-09-17  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in: 4.0.98

diff --git a/configure b/configure
index 5f2c76a8683d69e144dd9a9d2d52a50e950e9e94..25ea5066f934de492653bb24483ff6b4bafa643e 100755 (executable)
--- a/configure
+++ b/configure
@@ -968,7 +968,7 @@ fi
 
 PACKAGE=ntp
 
-VERSION=4.0.98
+VERSION=4.0.98a
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

diff --git a/configure.in b/configure.in
index 3c26bf931664dc14c9ab54820bd3f4cf20c98cb3..df1d8056b11dccd519d5487c3274c36a4e09091e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.98)
+AM_INIT_AUTOMAKE(ntp, 4.0.98a)
 AC_PREREQ(2.13)
 
 ac_cv_var_oncore_ok=no

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index f4a23f0e8ad9d086d10063bbf8bbf0347cc96512..c1761b960b82ff8448354b25526da1a549d5e799 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -849,13 +849,13 @@ getconfig(
                exit(2);
        }
 
+       if (
+           (fp = fopen(FindConfig(config_file), "r")) == NULL
 #ifdef HAVE_NETINFO
-       /* If there is no config_file, try NetInfo. */
-       if ((fp = fopen(FindConfig(config_file), "r")) == NULL && check_netinfo && !(config_netinfo = get_netinfo_config()))
-#else
-       if ((fp = fopen(FindConfig(config_file), "r")))
-#endif /* !HAVE_NETINFO */
-       {
+           /* If there is no config_file, try NetInfo. */
+           && check_netinfo && !(config_netinfo = get_netinfo_config())
+#endif /* HAVE_NETINFO */
+           ) {
                fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig(config_file));
                msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig(config_file));
 #ifdef SYS_WINNT