From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 17 Jan 2012 00:59:47 +0000 (+0000)
Subject: [Bug 2115] ntptrace should accept both rootdispersion and rootdisp
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2af9add47e4a0e366c12033cf4ebedad437fb019;p=thirdparty%2Fntp.git

[Bug 2115] ntptrace should accept both rootdispersion and rootdisp

bk: 4f14c803nOGOmbeJdfStAyZjhp30Yg
---

diff --git a/ChangeLog b/ChangeLog
index a650868642..fc2715057e 100644
--- 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 b765d2196e..e54ca2bce8 100755
--- 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";