Module Name: src
Committed By: kardel
Date: Fri Jul 10 21:31:19 UTC 2015
Modified Files:
src/external/bsd/ntp/dist/ntpd: ntp_control.c
Log Message:
backport fix for bug 2867 - ntpd with autokey active crashed by 'ntpq -crv'
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/ntpd/ntp_control.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/ntpd/ntp_control.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.12 src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.13
--- src/external/bsd/ntp/dist/ntpd/ntp_control.c:1.12 Fri Jul 10 14:20:32 2015
+++ src/external/bsd/ntp/dist/ntpd/ntp_control.c Fri Jul 10 21:31:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_control.c,v 1.12 2015/07/10 14:20:32 christos Exp $ */
+/* $NetBSD: ntp_control.c,v 1.13 2015/07/10 21:31:19 kardel Exp $ */
/*
* ntp_control.c - respond to mode 6 control messages and send async
@@ -422,10 +422,10 @@ static const struct ctl_var sys_var[] =
{ CS_TIMER_XMTS, RO, "timer_xmts" }, /* 87 */
{ CS_FUZZ, RO, "fuzz" }, /* 88 */
{ CS_WANDER_THRESH, RO, "clk_wander_threshold" }, /* 89 */
-#ifdef LEAP_SMEAR
+
{ CS_LEAPSMEARINTV, RO, "leapsmearinterval" }, /* 90 */
{ CS_LEAPSMEAROFFS, RO, "leapsmearoffset" }, /* 91 */
-#endif /* LEAP_SMEAR */
+
#ifdef AUTOKEY
{ CS_FLAGS, RO, "flags" }, /* 1 + CS_MAX_NOAUTOKEY */
{ CS_HOST, RO, "host" }, /* 2 + CS_MAX_NOAUTOKEY */
@@ -2404,6 +2404,9 @@ ctl_putsys(
ntohl(hostval.tstamp));
break;
#endif /* AUTOKEY */
+
+ default:
+ break;
}
}
