From: Sergey Fedorov <vital.had@gmail.com>
Date: Fri, 10 Oct 2025 05:54:40 +0000 (+0800)
Subject: Fix fallback macros in udppktinfo.c
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1462%2Fhead;p=thirdparty%2Fkrb5.git

Fix fallback macros in udppktinfo.c

Commit 87b7d86676bff0b64a9eea39849abc97fdbe2972 changed the signatures
of several udppktinfo.c functions, but did not update the fallback
macro signatures to match.  Update the fallback macros.  Fixes a build
error observed on macOS 10.6.8.

[ghudson@mit.edu: fixed additional fallback macros; edited commit
message]
---

diff --git a/src/lib/apputils/udppktinfo.c b/src/lib/apputils/udppktinfo.c
index 8eed7a29d4..2f4bb8a09c 100644
--- a/src/lib/apputils/udppktinfo.c
+++ b/src/lib/apputils/udppktinfo.c
@@ -210,7 +210,7 @@ check_cmsg_ip_recvdstaddr(struct cmsghdr *cmsgptr, struct sockaddr_in *to,
 }
 
 #else /* HAVE_IP_PKTINFO || IP_RECVDSTADDR */
-#define check_cmsg_v4_pktinfo(c, t, l, a) 0
+#define check_cmsg_v4_pktinfo(c, t, a) 0
 #endif /* HAVE_IP_PKTINFO || IP_RECVDSTADDR */
 
 #ifdef HAVE_IPV6_PKTINFO
@@ -240,7 +240,7 @@ check_cmsg_ipv6_pktinfo(struct cmsghdr *cmsgptr, struct sockaddr_in6 *to,
     return 0;
 }
 #else /* HAVE_IPV6_PKTINFO */
-#define check_cmsg_v6_pktinfo(c, t, l, a) 0
+#define check_cmsg_v6_pktinfo(c, t, a) 0
 #endif /* HAVE_IPV6_PKTINFO */
 
 static int
@@ -363,7 +363,7 @@ set_msg_from_ip_sendsrcaddr(struct msghdr *msg, struct cmsghdr *cmsgptr,
 }
 
 #else /* HAVE_IP_PKTINFO || IP_SENDSRCADDR */
-#define set_msg_from_ipv4(m, c, f, l, a) EINVAL
+#define set_msg_from_ipv4(m, c, f, a) EINVAL
 #endif /* HAVE_IP_PKTINFO || IP_SENDSRCADDR */
 
 #ifdef HAVE_IPV6_PKTINFO
@@ -398,7 +398,7 @@ set_msg_from_ipv6_pktinfo(struct msghdr *msg, struct cmsghdr *cmsgptr,
 }
 
 #else /* HAVE_IPV6_PKTINFO */
-#define set_msg_from_ipv6(m, c, f, l, a) EINVAL
+#define set_msg_from_ipv6(m, c, f, a) EINVAL
 #endif /* HAVE_IPV6_PKTINFO */
 
 static krb5_error_code