Log listening address as addr:port.

remove assoc_number < 0 check now that it is unsigned.

bk: 4d0c2905GJ_yQx4dV8BRvrukqF6Ceg

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index ac54f3c402fa357f441879adb8432c13b1cbabfa..31a566e2c7cbae6fdd69c8976745531987d19a85 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -1218,14 +1218,13 @@ log_listen_address(
        endpt * ep
        )
 {
-       msyslog(LOG_INFO, "%s on %d %s %s UDP %d",
+       msyslog(LOG_INFO, "%s on %d %s %s",
                (ep->ignore_packets) 
                    ? "Listen and drop"
                    : "Listen normally",
                ep->ifnum,
                ep->name,
-               stoa(&ep->sin),
-               SRCPORT(&ep->sin));
+               sptoa(&ep->sin));
 }
 
 

diff --git a/ntpq/libntpq.c b/ntpq/libntpq.c
index 27a15dc4b500c59fc21601851d7267263896bb4e..3322ed232cb7b1b391775e4bd33df99f56f8f295 100644 (file)
--- a/ntpq/libntpq.c
+++ b/ntpq/libntpq.c
@@ -714,7 +714,7 @@ int ntpq_get_assoc_clocktype ( associd_t assoc_number )
        char value[LENHOSTNAME];
        char resultbuf[1024];
 
-       if ( assoc_number < 0 || assoc_number > numassoc )
+       if ( assoc_number > numassoc )
                return -1;
        if ( peervar_assoc != assoc_cache[assoc_number].assid ) {
                i = ntpq_read_assoc_peervars(