diff options
Diffstat (limited to 'net/openntpd/files')
| -rw-r--r-- | net/openntpd/files/patch-src_ntpd.8 | 15 | ||||
| -rw-r--r-- | net/openntpd/files/patch-src_parse.y | 23 |
2 files changed, 7 insertions, 31 deletions
diff --git a/net/openntpd/files/patch-src_ntpd.8 b/net/openntpd/files/patch-src_ntpd.8 index 050631b2c2c3..61a3b8eed88c 100644 --- a/net/openntpd/files/patch-src_ntpd.8 +++ b/net/openntpd/files/patch-src_ntpd.8 @@ -1,4 +1,4 @@ ---- src/ntpd.8.orig 2016-05-30 22:50:02 UTC +--- src/ntpd.8.orig 2017-09-07 19:12:02 UTC +++ src/ntpd.8 @@ -56,7 +56,7 @@ Use .Ar file @@ -9,7 +9,7 @@ .It Fl n Configtest mode. Only check the configuration file for validity. -@@ -99,19 +99,19 @@ will be logged. +@@ -99,18 +99,18 @@ will be logged. After the local clock is synchronized, .Nm adjusts the clock frequency using the @@ -18,13 +18,12 @@ system call to compensate for systematic drift. .Pp .Nm - is usually started at boot time, and can be enabled by - setting +-is started at boot time by default via -.Va ntpd_flags ++is usually started at boot time, and can be enabled by setting +.Va openntpd_flags in --.Pa /etc/rc.conf.local . -+.Pa /etc/rc.conf . + .Pa /etc/rc.conf . See .Xr rc 8 and @@ -33,7 +32,7 @@ for more information on the boot process and enabling daemons. .Pp -@@ -124,8 +124,8 @@ and its initial clock drift from +@@ -123,8 +123,8 @@ and its initial clock drift from .Pa /var/db/ntpd.drift . Clock drift is periodically written to the drift file thereafter. .Sh FILES @@ -44,7 +43,7 @@ Default configuration file. .It Pa /var/db/ntpd.drift Drift file. -@@ -135,12 +135,12 @@ Socket file for communication with +@@ -134,12 +134,12 @@ Socket file for communication with .El .Sh SEE ALSO .Xr date 1 , diff --git a/net/openntpd/files/patch-src_parse.y b/net/openntpd/files/patch-src_parse.y deleted file mode 100644 index 0f1a3b912131..000000000000 --- a/net/openntpd/files/patch-src_parse.y +++ /dev/null @@ -1,23 +0,0 @@ ---- 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); |