[Git][NTPsec/ntpsec][master] 3 commits: Track remove of Autokey

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
2ff18e01 by Hal Murray at 2016-05-07T00:58:45-07:00
Track remove of Autokey

- - - - -
166888ce by Hal Murray at 2016-05-07T01:00:29-07:00
Restore SAVECONFIG if --enable-saveconfig

- - - - -
b8f8d133 by Hal Murray at 2016-05-07T01:03:16-07:00
Restore leapfile to parser

- - - - -


3 changed files:

- ntpd/complete.conf
- ntpd/ntp_parser.y
- pylib/configure.py


Changes:

=====================================
ntpd/complete.conf
=====================================
--- a/ntpd/complete.conf
+++ b/ntpd/complete.conf
@@ -3,7 +3,6 @@ driftfile "/etc/ntp.drift" 1e-7
 logfile "/var/log/ntp.log"
 leapfile "/etc/ntp.leapseconds"
 nonvolatile 1e-7
-ident "udent"
 logconfig =allall -allinfo -allevents -allstatistics -allstatus +allall -clockinfo -clockevents -clockstatistics -clockstatus +clockall -syncinfo -syncevents -syncstatistics -syncstatus +syncall -sysinfo -sysevents -sysstatistics -sysstatus +sysall
 statsdir "/etc/ntp/stats"
 statistics clockstats cryptostats loopstats peerstats protostats rawstats sysstats timingstats
@@ -15,7 +14,7 @@ filegen protostats file stats type month enable
 filegen rawstats file rawstats type year nolink enable
 filegen sysstats file sysstats type age enable
 filegen timingstats file timingstats type none disable
-crypto digest md5 host myhostname ident wedent pw cryptopass randfile /.rnd
+crypto digest md5 host myhostname pw cryptopass randfile /.rnd
 revoke 10
 keysdir "/etc/ntp/keys"
 keys "/etc/ntp.keys"


=====================================
ntpd/ntp_parser.y
=====================================
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@ -298,6 +298,7 @@
 %type	<Attr_val_fifo>	log_config_list
 %type	<Integer>	misc_cmd_dbl_keyword
 %type	<Integer>	misc_cmd_int_keyword
+%type	<Integer>	misc_cmd_str_keyword
 %type	<Integer>	misc_cmd_str_lcl_keyword
 %type	<Attr_val>	mru_option
 %type	<Integer>	mru_option_keyword
@@ -1123,6 +1124,13 @@ miscellaneous_command
 			av = create_attr_ival($1, $2);
 			APPEND_G_FIFO(cfgt.vars, av);
 		}
+	|	misc_cmd_str_keyword T_String
+		{
+			attr_val *av;
+
+			av = create_attr_sval($1, $2);
+			APPEND_G_FIFO(cfgt.vars, av);
+		}
 	|	misc_cmd_str_lcl_keyword T_String
 		{
 			char error_text[64];
@@ -1198,6 +1206,10 @@ misc_cmd_int_keyword
 		}
 	;
 
+misc_cmd_str_keyword
+	:	T_Leapfile
+	;
+
 misc_cmd_str_lcl_keyword
 	:	T_Logfile
 	|	T_Pidfile


=====================================
pylib/configure.py
=====================================
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -167,6 +167,9 @@ def cmd_configure(ctx, config):
 	if ctx.options.enable_debug_gdb:
 		ctx.env.CFLAGS += ["-g"]
 
+        if ctx.options.enable_saveconfig:
+                ctx.define("SAVECONFIG", 1)
+
 	if not ctx.options.disable_debug:
 		ctx.define("DEBUG", 1, comment="Enable debug mode")
 		ctx.env.BISONFLAGS += ["--debug"]



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/b874b5fba2d29947674a88ef542dd3df260cbc44...b8f8d133d68262ed5dcf0a461bd9f5e2a9df00ed
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160507/f62f4e90/attachment.html>