Date: Fri, 11 Aug 2017 19:51:28 +0000 (UTC) From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447789 - in head/net/openntpd: . files Message-ID: <201708111951.v7BJpSWk056046@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Fri Aug 11 19:51:28 2017 New Revision: 447789 URL: https://svnweb.freebsd.org/changeset/ports/447789 Log: Add a missing initialization and correct a memcpy size to fix the new "query from" feature. Reported by: Roger Marquis <marquis@roble.com> Added: head/net/openntpd/files/patch-src_parse.y (contents, props changed) Modified: head/net/openntpd/Makefile Modified: head/net/openntpd/Makefile ============================================================================== --- head/net/openntpd/Makefile Fri Aug 11 19:17:47 2017 (r447788) +++ head/net/openntpd/Makefile Fri Aug 11 19:51:28 2017 (r447789) @@ -2,6 +2,7 @@ PORTNAME= openntpd PORTVERSION= 6.2p1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD Added: head/net/openntpd/files/patch-src_parse.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openntpd/files/patch-src_parse.y Fri Aug 11 19:51:28 2017 (r447789) @@ -0,0 +1,23 @@ +--- src/parse.y.orig 2017-08-11 19:19:57 UTC ++++ src/parse.y +@@ -136,6 +136,8 @@ main : LISTEN ON address listen_opts { + struct sockaddr_in sin4; + struct sockaddr_in6 sin6; + ++ memset(&sin4, 0, sizeof(sin4)); ++ memset(&sin6, 0, sizeof(sin6)); + sin4.sin_family = AF_INET; + sin6.sin6_family = AF_INET6; + #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN +@@ -144,9 +146,9 @@ main : LISTEN ON address listen_opts { + #endif + + if (inet_pton(AF_INET, $3, &sin4.sin_addr) == 1) +- memcpy(&query_addr4, &sin4, sizeof(struct in_addr)); ++ memcpy(&query_addr4, &sin4, sizeof(struct sockaddr_in)); + else if (inet_pton(AF_INET6, $3, &sin6.sin6_addr) == 1) +- memcpy(&query_addr6, &sin6, sizeof(struct in6_addr)); ++ memcpy(&query_addr6, &sin6, sizeof(struct sockaddr_in6)); + else { + yyerror("invalid IPv4 or IPv6 address: %s\n", + $3);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708111951.v7BJpSWk056046>