Fincer
/
openntpd-portable
mirror of https://github.com/Fincer/openntpd-portable
1
0
Fork 0
Code Issues 0 Projects 0 Releases 10 Wiki Activity
Browse Source

rebase patches for latest

OPENBSD_6_1
Brent Cook 7 years ago
parent
ea9814a344
commit
507bc6a518
13 changed files with 66 additions and 66 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch
  2. +3
    -3
      patches/0002-EAI_NODATA-does-not-exist-everywhere.patch
  3. +3
    -3
      patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch
  4. +5
    -5
      patches/0004-check-if-rdomain-support-is-available.patch
  5. +3
    -3
      patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch
  6. +3
    -3
      patches/0006-allow-overriding-default-user-and-file-locations.patch
  7. +14
    -14
      patches/0007-add-p-option-to-create-a-pid-file.patch
  8. +8
    -8
      patches/0008-initialize-setproctitle-where-needed.patch
  9. +9
    -9
      patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch
  10. +4
    -4
      patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch
  11. +3
    -3
      patches/0011-Deal-with-missing-SO_TIMESTAMP.patch
  12. +5
    -5
      patches/0012-check-result-of-ftello-ftruncate.patch
  13. +3
    -3
      patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch

+ 3
- 3
patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch View File

@ -1,4 +1,4 @@
From 98f3ab8d437edaddf875629702d9b7edf800f253 Mon Sep 17 00:00:00 2001
From bb662d94b236661694cde356b4a8461d1d2a65fc Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:10:22 -0600
Subject: [PATCH 01/13] Handle IPv6 DNS records on IPv4 networks more liberally
@ -13,7 +13,7 @@ Original Author: Stefan Praszalowicz <stefan.praszalowicz@avedya.com>
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c
index ddbb128..3d70317 100644
index ddbb1281a..3d70317d9 100644
--- a/src/usr.sbin/ntpd/client.c
+++ b/src/usr.sbin/ntpd/client.c
@@ -138,9 +138,16 @@ client_query(struct ntp_peer *p)
@ -37,5 +37,5 @@ index ddbb128..3d70317 100644
if (connect(p->query->fd, sa, SA_LEN(sa)) == -1) {
if (errno == ECONNREFUSED || errno == ENETUNREACH ||
--
2.10.1
2.11.0

+ 3
- 3
patches/0002-EAI_NODATA-does-not-exist-everywhere.patch View File

@ -1,4 +1,4 @@
From a1caa67ef58e032ca06012cb3c7f2e00b51be525 Mon Sep 17 00:00:00 2001
From 0c4162f168a7eb6080146a2d9a24b79450ac6474 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:04:08 -0600
Subject: [PATCH 02/13] EAI_NODATA does not exist everywhere
@ -15,7 +15,7 @@ portable software now has to have a special check instead.
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/usr.sbin/ntpd/config.c b/src/usr.sbin/ntpd/config.c
index b2f688e..c0a99b1 100644
index b2f688e2a..c0a99b167 100644
--- a/src/usr.sbin/ntpd/config.c
+++ b/src/usr.sbin/ntpd/config.c
@@ -133,8 +133,14 @@ host_dns(const char *s, struct ntp_addr **hn)
@ -36,5 +36,5 @@ index b2f688e..c0a99b1 100644
log_warnx("could not parse \"%s\": %s", s,
gai_strerror(error));
--
2.10.1
2.11.0

+ 3
- 3
patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch View File

@ -1,4 +1,4 @@
From cdd9f88306fd4b7bcf613ec909a0dfa2947f216b Mon Sep 17 00:00:00 2001
From 080b932380fed45a3da722ba9abee904513f7ea4 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:02:50 -0600
Subject: [PATCH 03/13] conditionally fill in sin_len/sin6_len if they exist
@ -8,7 +8,7 @@ Subject: [PATCH 03/13] conditionally fill in sin_len/sin6_len if they exist
1 file changed, 8 insertions(+)
diff --git a/src/usr.sbin/ntpd/config.c b/src/usr.sbin/ntpd/config.c
index c0a99b1..87de17a 100644
index c0a99b167..87de17ae0 100644
--- a/src/usr.sbin/ntpd/config.c
+++ b/src/usr.sbin/ntpd/config.c
@@ -72,7 +72,9 @@ host_v4(const char *s)
@ -49,5 +49,5 @@ index c0a99b1..87de17a 100644
res->ai_addr)->sin6_addr, sizeof(struct in6_addr));
}
--
2.10.1
2.11.0

