From: Danny Mayer <mayer@ntp.org>
Date: Mon, 5 Feb 2007 02:44:13 +0000 (-0500)
Subject: Bug #586 Check for <4 characters for the refid first
X-Git-Tag: NTP_4_2_4_RC3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=775ba37ed3dc161b864cad4d1412ae34594c5d85;p=thirdparty%2Fntp.git

Bug #586 Check for <4 characters for the refid first

bk: 45c699fdTTKIQ6dCwAlUmRN0JblB7Q
---

diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 93551bd72..fa12d78b0 100644
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -1416,6 +1416,13 @@ doprintpeers(
 				havevar[HAVE_REFID] = 1;
 				if (*value == '\0') {
 					dstadr_refid = "0.0.0.0";
+				} else if ((int)strlen(value) <= 4) {
+					refid_string[0] = '.';
+					(void) strcpy(&refid_string[1], value);
+					i = strlen(refid_string);
+					refid_string[i] = '.';
+					refid_string[i+1] = '\0';
+					dstadr_refid = refid_string;
 				} else if (decodenetnum(value, &dstadr)) {
 					if (SOCKNUL(&dstadr))
 						dstadr_refid = "0.0.0.0";
@@ -1426,13 +1433,6 @@ doprintpeers(
 					else
 						dstadr_refid =
 						    stoa(&dstadr);
-				} else if ((int)strlen(value) <= 4) {
-					refid_string[0] = '.';
-					(void) strcpy(&refid_string[1], value);
-					i = strlen(refid_string);
-					refid_string[i] = '.';
-					refid_string[i+1] = '\0';
-					dstadr_refid = refid_string;
 				} else {
 					havevar[HAVE_REFID] = 0;
 				}
@@ -1469,9 +1469,8 @@ doprintpeers(
 				havevar[HAVE_OFFSET] = 1;
 			break;
 			case CP_JITTER:
-			if (pvl == peervarlist)
-				if (decodetime(value, &estjitter))
-					havevar[HAVE_JITTER] = 1;
+			if (decodetime(value, &estjitter))
+				havevar[HAVE_JITTER] = 1;
 			break;
 			case CP_DISPERSION:
 			if (decodetime(value, &estdisp))