Hello community,
here is the log from the commit of package ntp for openSUSE:Factory checked in
at 2015-08-25 07:17:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ntp (Old)
and /work/SRC/openSUSE:Factory/.ntp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2015-07-25 07:43:47.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2015-08-25
07:17:13.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Aug 13 15:46:29 UTC 2015 - m...@suse.com
+
+- Use ntpq instead of deprecated ntpdc in start-ntpd (bnc#936327).
+- Add a controlkey to ntp.conf to make the above work.
+- Don't let "keysdir" lines in ntp.conf trigger the "keys" parser.
+- Disable mode 7 (ntpdc) again, now that we don't use it anymore.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ conf.ntp.conf ++++++
--- /var/tmp/diff_new_pack.dowXl9/_old 2015-08-25 07:17:14.000000000 +0200
+++ /var/tmp/diff_new_pack.dowXl9/_new 2015-08-25 07:17:14.000000000 +0200
@@ -59,9 +59,6 @@
restrict 127.0.0.1
restrict ::1
-# Allow ntpdc
-enable mode7
-
# Clients from this (example!) subnet have unlimited access, but only if
# cryptographically authenticated.
#restrict 192.168.123.0 mask 255.255.255.0 notrust
@@ -87,5 +84,4 @@
keys /etc/ntp.keys # path for keys file
trustedkey 1 # define trusted keys
requestkey 1 # key (7) for accessing server variables
-# controlkey 15 # key (6) for accessing server variables
-
+controlkey 1 # key (6) for accessing server variables
++++++ conf.start-ntpd ++++++
--- /var/tmp/diff_new_pack.dowXl9/_old 2015-08-25 07:17:14.000000000 +0200
+++ /var/tmp/diff_new_pack.dowXl9/_new 2015-08-25 07:17:14.000000000 +0200
@@ -20,9 +20,9 @@
NTPD_OPTIONS="-g -u ntp:ntp"
NTPD_RUN_CHROOTED="yes"
-NTPDC_BIN="/usr/sbin/ntpdc"
+NTPQ_BIN="/usr/sbin/ntpq"
-NTP_KEYS=$(awk '/^keys/ { print $2 }' $NTP_CONF)
+NTP_KEYS=$(awk '/^keys[[:blank:]]/ { print $2 }' $NTP_CONF)
NTP_KEYID=$(awk '/^requestkey[[:blank:]]/ { print $2 }' $NTP_CONF)
NTP_PASSWD=$(test -n "$NTP_KEYS" -a -n "$NTP_KEYID" -a -r "$NTP_KEYS" && awk
'$0 ~ key { print $3 }' key="^[[:blank:]]*$NTP_KEYID[[:blank:]]" $NTP_KEYS)
@@ -139,15 +139,9 @@
function add_runtime_server() {
[ "$NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP" = "yes" ] && /usr/sbin/sntp -S -c $@
- NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\naddserver $@\n"
- NTPDC_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPDC_BIN)
- logger -t $0 "runtime configuration: $NTPDC_LOG"
-}
-
-function reloaddevices {
- NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\nifreload\n"
- NTPDC_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPDC_BIN)
- logger -t $0 "runtime configuration: $NTPDC_LOG"
+ NTPC_CMD="keyid $NTP_KEYID\npasswd $NTP_PASSWD\n:config server $@\n"
+ NTPQ_LOG=$(echo -e "${NTPC_CMD}quit" | $NTPQ_BIN)
+ logger -t $0 "runtime configuration: $NTPQ_LOG"
}
function get_ntpd_ip_proto() {
