[Bug 1558] pool prototype associations have 0.0.0.0 for remote addr.

bk: 4bf1e12bQD3XbFJ9eBW0rMmZ6Cu60A

diff --git a/ChangeLog b/ChangeLog
index dee6e8239946c0f53187cb05bbc8c6a507ecf446..281d32e45abdbb39f51b7561f27e831a6fc9aaeb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 * [Bug 1555] from 4.2.6p2-RC4: sntp illegal C (mixed code and
   declarations).
+* [Bug 1558] pool prototype associations have 0.0.0.0 for remote addr.
 * configure.ac: add --disable-autokey, #define AUTOKEY to enable future
   support for building without Autokey, but with OpenSSL for its digest
   algorithms (hash functions).  Code must be modified to use #ifdef

diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 143d55e852a065b8e3be0011c5697e0fc23990ee..f4e9c9bc1b1de2979f0ecf9afe8d620800d6512c 100644 (file)
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -1779,7 +1779,9 @@ doprintpeers(
        if (numhosts > 1)
                fprintf(fp, "%-*s ", maxhostlen, currenthost);
        if (AF_UNSPEC == af || AF(&srcadr) == af) {
-               strncpy(clock_name, nntohost(&srcadr), sizeof(clock_name));             
+               if (!havevar[HAVE_SRCHOST])
+                       strncpy(clock_name, nntohost(&srcadr),
+                               sizeof(clock_name));
                fprintf(fp, "%c%-15.15s ", c, clock_name);
                drlen = strlen(dstadr_refid);
                makeascii(drlen, dstadr_refid, fp);