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 93551bd72b0ae1b681e8d3a056d2904390ad4ad7..fa12d78b02771948b0ddd7a119d6e91bb9f9eb21 100644 (file)
--- 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))