[Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'

bk: 55938e64dGQpQeHjEiHZXQl_Draopg

diff --git a/ChangeLog b/ChangeLog
index 738ae225867dfff0300f10d06af02b5cf5c6f0d5..ec39b0193d0fe6b56aff9508b725e9e94b97c434 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
   Fixed in Martin's changes to Bug 2855.  Martin Burnicki.
 * [Bug 2859] Improve raw DCF77 robustness deconding.  Frank Kardel.
 * [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
+* [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'. J.Perlinger
 * README.leapsmear added.  Martin Burnicki.
 * README.leapsmear edited.  Harlan Stenn.
 * tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich.

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index 89c2f00c11b44388b7537b3a63eea2e7331b4d3b..dac4ca80fc7a17ca9b6a64950bd7bbc16a777e38 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -420,10 +420,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 */
@@ -2402,6 +2402,9 @@ ctl_putsys(
                            ntohl(hostval.tstamp));
                break;
 #endif /* AUTOKEY */
+
+       default:
+               break;
        }
 }