From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sun, 10 Jul 2022 20:29:34 +0000 (+0100)
Subject: local-getaddrinfo-freebsd-kernel
X-Git-Tag: archive/raspbian/2.33-8+rpi1^2~36
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a6baabbc090732fefa53f3ac5283cb6da1c58a84;p=glibc.git

local-getaddrinfo-freebsd-kernel


Gbp-Pq: Topic kfreebsd
Gbp-Pq: Name local-getaddrinfo-freebsd-kernel.diff
---

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 92d2a1c28..bc71e0c38 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -2341,8 +2341,21 @@ getaddrinfo (const char *name, const char *service,
 		}
 
 	      socklen_t sl = sizeof (results[i].source_addr);
+	      const struct sockaddr *sa = q->ai_addr;
+#ifdef __FreeBSD_kernel__
+	      struct sockaddr_in6 sa_in6;
+	      /* The FreeBSD kernel doesn't allow connections on port 0. Use
+	         port 1 instead, as on the FreeBSD libc. */
+	      if (((struct sockaddr_in *)sa)->sin_port == htons(0))
+		{
+		  sa = (struct sockaddr *)&sa_in6;
+		  memcpy(&sa_in6, q->ai_addr, q->ai_family == AF_INET6 ?
+		       sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
+		  sa_in6.sin6_port = htons(1);
+		}
+#endif
 	      if (fd != -1
-		  && __connect (fd, q->ai_addr, q->ai_addrlen) == 0
+		  && __connect (fd, sa, q->ai_addrlen) == 0
 		  && __getsockname (fd,
 				    (struct sockaddr *) &results[i].source_addr,
 				    &sl) == 0)