Attachment #171063 for bug #210056

Lines 1-8 Link Here

(-)Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= openntpd	3	PORTNAME= openntpd
4	PORTVERSION= 5.9p1	4	PORTVERSION= 6.0p1
5	PORTREVISION= 1
6	PORTEPOCH= 2	5	PORTEPOCH= 2
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= OPENBSD/OpenNTPD	7	MASTER_SITES= OPENBSD/OpenNTPD

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (openntpd-5.9p1.tar.gz) = 200c04056d4d6441653cac71d515611f3903aa7b15b8f5661a40dab3fb3697b3	1	TIMESTAMP = 1465149207
2	SIZE (openntpd-5.9p1.tar.gz) = 432844	2	SHA256 (openntpd-6.0p1.tar.gz) = b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8
		3	SIZE (openntpd-6.0p1.tar.gz) = 432696

Lines 1-10 Link Here

(-)files/patch-include_signal.h (-10 lines)
1	--- include/signal.h.orig 2015-05-04 09:54:32 UTC
2	+++ include/signal.h
3	@@ -8,3 +8,7 @@
4	#ifndef SIGINFO
5	#define SIGINFO SIGUSR1
6	#endif
7	+
8	+#ifndef _NSIG
9	+#define _NSIG NSIG
10	+#endif

Lines 1-11 Link Here

(-)files/patch-src_constraint.c (-11 lines)
1	--- src/constraint.c.orig 2016-03-28 13:51:51 UTC
2	+++ src/constraint.c
3	@@ -905,7 +905,7 @@ httpsdate_request(struct httpsdate *http
4	* or ANSI C's asctime() - the latter doesn't include
5	* the timezone which is required here.
6	*/
7	- if (strptime(p, "%a, %d %h %Y %T %Z",
8	+ if (strptime(p, "%a, %d %h %Y %T GMT",
9	&httpsdate->tls_tm) == NULL) {
10	log_warnx("unsupported date format");
11	free(line);




 #endif
 
 	TAILQ_FOREACH(lap, &lconf->listen_addrs, entry) {
@@ -56,16 +56,21 @@ setup_listeners(struct servent *se, stru
 				sa = ifap->ifa_addr;
 				if (sa == NULL || SA_LEN(sa) == 0)
 					continue;
-#ifdef SO_RTABLE
-				if (sa->sa_family == AF_LINK) {
-					ifd = ifap->ifa_data;
-					rdomain = ifd->ifi_rdomain;
-				}
-#endif
 				if (sa->sa_family != AF_INET &&
 				    sa->sa_family != AF_INET6)
 					continue;
 #ifdef SO_RTABLE
+				strlcpy(ifr.ifr_name, ifap->ifa_name,
+				    sizeof(ifr.ifr_name));
+
+				fd = socket(AF_INET, SOCK_DGRAM, 0);
+				if (ioctl(fd, SIOCGIFRDOMAIN,
+				    (caddr_t)&ifr) == -1)
+					rdomain = 0;
+				else
+					rdomain = ifr.ifr_rdomainid;
+				close(fd);
+
 				if (lap->rtable != -1 && rdomain != lap->rtable)
 					continue;
 #endif

Return to bug 210056

Lines 17-47 Link Here

(-)files/patch-src_server.c (-28 lines)
17	#endif	17	#endif
18		18
19	TAILQ_FOREACH(lap, &lconf->listen_addrs, entry) {	19	TAILQ_FOREACH(lap, &lconf->listen_addrs, entry) {
20	@@ -56,16 +56,21 @@ setup_listeners(struct servent *se, stru
21	sa = ifap->ifa_addr;
22	if (sa == NULL \|\| SA_LEN(sa) == 0)
23	continue;
24	-#ifdef SO_RTABLE
25	- if (sa->sa_family == AF_LINK) {
26	- ifd = ifap->ifa_data;
27	- rdomain = ifd->ifi_rdomain;
28	- }
29	-#endif
30	if (sa->sa_family != AF_INET &&
31	sa->sa_family != AF_INET6)
32	continue;
33	#ifdef SO_RTABLE
34	+ strlcpy(ifr.ifr_name, ifap->ifa_name,
35	+ sizeof(ifr.ifr_name));
36	+
37	+ fd = socket(AF_INET, SOCK_DGRAM, 0);
38	+ if (ioctl(fd, SIOCGIFRDOMAIN,
39	+ (caddr_t)&ifr) == -1)
40	+ rdomain = 0;
41	+ else
42	+ rdomain = ifr.ifr_rdomainid;
43	+ close(fd);
44	+
45	if (lap->rtable != -1 && rdomain != lap->rtable)
46	continue;
47	#endif