[Bug 2967] ntpdate command suffers an assertion failure

  - fixed ntp_rfc2553.c to return proper address length.

bk: 56540c81drscYZOFbhk9iE2uioXa1w

diff --git a/ChangeLog b/ChangeLog
index 254284f0ddc3e630cdecc11c397934386dfef03f..95bf9c56639784550ad5c6aad6ae58b06ce78cd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
   - make sure SOCKET values are not truncated (win32-specific)
   - format string fixes
 * [Bug 2965] Local clock didn't work since 4.2.8p4.  Martin Burnicki.
+* [Bug 2967] ntpdate command suffers an assertion failure
+  - fixed ntp_rfc2553.c to return proper address length. perlinger@ntp.org
 * [Bug 2969]  Seg fault from ntpq/mrulist when looking at server with
               lots of clients. perlinger@ntp.org
 * Unity cleanup for FreeBSD-6.4.  Harlan Stenn.

diff --git a/libntp/ntp_rfc2553.c b/libntp/ntp_rfc2553.c
index a9ebb4b3536310bec4e97bd7d2211082b40af54d..f231047e9f1505afebdc48e17aa7a63d4d5edbf0 100644 (file)
--- a/libntp/ntp_rfc2553.c
+++ b/libntp/ntp_rfc2553.c
@@ -480,15 +480,16 @@ do_nodename(
         * set elsewhere so that we can set the appropriate wildcard
         */
        if (nodename == NULL) {
-               ai->ai_addrlen = sizeof(struct sockaddr_storage);
                if (ai->ai_family == AF_INET)
                {
+                       ai->ai_addrlen = sizeof(struct sockaddr_in);
                        sockin = (struct sockaddr_in *)ai->ai_addr;
                        sockin->sin_family = (short) ai->ai_family;
                        sockin->sin_addr.s_addr = htonl(INADDR_ANY);
                }
                else
                {
+                       ai->ai_addrlen = sizeof(struct sockaddr_in6);
                        sockin6 = (struct sockaddr_in6 *)ai->ai_addr;
                        sockin6->sin6_family = (short) ai->ai_family;
                        /*