aboutsummaryrefslogtreecommitdiffstats
path: root/net/ntp/files/patch-ntpd_ntp__io.c
diff options
context:
space:
mode:
authorLexi Winter <ivy@FreeBSD.org>2025-12-01 03:19:41 +0000
committerLexi Winter <ivy@FreeBSD.org>2025-12-01 03:19:41 +0000
commit2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch)
tree25f0138e1af8902b92dacc8cce09b267447c17db /net/ntp/files/patch-ntpd_ntp__io.c
parentf85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff)
parent1a30da80670973368b399f2b01fe9c04b91a1273 (diff)
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'net/ntp/files/patch-ntpd_ntp__io.c')
-rw-r--r--net/ntp/files/patch-ntpd_ntp__io.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/net/ntp/files/patch-ntpd_ntp__io.c b/net/ntp/files/patch-ntpd_ntp__io.c
index 10bac6d961f7..d43d090049ec 100644
--- a/net/ntp/files/patch-ntpd_ntp__io.c
+++ b/net/ntp/files/patch-ntpd_ntp__io.c
@@ -1,5 +1,5 @@
--- 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
++++ ntpd/ntp_io.c 2025-11-20 19:55:01.228924000 -0800
@@ -1486,9 +1486,7 @@
if (IS_IPV6(psau)) {
@@ -11,6 +11,20 @@
return TRUE;
}
} else if (IS_IPV4(psau)) {
+@@ -1921,11 +1919,11 @@
+ }
+ else {
+ DPRINT_INTERFACE(3,
+- (ep, "updating ", " new - FAILED"));
++ (ep2, "updating ", " new - FAILED"));
+
+ msyslog(LOG_ERR,
+ "cannot bind address %s",
+- stoa(&ep->sin));
++ stoa(&ep2->sin));
+ }
+ free(ep2);
+ }
@@ -3205,7 +3203,7 @@
}