ChangeLog, README.cvs, ntp_proto.c:

  * ntpd/ntp_proto.c (proto_config): cal_enable (PROTO_CAL) is
  invalid if no refclocks are present.
  From: Frodo Looijaard <frodol@dds.nl>
  * README.cvs: On some systems, the -C option fails.

bk: 3ad8e25fc9cXT7ZzVLa6W_yHCjBspw

diff --git a/ChangeLog b/ChangeLog
index 49ffb252ab0eb4819a1e73ce6a56bbd048326b4e..c7d90912149f273a862f00940eed5a8f8bbf4019 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-04-14  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * ntpd/ntp_proto.c (proto_config): cal_enable (PROTO_CAL) is
+       invalid if no refclocks are present.
+       From: Frodo Looijaard <frodol@dds.nl>
+
+       * README.cvs: On some systems, the -C option fails.
+
        * ntpd/refclock_nmea.c:
        * ntpd/ntp_refclock.c:
        * html/driver20.htm:

diff --git a/README.cvs b/README.cvs
index bb7701f5b5acb017a1cb669bd6635c8d75bdd96c..24a8f9a701c7698b5ec57012610dafb92cad2b85 100644 (file)
--- a/README.cvs
+++ b/README.cvs
@@ -28,6 +28,9 @@ PLEASE NOTE:
        which will force any local changes to your NTP files to be
        discarded and replaced with the versions in the repository.
 
+       If "ntp_update -C" does not work  just remove the "broken"
+       files (probably Makefile.in files) and re-run ntp_udate.
+
 There are some mailing lists for the NTP CVS distribution.  For more
 information, send a message to <majordomo@ntp.org> with the word "lists"
 in the body of the message.

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 2df960cf516dcd84fdab041bd5f34b03f5d7b31e..958cf5238ca4544f72f431232bd86dd62eebb2c8 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2718,6 +2718,7 @@ proto_config(
                pps_enable = (int)value;
                break;
 
+#ifdef REFCLOCK
        case PROTO_CAL:
 
                /*
@@ -2725,6 +2726,7 @@ proto_config(
                 */
                cal_enable = (int)value;
                break;
+#endif
 
        default: