[Git][NTPsec/ntpsec][master] Re-enable pll_trap fallback on unimplemented ntp_adjtime().

[Eric S. Raymond]

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


Commits:
7e0b8675 by Eric S. Raymond at 2016-07-26T09:55:17-04:00
Re-enable pll_trap fallback on unimplemented ntp_adjtime().

This is enabled in NTP Classic.  I don't know how or when it got
disabled, and aren't sure enough that I understand it to remove it.

- - - - -


1 changed file:

- ntpd/ntp_loopfilter.c


Changes:

=====================================
ntpd/ntp_loopfilter.c
=====================================
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -172,7 +172,7 @@ static double sys_mindly;	/* huff-n'-puff filter min delay */
 /* Emacs cc-mode goes nuts if we split the next line... */
 #define MOD_BITS (MOD_OFFSET | MOD_MAXERROR | MOD_ESTERROR | \
     MOD_STATUS | MOD_TIMECONST)
-#ifdef SIGSYSx
+#ifdef SIGSYS
 static void pll_trap (int);	/* configuration trap */
 static struct sigaction sigsys;	/* current sigaction status */
 static struct sigaction newsigsys; /* new sigaction status */
@@ -1103,7 +1103,7 @@ start_kern_loop(void)
 	ntv.maxerror = MAXDISPERSE;
 	ntv.esterror = MAXDISPERSE;
 	ntv.constant = sys_poll; /* why is it that here constant is unconditionally set to sys_poll, whereas elsewhere is is modified depending on nanosecond vs. microsecond kernel? */
-#ifdef SIGSYSx
+#ifdef SIGSYS
 	/*
 	 * Use sigsetjmp() to save state and then call ntp_adjtime(); if
 	 * it fails, then pll_trap() will set pll_control false before
@@ -1361,7 +1361,7 @@ loop_config(
 }
 
 
-#if defined(HAVE_KERNEL_PLL) && defined(SIGSYSx)
+#if defined(HAVE_KERNEL_PLL) && defined(SIGSYS)
 /*
  * _trap - trap processor for undefined syscalls
  *



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/7e0b8675196bcd40f081c700e9c1f03c81dd0c1f
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160726/cc9192c2/attachment.html>