[Git][NTPsec/ntpsec][master] Restore CP_ORG as a placeholder

[Daniel Fox Franke]

Daniel Fox Franke pushed to branch master at NTPsec / ntpsec


Commits:
592f0e8e by Daniel Fox Franke at 2016-01-21T10:30:48-05:00
Restore CP_ORG as a placeholder

- - - - -


1 changed file:

- ntpd/ntp_control.c


Changes:

=====================================
ntpd/ntp_control.c
=====================================
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -251,7 +251,7 @@ static const struct ctl_proc control_codes[] = {
 #define	CP_ROOTDISPERSION	15
 #define	CP_REFID		16
 #define	CP_REFTIME		17
-/* #define	CP_ORG			18 */
+#define	CP_ORG			18
 #define	CP_REC			19
 #define	CP_XMT			20
 #define	CP_REACH		21
@@ -491,9 +491,9 @@ static const struct ctl_var peer_var[] = {
 	{ CP_ROOTDISPERSION, RO, "rootdisp" },	/* 15 */
 	{ CP_REFID,	RO, "refid" },		/* 16 */
 	{ CP_REFTIME,	RO, "reftime" },	/* 17 */
-        /* This variable is disabled because leaking it creates a
-           vulnerability */
-        /*	{ CP_ORG,	RO, "org" }, */	/* 18 */
+        /* Placeholder. Reporting of this variable is disabled because
+           leaking it creates a vulnerability */
+        { CP_ORG,	RO, "org" },	        /* 18 */
 	{ CP_REC,	RO, "rec" },		/* 19 */
 	{ CP_XMT,	RO, "xleave" },		/* 20 */
 	{ CP_REACH,	RO, "reach" },		/* 21 */



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/592f0e8e9b1ca23118abe05c7b83e50aa340a1d3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160121/62280580/attachment.html>