From: Harlan Stenn Date: Fri, 5 Jun 2015 08:24:51 +0000 (+0000) Subject: [Bug 2837] add test for DSCP to ntpd/complete.conf.in - from Hal Murray X-Git-Tag: NTP_4_3_35~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ff86cfc888db3feff7c42c99c3fbafe156a14fc;p=thirdparty%2Fntp.git [Bug 2837] add test for DSCP to ntpd/complete.conf.in - from Hal Murray bk: 55715cd3Eb0uHyKYObYtqPnVn1UkzQ --- diff --git a/ChangeLog b/ChangeLog index ce246db88..c4689a73f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * [Bug 2832] refclock_jjy.c supports the TDC-300. * [Bug 2834] Correct a broken html tag in html/refclock.html * [Bug 2837] Allow a configurable DSCP value. +* [Bug 2837] add test for DSCP to ntpd/complete.conf.in * [Bug 2842] Glitch in ntp.conf.def documentation stanza. * Report select() debug messages at debug level 3 now. --- diff --git a/ntpd/complete.conf.in b/ntpd/complete.conf.in index a820094ab..faf7b869d 100644 --- a/ntpd/complete.conf.in +++ b/ntpd/complete.conf.in @@ -4,6 +4,7 @@ logfile "/var/log/ntp.log" leapfile "/etc/ntp.leapseconds" nonvolatile 1e-7 ident "udent" +dscp 46 logconfig =allall -allinfo -allevents -allstatistics -allstatus +allall -clockinfo -clockevents -clockstatistics -clockstatus +clockall -syncinfo -syncevents -syncstatistics -syncstatus +syncall -sysinfo -sysevents -sysstatistics -sysstatus +sysall statsdir "/etc/ntp/stats" statistics clockstats cryptostats loopstats peerstats protostats rawstats sysstats timingstats