[Git][NTPsec/ntpsec][master] Remove another remnant of Autokey.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
b853e165 by Eric S. Raymond at 2017-02-21T08:04:40-05:00
Remove another remnant of Autokey.

- - - - -


4 changed files:

- docs/includes/mon-commands.txt
- ntpd/keyword-gen.c
- ntpd/ntp_parser.y
- ntpd/ntp_util.c


Changes:

=====================================
docs/includes/mon-commands.txt
=====================================
--- a/docs/includes/mon-commands.txt
+++ b/docs/includes/mon-commands.txt
@@ -23,34 +23,6 @@ clock in decoded ASCII format, where meaningful. In some clock drivers
 a good deal of additional information can be gathered and displayed as
 well. See information specific to each clock for further details.
 
-  +cryptostats+;;
-    This option requires the OpenSSL cryptographic software library. It
-    enables recording of cryptographic public key protocol information.
-    Each message received by the protocol module appends a line of the
-    following form to the file generation set named _cryptostats_:
-+
----------------------------------
-49213 525.624 SPECTRACOM(4) message
----------------------------------
-+
-[width="100%",cols="<34%,<33%,<33%"]
-|================================================
-|Item           | Units  |Description
-|+49213+        |MJD     |date
-|+525.624+      |s       |time past midnight
-|+SPECTRACOM(4)+|IP      |reference clock type and unit
-|_message_      |text    |log message
-|===============================================
-+
-The first two fields show the date (Modified Julian Day) and time
-(seconds and fraction past UTC midnight). The next field normally
-shows the clock driver type and unit (but if you have built in Classic
-compatibility mode it will show a magic clock address in dotted-quad
-notation). The final message field includes the message type and
-certain ancillary information. See the 'Authentication Options'
-section for further information.
-
-
   +loopstats+;;
     Enables recording of loop filter statistics information. Each update
     of the local clock outputs a line of the following form to the file


=====================================
ntpd/keyword-gen.c
=====================================
--- a/ntpd/keyword-gen.c
+++ b/ntpd/keyword-gen.c
@@ -92,7 +92,6 @@ struct key_tok ntp_keywords[] = {
 /*** MONITORING COMMANDS ***/
 /* stat */
 { "clockstats",		T_Clockstats,		FOLLBY_TOKEN },
-{ "cryptostats",	T_Cryptostats,		FOLLBY_TOKEN },
 { "loopstats",		T_Loopstats,		FOLLBY_TOKEN },
 { "peerstats",		T_Peerstats,		FOLLBY_TOKEN },
 { "protostats",		T_Protostats,		FOLLBY_TOKEN },


=====================================
ntpd/ntp_parser.y
=====================================
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@ -64,7 +64,6 @@
 %token	<Integer>	T_Clockstats
 %token	<Integer>	T_Cohort
 %token	<Integer>	T_ControlKey
-%token	<Integer>	T_Cryptostats
 %token	<Integer>	T_Ctl
 %token	<Integer>	T_Day
 %token	<Integer>	T_Default
@@ -619,7 +618,6 @@ stats_list
 
 stat
 	:	T_Clockstats
-	|	T_Cryptostats
 	|	T_Loopstats
 	|	T_Peerstats
 	|	T_Rawstats


=====================================
ntpd/ntp_util.c
=====================================
--- a/ntpd/ntp_util.c
+++ b/ntpd/ntp_util.c
@@ -54,7 +54,6 @@ double	wander_threshold = 1e-7;	/* initial frequency threshold */
 
 char statsdir[MAXFILENAME] = NTP_VAR;
 static FILEGEN clockstats;
-static FILEGEN cryptostats;
 static FILEGEN loopstats;
 static FILEGEN peerstats;
 static FILEGEN protostats;
@@ -105,7 +104,6 @@ uninit_util(void)
 		key_file_name = NULL;
 	}
 	filegen_unregister("clockstats");
-	filegen_unregister("cryptostats");
 	filegen_unregister("loopstats");
 	filegen_unregister("rawstats");
 	filegen_unregister("sysstats");
@@ -124,7 +122,6 @@ void
 init_util(void)
 {
 	filegen_register(statsdir, "clockstats",  &clockstats);
-	filegen_register(statsdir, "cryptostats", &cryptostats);
 	filegen_register(statsdir, "loopstats",	  &loopstats);
 	filegen_register(statsdir, "rawstats",	  &rawstats);
 	filegen_register(statsdir, "sysstats",	  &sysstats);



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/b853e165c431957c042ad1458062e177e50f32c6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170221/0feb6d59/attachment.html>