[Git][NTPsec/ntpsec][master] Remove references to .refclockd extension, since that plan has been dropped.

[Eric S. Raymond]

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


Commits:
8d770440 by Eric S. Raymond at 2017-08-22T20:32:40-04:00
Remove references to .refclockd extension, since that plan has been dropped.

- - - - -


3 changed files:

- docs/includes/ntpd-body.txt
- docs/ntpsec.txt
- ntpd/ntp_scanner.c


Changes:

=====================================
docs/includes/ntpd-body.txt
=====================================
--- a/docs/includes/ntpd-body.txt
+++ b/docs/includes/ntpd-body.txt
@@ -530,20 +530,14 @@ Configuration files are parsed according to the following rules:
   /etc will be specified by the directory name of the -c argument.
 
 . Each file beneath the configuration directory with either the
-  extension ".ntpd" or ".refclockd" is interpreted.  Files are
-  interpreted in ASCII sort order of their pathnames.  Files with
-  other extensions or no extensions are ignored.
+  extension ".ntpd" is interpreted.  Files are interpreted in ASCII
+  sort order of their pathnames.  Files with other extensions or no
+  extensions are ignored.
 
 Note: The second two rules are *unstable*; this feature should be
 considered experimental and subject to revision.  In a future release,
 once we've settled on the right design, this caveat will be removed.
 
-It is best practice to put refclock and clockstats declarations in a
-".refclockd" file and all other declarations in an ".ntpd" file.  This
-anticipates a future direction of the architecture - it is intended
-that someday the refclock handling will be broken out of the main
-daemon into a separate executable with its own configuration parser.
-
 [[signals]]
 == SIGNALS ==
 


=====================================
docs/ntpsec.txt
=====================================
--- a/docs/ntpsec.txt
+++ b/docs/ntpsec.txt
@@ -233,12 +233,11 @@ codebase has been outright removed, with less than 5% new code added.
   in /etc/ntp.conf finding /etc/foo rather than looking for foo in
   your current directory.
 
-* If there is an /etc/ntp.d directory, its subfiles are scanned
-  for more configuration declarations. Only files with the extensions
-  ".ntpd" and ".refclockd" are interpreted; others are ignored.  This
-  feature is intended to make assembling configuration easier for
-  administration and package-configuration scripts.  See {ntpdman}
-  for details.
+* If there is an /etc/ntp.d directory, its subfiles are scanned for
+  more configuration declarations. Only files with the extension
+  ".ntpd" are interpreted; others are ignored.  This feature is
+  intended to make assembling configuration easier for administration
+  and package-configuration scripts.  See {ntpdman} for details.
 
 * It is now possible to set the peer maximum dispersion with "tos
   maxdisp". See RFC 5905 for discussion of this synchronization


=====================================
ntpd/ntp_scanner.c
=====================================
--- a/ntpd/ntp_scanner.c
+++ b/ntpd/ntp_scanner.c
@@ -50,7 +50,7 @@ static struct FILE_INFO * lex_stack = NULL;
  * --------------------
  */
 #define ENDSWITH(str, suff) (strcmp(str + strlen(str) - strlen(suff), suff)==0) 
-#define CONF_ENABLE(s)	(ENDSWITH(s, ".ntpd") || ENDSWITH(s, ".refclockd"))
+#define CONF_ENABLE(s)	ENDSWITH(s, ".ntpd")
 
 
 /* SCANNER GLOBAL VARIABLES 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/8d770440e1310e13ec4b2ca12932613bc2d65f98

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/8d770440e1310e13ec4b2ca12932613bc2d65f98
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170823/2a9b56ec/attachment.html>