Lose the "pps" stuff from ntp.conf. From Dave Mills.

bk: 41bbb962MQeI-2yPGXp9Qot7CN47mg

diff --git a/include/ntp_config.h b/include/ntp_config.h
index 01478d2b6b0751951c0fd3db5454b03d2ded3e31..69e6d46a661f06cd1f46f55381134c2ba4463bc0 100644 (file)
--- a/include/ntp_config.h
+++ b/include/ntp_config.h
@@ -28,7 +28,7 @@
 #define CONFIG_AUTHENTICATE    7
 #define CONFIG_KEYS            8
 #define CONFIG_REVOKE          9
-#define CONFIG_PPS             10
+#define CONFIG_CDELAY          10
 #define CONFIG_RESTRICT                11
 #define CONFIG_BDELAY          12
 #define CONFIG_TRUSTEDKEY      13
@@ -121,13 +121,6 @@
 #define CONF_FGEN_FLAG_ENABLE  5
 #define CONF_FGEN_FLAG_DISABLE 6
 
-/*
- * "pps" modifier keywords
- */
-#define CONF_PPS_ASSERT                1
-#define CONF_PPS_CLEAR         2
-#define CONF_PPS_HARDPPS       3
-
 /*
  * "discard" modifier keywords
  */

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 169881eb375dffd7c341c77caaddb702f75af549..f225537836f74e08b998eb04926a4fa1dbcad5cd 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -202,7 +202,6 @@ static struct keyword flags_keywords[] = {
        { "kernel",             PROTO_KERNEL },
        { "monitor",            PROTO_MONITOR },
        { "ntp",                PROTO_NTP },
-       { "pps",                PROTO_PPS },
        { "stats",              PROTO_FILEGEN },
        { "",                   CONFIG_UNKNOWN }
 };