mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 17:46:38 -04:00
37ce58edb9
43537eb9c3 circumvented an upstream patch which caused an IPv6
pool regresson. This patch removes the circumvention and replaces
it with an upstream patch planned for the new release of ntp.
Obtained from: src bc02e6558720
MFH: 2025Q1
22 lines
567 B
C
22 lines
567 B
C
--- ntpd/ntp_io.c.orig 2024-05-07 04:21:17.000000000 -0700
|
|
+++ ntpd/ntp_io.c 2025-02-18 19:38:16.412031000 -0800
|
|
@@ -1486,9 +1486,7 @@
|
|
|
|
if (IS_IPV6(psau)) {
|
|
p6addr = &psau->sa6.sin6_addr;
|
|
- if ( IN6_IS_ADDR_LINKLOCAL(p6addr)
|
|
- || IN6_IS_ADDR_SITELOCAL(p6addr)) {
|
|
-
|
|
+ if (IN6_IS_ADDR_LINKLOCAL(p6addr)) {
|
|
return TRUE;
|
|
}
|
|
} else if (IS_IPV4(psau)) {
|
|
@@ -3205,7 +3203,7 @@
|
|
}
|
|
|
|
do {
|
|
- if (INT_LL_OF_GLOB & src->flags) {
|
|
+ if (ismcast && INT_LL_OF_GLOB & src->flags) {
|
|
/* avoid duplicate multicasts on same IPv6 net */
|
|
goto loop;
|
|
}
|