[Bug 2115] ntptrace should accept both rootdispersion and rootdisp

bk: 4f14c803nOGOmbeJdfStAyZjhp30Yg

diff --git a/ChangeLog b/ChangeLog
index a6508686427335a919ebfa99e2724a2f51c220e3..fc2715057effbbd64836b65e3c398d01247b499f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2115] ntptrace should accept both rootdispersion and rootdisp.
 (4.2.7p250) 2012/01/15 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2113] Warn about ignored extra args in ntpq.
 * Update the copyright year.

diff --git a/scripts/ntptrace.in b/scripts/ntptrace.in
index b765d2196e41f079a88c8f4deedf22967d36ec59..e54ca2bce81bb2545df522586b7036e99116961a 100755 (executable)
--- a/scripts/ntptrace.in
+++ b/scripts/ntptrace.in
@@ -34,7 +34,8 @@ for (;;) {
                # Very old servers report phase and not offset.
                $offset = $1 if (/(?:offset|phase)=([^\s,]+)/);
                $rootdelay = $1 if (/rootdelay=([^\s,]+)/);
-               $rootdispersion = $1 if (/rootdispersion=([^\s,]+)/);
+               # firstly - rootdispersion, now - rootdisp
+               $rootdispersion = $1 if (/(?:rootdisp|rootdispersion)=([^\s,]+)/);
                $refid = $1 if (/refid=([^\s,]+)/);
        }
        close(PH) || die "$cmd failed";