+ 5
- 5
patches/0004-check-if-rdomain-support-is-available.patch View File

@ -1,4 +1,4 @@
From 64086a3dabe677a925ad414ff4a67e86c7fbb48e Mon Sep 17 00:00:00 2001
From 15cefa4812cb63b887d43ff69262a93b8e2aeb72 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:05:46 -0600
Subject: [PATCH 04/13] check if rdomain support is available.
@ -12,7 +12,7 @@ Handle FreeBSD's calling rdomain 'FIB'.
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index be13fde..b2a5cd9 100644
index 613b29b25..51b77b377 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -40,6 +40,12 @@
@ -29,7 +29,7 @@ index be13fde..b2a5cd9 100644
#define INTERVAL_QUERY_PATHETIC 60
#define INTERVAL_QUERY_AGGRESSIVE 5
diff --git a/src/usr.sbin/ntpd/parse.y b/src/usr.sbin/ntpd/parse.y
index 6d50795..33fe13d 100644
index 6d507957c..33fe13d6a 100644
--- a/src/usr.sbin/ntpd/parse.y
+++ b/src/usr.sbin/ntpd/parse.y
@@ -404,11 +404,13 @@ weight : WEIGHT NUMBER {
@ -47,7 +47,7 @@ index 6d50795..33fe13d 100644
}
;
diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c
index b67d274..cbaa115 100644
index b67d2745d..cbaa1158e 100644
--- a/src/usr.sbin/ntpd/server.c
+++ b/src/usr.sbin/ntpd/server.c
@@ -35,11 +35,16 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
@ -112,5 +112,5 @@ index b67d274..cbaa115 100644
if (bind(la->fd, (struct sockaddr *)&la->sa,
SA_LEN((struct sockaddr *)&la->sa)) == -1) {
--
2.10.1
2.11.0

+ 3
- 3
patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch View File

@ -1,4 +1,4 @@
From 837f944a4bba5b0a3a9262137c86448018029a48 Mon Sep 17 00:00:00 2001
From b885a7eacdb56cbd2ab9804787021403becc1372 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:20:03 -0600
Subject: [PATCH 05/13] update ntpd.conf to indicate OS-dependent options
@ -11,7 +11,7 @@ Debian bug ID: 575705
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/usr.sbin/ntpd/ntpd.conf.5 b/src/usr.sbin/ntpd/ntpd.conf.5
index af11a7e..87f94e8 100644
index 6e4e00121..5f437a15c 100644
--- a/src/usr.sbin/ntpd/ntpd.conf.5
+++ b/src/usr.sbin/ntpd/ntpd.conf.5
@@ -38,9 +38,14 @@ The basic configuration options are as follows:
@ -49,5 +49,5 @@ index af11a7e..87f94e8 100644
.Xr ntpd 8
will use each given sensor that actually exists.
--
2.10.1
2.11.0

+ 3
- 3
patches/0006-allow-overriding-default-user-and-file-locations.patch View File

@ -1,4 +1,4 @@
From 7fa2b6297c72062585ed515a5aa16c4451b7c873 Mon Sep 17 00:00:00 2001
From daff3f5f9458f613f8e62b4808f7c3276b1d45ed Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Thu, 1 Jan 2015 07:18:11 -0600
Subject: [PATCH 06/13] allow overriding default user and file locations
@ -10,7 +10,7 @@ default user.
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index b2a5cd9..f80e23c 100644
index 51b77b377..a123d1bfc 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -35,10 +35,20 @@
@ -48,5 +48,5 @@ index b2a5cd9..f80e23c 100644
#define PARENT_SOCK_FILENO CONSTRAINT_PASSFD
--
2.10.1
2.11.0

+ 14
- 14
patches/0007-add-p-option-to-create-a-pid-file.patch View File

@ -1,4 +1,4 @@
From 3abcf742a75a14d89f7cbea12acb4300f16c51fb Mon Sep 17 00:00:00 2001
From 4ee694f478d89cf572546f761c9ef454ec10402a Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Wed, 31 Dec 2014 08:26:41 -0600
Subject: [PATCH 07/13] add -p option to create a pid file
@ -13,7 +13,7 @@ Origin: https://bugs.gentoo.org/show_bug.cgi?id=493082
3 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/usr.sbin/ntpd/ntpd.8 b/src/usr.sbin/ntpd/ntpd.8
index dcfb6d2..1b885a1 100644
index dcfb6d243..1b885a13d 100644
--- a/src/usr.sbin/ntpd/ntpd.8
+++ b/src/usr.sbin/ntpd/ntpd.8
@@ -25,6 +25,7 @@
@ -35,7 +35,7 @@ index dcfb6d2..1b885a1 100644
Do not set the time immediately at startup.
This is the default.
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index aac5e23..463600a 100644
index 1750b8cf5..8e47e2403 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -87,6 +87,18 @@ sighdlr(int sig)
@ -66,16 +66,16 @@ index aac5e23..463600a 100644
__progname);
exit(1);
}
@@ -135,7 +147,7 @@ main(int argc, char *argv[])
@@ -132,7 +144,7 @@ main(int argc, char *argv[])
memset(&lconf, 0, sizeof(lconf));
- while ((ch = getopt(argc, argv, "df:nP:sSv")) != -1) {
+ while ((ch = getopt(argc, argv, "df:nP:p:sSv")) != -1) {
+ while ((ch = getopt(argc, argv, "df:np:P:sSv")) != -1) {
switch (ch) {
case 'd':
lconf.debug = 2;
@@ -150,6 +162,9 @@ main(int argc, char *argv[])
@@ -147,6 +159,9 @@ main(int argc, char *argv[])
case 'P':
pname = optarg;
break;
@ -85,10 +85,10 @@ index aac5e23..463600a 100644
case 's':
lconf.settime = 1;
break;
@@ -217,9 +232,11 @@ main(int argc, char *argv[])
@@ -210,9 +225,11 @@ main(int argc, char *argv[])
if (!lconf.settime) {
log_init(lconf.debug, LOG_DAEMON);
log_verbose(lconf.verbose);
log_setverbose(lconf.verbose);
- if (!lconf.debug)
+ if (!lconf.debug) {
if (daemon(1, 0))
@ -98,8 +98,8 @@ index aac5e23..463600a 100644
} else
timeout = SETTIME_TIMEOUT * 1000;
@@ -294,9 +311,11 @@ main(int argc, char *argv[])
log_verbose(lconf.verbose);
@@ -287,9 +304,11 @@ main(int argc, char *argv[])
log_setverbose(lconf.verbose);
log_warnx("no reply received in time, skipping initial "
"time setting");
- if (!lconf.debug)
@ -111,7 +111,7 @@ index aac5e23..463600a 100644
}
if (nfds > 0 && (pfd[PFD_PIPE].revents & POLLOUT))
@@ -335,6 +354,8 @@ main(int argc, char *argv[])
@@ -328,6 +347,8 @@ main(int argc, char *argv[])
msgbuf_clear(&ibuf->w);
free(ibuf);
log_info("Terminating");
@ -120,7 +120,7 @@ index aac5e23..463600a 100644
return (0);
}
@@ -395,9 +416,11 @@ dispatch_imsg(struct ntpd_conf *lconf, int argc, char **argv)
@@ -388,9 +409,11 @@ dispatch_imsg(struct ntpd_conf *lconf, int argc, char **argv)
memcpy(&d, imsg.data, sizeof(d));
ntpd_settime(d);
/* daemonize now */
@ -134,7 +134,7 @@ index aac5e23..463600a 100644
timeout = INFTIM;
break;
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index f80e23c..fcca519 100644
index a123d1bfc..6e693661c 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -249,6 +249,7 @@ struct ntpd_conf {
@ -146,5 +146,5 @@ index f80e23c..fcca519 100644
struct ctl_show_status {
--
2.10.1
2.11.0

+ 8
- 8
patches/0008-initialize-setproctitle-where-needed.patch View File

@ -1,4 +1,4 @@
From c3e7a0b0601b35facd51003441603e0a93cda429 Mon Sep 17 00:00:00 2001
From fdee13a0fe8525bd6d3d84082e26ff7f3a2cf70f Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Mon, 12 Jan 2015 06:18:31 -0600
Subject: [PATCH 08/13] initialize setproctitle where needed
@ -6,11 +6,11 @@ Subject: [PATCH 08/13] initialize setproctitle where needed
We need to save a copy of argv and __progname to avoid setproctitle
clobbering them.
---
src/usr.sbin/ntpd/ntpd.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
src/usr.sbin/ntpd/ntpd.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index 463600a..70e5ae7 100644
index 8e47e2403..400528493 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -117,6 +117,13 @@ usage(void)
@ -27,7 +27,7 @@ index 463600a..70e5ae7 100644
int
main(int argc, char *argv[])
{
@@ -138,6 +145,8 @@ main(int argc, char *argv[])
@@ -135,6 +142,8 @@ main(int argc, char *argv[])
char **argv0 = argv;
char *pname = NULL;
@ -36,7 +36,7 @@ index 463600a..70e5ae7 100644
if (strcmp(__progname, "ntpctl") == 0) {
ctl_main(argc, argv);
/* NOTREACHED */
@@ -147,6 +156,17 @@ main(int argc, char *argv[])
@@ -144,6 +153,17 @@ main(int argc, char *argv[])
memset(&lconf, 0, sizeof(lconf));
@ -51,9 +51,9 @@ index 463600a..70e5ae7 100644
+ argv0 = argv;
+#endif
+
while ((ch = getopt(argc, argv, "df:nP:p:sSv")) != -1) {
while ((ch = getopt(argc, argv, "df:np:P:sSv")) != -1) {
switch (ch) {
case 'd':
--
2.10.1
2.11.0

+ 9
- 9
patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch View File

@ -1,4 +1,4 @@
From 11ad02bf243bed31db3a395e0b639fa4878e0192 Mon Sep 17 00:00:00 2001
From 0143ceba7461d06f9258ad96dfd8a972c19cbe3a Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Fri, 27 Mar 2015 23:14:15 -0500
Subject: [PATCH 09/13] Notify the user when constraint support is disabled.
@ -13,7 +13,7 @@ From Paul B. Henson.
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/usr.sbin/ntpd/config.c b/src/usr.sbin/ntpd/config.c
index 87de17a..5a75030 100644
index 87de17ae0..5a750309c 100644
--- a/src/usr.sbin/ntpd/config.c
+++ b/src/usr.sbin/ntpd/config.c
@@ -219,6 +219,9 @@ new_constraint(void)
@ -27,12 +27,12 @@ index 87de17a..5a75030 100644
}
diff --git a/src/usr.sbin/ntpd/constraint.c b/src/usr.sbin/ntpd/constraint.c
index e19d68e..791a74c 100644
index 892bfe89e..a488eab34 100644
--- a/src/usr.sbin/ntpd/constraint.c
+++ b/src/usr.sbin/ntpd/constraint.c
@@ -340,12 +340,14 @@ priv_constraint_child(const char *pw_dir, uid_t pw_uid, gid_t pw_gid)
(am = calloc(1, sizeof(*am))) == NULL)
fatal("%s: calloc", __func__);
@@ -336,12 +336,14 @@ priv_constraint_child(const char *pw_dir, uid_t pw_uid, gid_t pw_gid)
if (setpriority(PRIO_PROCESS, 0, 0) == -1)
log_warn("could not set priority");
+#ifdef HAVE_LIBTLS
/* Init TLS and load CA certs before chroot() */
@ -46,10 +46,10 @@ index e19d68e..791a74c 100644
if (chroot(pw_dir) == -1)
fatal("chroot");
diff --git a/src/usr.sbin/ntpd/ntpd.conf.5 b/src/usr.sbin/ntpd/ntpd.conf.5
index 87f94e8..7f729d2 100644
index 5f437a15c..2691f517c 100644
--- a/src/usr.sbin/ntpd/ntpd.conf.5
+++ b/src/usr.sbin/ntpd/ntpd.conf.5
@@ -185,8 +185,11 @@ authenticated constraint,
@@ -186,8 +186,11 @@ authenticated constraint,
thereby reducing the impact of unauthenticated NTP
man-in-the-middle attacks.
Received NTP packets with time information falling outside of a range
@ -64,5 +64,5 @@ index 87f94e8..7f729d2 100644
.It Ic constraint from Ar url
Specify the URL, IP address or the hostname of an HTTPS server to
--
2.10.1
2.11.0

+ 4
- 4
patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch View File

@ -1,4 +1,4 @@
From e0adef935d739f79f2bf25ed314096ac0d7dfeb7 Mon Sep 17 00:00:00 2001
From 0cf1333742437cfc53a1bba2d3d24756a196d897 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Mon, 4 May 2015 04:27:29 -0500
Subject: [PATCH 10/13] add a method for updating the realtime clock on sync
@ -9,7 +9,7 @@ from Christian Weisgerber
1 file changed, 2 insertions(+)
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index 70e5ae7..1cc7bc1 100644
index 400528493..287f9d549 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -55,6 +55,7 @@ const char *ctl_lookup_option(char *, const char **);
@ -20,7 +20,7 @@ index 70e5ae7..1cc7bc1 100644
volatile sig_atomic_t quit = 0;
volatile sig_atomic_t reconfig = 0;
@@ -488,6 +489,7 @@ ntpd_adjtime(double d)
@@ -482,6 +483,7 @@ ntpd_adjtime(double d)
else if (!firstadj && olddelta.tv_sec == 0 && olddelta.tv_usec == 0)
synced = 1;
firstadj = 0;
@ -29,5 +29,5 @@ index 70e5ae7..1cc7bc1 100644
}
--
2.10.1
2.11.0

+ 3
- 3
patches/0011-Deal-with-missing-SO_TIMESTAMP.patch View File

@ -1,4 +1,4 @@
From 903c33797293f1f5607c77834362870812f7f799 Mon Sep 17 00:00:00 2001
From a9c2be7c74c101e4ca0d6ce77fdde7dd20936b3d Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Sun, 6 Dec 2015 22:35:38 -0600
Subject: [PATCH 11/13] Deal with missing SO_TIMESTAMP
@ -11,7 +11,7 @@ Fall back to the previous client.c implementation when it is not found.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c
index 3d70317..5619454 100644
index 3d70317d9..5619454fb 100644
--- a/src/usr.sbin/ntpd/client.c
+++ b/src/usr.sbin/ntpd/client.c
@@ -163,10 +163,12 @@ client_query(struct ntp_peer *p)
@ -65,5 +65,5 @@ index 3d70317..5619454 100644
if (T4 < JAN_1970) {
client_log_error(p, "recvmsg control format", EBADF);
--
2.10.1
2.11.0

+ 5
- 5
patches/0012-check-result-of-ftello-ftruncate.patch View File

@ -1,4 +1,4 @@
From cb26bc1bcbc250f4493ce1574d095763692b8018 Mon Sep 17 00:00:00 2001
From 0b24427a97098670db562cf59cfea2c64e2239f1 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Mon, 21 Dec 2015 05:53:20 -0600
Subject: [PATCH 12/13] check result of ftello/ftruncate
@ -8,10 +8,10 @@ Subject: [PATCH 12/13] check result of ftello/ftruncate
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index 1cc7bc1..4493040 100644
index 287f9d549..fae82ef16 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -592,6 +592,7 @@ writefreq(double d)
@@ -586,6 +586,7 @@ writefreq(double d)
{
int r;
static int warnonce = 1;
@ -19,7 +19,7 @@ index 1cc7bc1..4493040 100644
if (freqfp == NULL)
return 0;
@@ -605,8 +606,10 @@ writefreq(double d)
@@ -599,8 +600,10 @@ writefreq(double d)
clearerr(freqfp);
return 0;
}
@ -33,5 +33,5 @@ index 1cc7bc1..4493040 100644
}
--
2.10.1
2.11.0

+ 3
- 3
patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch View File

@ -1,4 +1,4 @@
From f54f940c62731f2b7049af2e3785b88138bc2d75 Mon Sep 17 00:00:00 2001
From 66fa0621f96cad764f97e77701fb00fa825977b2 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Sat, 13 Aug 2016 14:22:02 -0500
Subject: [PATCH 13/13] set IPV6_V6ONLY if we are binding to an IPv6 address
@ -8,7 +8,7 @@ Subject: [PATCH 13/13] set IPV6_V6ONLY if we are binding to an IPv6 address
1 file changed, 9 insertions(+)
diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c
index cbaa115..dd554e6 100644
index cbaa1158e..dd554e630 100644
--- a/src/usr.sbin/ntpd/server.c
+++ b/src/usr.sbin/ntpd/server.c
@@ -42,6 +42,9 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
@ -35,5 +35,5 @@ index cbaa115..dd554e6 100644
if (la->rtable != -1 &&
setsockopt(la->fd, SOL_SOCKET, SO_RTABLE, &la->rtable,
--
2.10.1
2.11.0

Write Preview
Loading…
Cancel
Save