[Git][NTPsec/ntpsec][master] Restore the 'notrap' restrict keyword as a no-op.

[Eric S. Raymond]

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


Commits:
0c3d0175 by Eric S. Raymond at 2016-09-27T17:19:14-04:00
Restore the 'notrap' restrict keyword as a no-op.

All the world's boilerplate ntp.conf files have this in it.

- - - - -


3 changed files:

- ntpd/keyword-gen.c
- ntpd/ntp_config.c
- ntpd/ntp_parser.y


Changes:

=====================================
ntpd/keyword-gen.c
=====================================
--- a/ntpd/keyword-gen.c
+++ b/ntpd/keyword-gen.c
@@ -154,6 +154,7 @@ struct key_tok ntp_keywords[] = {
 { "nomrulist",		T_Nomrulist,		FOLLBY_TOKEN },
 { "nopeer",		T_Nopeer,		FOLLBY_TOKEN },
 { "noquery",		T_Noquery,		FOLLBY_TOKEN },
+{ "notrap",		T_Notrap,		FOLLBY_TOKEN },
 { "noserve",		T_Noserve,		FOLLBY_TOKEN },
 { "notrust",		T_Notrust,		FOLLBY_TOKEN },
 { "ntpport",		T_Ntpport,		FOLLBY_TOKEN },


=====================================
ntpd/ntp_config.c
=====================================
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -1769,6 +1769,14 @@ config_access(
 				flags |= RES_DONTSERVE;
 				break;
 
+			case T_Notrap:
+			 	/*
+				 * No-op - included for backward compatibility
+				 * wuith all the world's boilerplate ntp.conf
+				 * files.
+				 */
+				break;
+
 			case T_Notrust:
 				flags |= RES_DONTTRUST;
 				break;


=====================================
ntpd/ntp_parser.y
=====================================
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@ -162,6 +162,7 @@
 %token	<Integer>	T_Noquery
 %token	<Integer>	T_Noselect
 %token	<Integer>	T_Noserve
+%token	<Integer>	T_Notrap
 %token	<Integer>	T_Notrust
 %token	<Integer>	T_Ntp
 %token	<Integer>	T_Ntpport
@@ -864,6 +865,7 @@ access_control_flag
 	|	T_Nopeer
 	|	T_Noquery
 	|	T_Noserve
+	|	T_Notrap
 	|	T_Notrust
 	|	T_Ntpport
 	|	T_Version



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/0c3d017558effe69bb5c398198f1a093d213984b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160927/43d37be4/attachment.html>