[src/trunk]: src/external/bsd/ntp/dist/ntpd backport fix for bug 2867 - ntpd...

[kardel <kardel%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6991867ed74a
branches:  trunk
changeset: 339292:6991867ed74a
user:      kardel <kardel%NetBSD.org@localhost>
date:      Fri Jul 10 21:31:19 2015 +0000

description:
backport fix for bug 2867 -  ntpd with autokey active crashed by 'ntpq -crv'

diffstat:

 external/bsd/ntp/dist/ntpd/ntp_control.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 8ecac871a3b8 -r 6991867ed74a external/bsd/ntp/dist/ntpd/ntp_control.c
--- a/external/bsd/ntp/dist/ntpd/ntp_control.c  Fri Jul 10 21:27:49 2015 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_control.c  Fri Jul 10 21:31:19 2015 +0000
@@ -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 @@
        { 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 @@
                            ntohl(hostval.tstamp));
                break;
 #endif /* AUTOKEY */
+
+       default:
+               break;
        }
 }