[Git][NTPsec/ntpsec][master] 2 commits: Address GitLab issue #390: Need log message when the clock is stepped

[Eric S. Raymond]

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


Commits:
9482dc21 by Eric S. Raymond at 2017-09-17T13:43:30Z
Address GitLab issue #390: Need log message when the clock is stepped

- - - - -
83e5946d by Gary E. Miller at 2017-09-17T13:53:57Z
ntp.d: change .ntpd extention to .conf.

- - - - -


4 changed files:

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


Changes:

=====================================
docs/includes/ntpd-body.txt
=====================================
--- a/docs/includes/ntpd-body.txt
+++ b/docs/includes/ntpd-body.txt
@@ -530,14 +530,10 @@ 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 the extension
-  ".ntpd" is interpreted.  Files are interpreted in ASCII sort order
+  ".conf" 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.
-
 [[signals]]
 == SIGNALS ==
 


=====================================
docs/ntpsec.txt
=====================================
--- a/docs/ntpsec.txt
+++ b/docs/ntpsec.txt
@@ -247,7 +247,7 @@ codebase has been outright removed, with less than 5% new code added.
 
 * 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
+  ".conf" are interpreted; others are ignored.  This feature is
   intended to make assembling configuration easier for administration
   and package-configuration scripts.  See {ntpdman} for details.
 


=====================================
libntp/systime.c
=====================================
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -396,6 +396,8 @@ step_systime(
 
 	sys_residual = 0;
 	lamport_violated = (step < 0);
+	if (lamport_violated)
+	    msyslog(LOG_WARNING, "CLOCK: negative time step %Lf", step);
 	if (step_callback)
 		(*step_callback)();
 


=====================================
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")
+#define CONF_ENABLE(s)	ENDSWITH(s, ".conf")
 
 
 /* SCANNER GLOBAL VARIABLES 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/4d66539961e6aeeda604d9314da995463ba1d1a1...83e5946dafb539fd94f3e94ddfb21b0324cf2960

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/4d66539961e6aeeda604d9314da995463ba1d1a1...83e5946dafb539fd94f3e94ddfb21b0324cf2960
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/20170917/e47b83e9/attachment.html>