From nobody Thu Jun 5 02:53:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCTYK4N4yz5y3nQ; Thu, 05 Jun 2025 02:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCTYK1jL2z3PKK; Thu, 05 Jun 2025 02:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749092037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXIN2GPgv9wxcGmZAn8GXelE1ZjGg90Dh0V/kgic2ww=; b=EC2cMvjDmn24fqrD/76t44S3MUxIF/sp2TRQSKGGGFwHAlnLW3iq4ui9Uu9bSVxrjVGYoo VLIaN9gg0K2AJKYbPLS8yj0Y/i/u0vx5QGV8ma9xTST3yCxdZGIPMwrjgIraNiQkP3lLwE X5ZObXJKvvRJA1+BYrlFqp/dHhl3jf6fPlmOH88MN0g1hGiBlXxSHrsXt/oWz3EvI4q7xo yhTPNP9tvKTLuPx5PX2awsK8mPkXQIQx5MKRceCPzj0jMmGtZ2EN7Bc1lz2pZiewAuLUCp 3MN47aCCK7fJnqReWEXs6nZ87gEIbEGE3wWYcLIhfTbWcaQSC1PbuFJoEnT97g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749092037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXIN2GPgv9wxcGmZAn8GXelE1ZjGg90Dh0V/kgic2ww=; b=Ny0RMbM8Osz+/IeQlbeSEelf92vE/rwe8zeK28KdOwrbIrPBFfeh8db2HpgahiCYsnZ6yM 8mkEUb7i7O2pBpG1O5RyjXiWTXxoZxdWdOxQOmD6ru8i3XeILlpOSxEfipBBOvJdYFCGsY ndi6FJPeEzm/J6QZocX/1wX3PXfJC4tBgRBeer1pBJj7MmAhkFBZBdgFw0cmXAIMoOB+HJ zQ9Asi4Gng0Qk7UVsUlDMA/RXm+mUEgR85wltyg0afPssIv0KIPldb7IYWkS57f585Z9V/ f6xKt7Of7F4sznkSSG7XeZaCWSLIVwCmL4xvHhnulnnEqXHceCqhFPE0YQNrKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749092037; a=rsa-sha256; cv=none; b=t5Y7T8h0OlROf2ZVRFf7MBpm1j7O0W9dHyc6uPXoqDRDgVsbM4/3HRayLJ/G3nKglDO3oU SUDZewRYhVUc3xohX9Fn9n/EQIRZLMUfNi6MHWLtxwWubSOp9GMQZDobqhjQJqhQVefPSZ wQNhFX5NJJiYaTpiZ3GwKKCjBEtnChsxQHfgBNyD+NfqRYHQstBMeMr1m/emf0qB4AccR7 LNP770jZHKHgimGXH+CDpBt8560dqIipKT30MAheh6RG7GHEkViKOFUDCZDLGSRrRal/8v y/lmbR7VLdvy5GHhbK/UiPPvdLpmwiL+HqVQVk5t1bjvc79Uz41WiW9OhX9PgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCTYK11kzzs1m; Thu, 05 Jun 2025 02:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5552rv9U043566; Thu, 5 Jun 2025 02:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5552rvoH043563; Thu, 5 Jun 2025 02:53:57 GMT (envelope-from git) Date: Thu, 5 Jun 2025 02:53:57 GMT Message-Id: <202506050253.5552rvoH043563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 55f9c25f17a3 - main - krb5: Apply patches to build under FreeBSD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55f9c25f17a362fe1db1ae4df6450963e420089b Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=55f9c25f17a362fe1db1ae4df6450963e420089b commit 55f9c25f17a362fe1db1ae4df6450963e420089b Author: Cy Schubert AuthorDate: 2025-06-05 02:50:35 +0000 Commit: Cy Schubert CommitDate: 2025-06-05 02:53:04 +0000 krb5: Apply patches to build under FreeBSD These patches fix the MIT KRB5 on FreeBSD. Some are obtained from ports/security/krb5-121. Sponsored by: The FreeBSD Foundation --- crypto/krb5/src/lib/krb5/ccache/t_stdio.c | 4 ++++ crypto/krb5/src/lib/krb5/os/localaddr.c | 10 ++++++++++ crypto/krb5/src/util/ss/listen.c | 4 ++++ crypto/krb5/src/util/ss/ss_internal.h | 2 ++ 4 files changed, 20 insertions(+) diff --git a/crypto/krb5/src/lib/krb5/ccache/t_stdio.c b/crypto/krb5/src/lib/krb5/ccache/t_stdio.c index 15185e301cad..4d95878b2e02 100644 --- a/crypto/krb5/src/lib/krb5/ccache/t_stdio.c +++ b/crypto/krb5/src/lib/krb5/ccache/t_stdio.c @@ -27,6 +27,7 @@ #include "scc.h" krb5_data client1 = { + 0, #define DATA "client1-comp1" sizeof(DATA), DATA, @@ -34,6 +35,7 @@ krb5_data client1 = { }; krb5_data client2 = { + 0, #define DATA "client1-comp2" sizeof(DATA), DATA, @@ -41,6 +43,7 @@ krb5_data client2 = { }; krb5_data server1 = { + 0, #define DATA "server1-comp1" sizeof(DATA), DATA, @@ -48,6 +51,7 @@ krb5_data server1 = { }; krb5_data server2 = { + 0, #define DATA "server1-comp2" sizeof(DATA), DATA, diff --git a/crypto/krb5/src/lib/krb5/os/localaddr.c b/crypto/krb5/src/lib/krb5/os/localaddr.c index 92d765f4bcac..efaee7cbdca6 100644 --- a/crypto/krb5/src/lib/krb5/os/localaddr.c +++ b/crypto/krb5/src/lib/krb5/os/localaddr.c @@ -176,6 +176,7 @@ printaddr(struct sockaddr *sa) } #endif +#if 0 static int is_loopback_address(struct sockaddr *sa) { @@ -192,6 +193,7 @@ is_loopback_address(struct sockaddr *sa) return 0; } } +#endif #ifdef HAVE_IFADDRS_H #include @@ -449,12 +451,14 @@ foreach_localaddr (/*@null@*/ void *data, ifp->ifa_flags &= ~IFF_UP; continue; } +#if 0 if (is_loopback_address(ifp->ifa_addr)) { /* Pretend it's not up, so the second pass will skip it. */ ifp->ifa_flags &= ~IFF_UP; continue; } +#endif /* If this address is a duplicate, punt. */ match = 0; for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) { @@ -583,11 +587,13 @@ foreach_localaddr (/*@null@*/ void *data, } /*@=moduncon@*/ +#if 0 /* None of the current callers want loopback addresses. */ if (is_loopback_address((struct sockaddr *)&lifr->lifr_addr)) { Tprintf ((" loopback\n")); goto skip; } +#endif /* Ignore interfaces that are down. */ if ((lifreq.lifr_flags & IFF_UP) == 0) { Tprintf ((" down\n")); @@ -754,11 +760,13 @@ foreach_localaddr (/*@null@*/ void *data, } /*@=moduncon@*/ +#if 0 /* None of the current callers want loopback addresses. */ if (is_loopback_address(&lifr->iflr_addr)) { Tprintf ((" loopback\n")); goto skip; } +#endif /* Ignore interfaces that are down. */ if ((lifreq.iflr_flags & IFF_UP) == 0) { Tprintf ((" down\n")); @@ -972,11 +980,13 @@ foreach_localaddr (/*@null@*/ void *data, } /*@=moduncon@*/ +#if 0 /* None of the current callers want loopback addresses. */ if (is_loopback_address(&ifreq.ifr_addr)) { Tprintf ((" loopback\n")); goto skip; } +#endif /* Ignore interfaces that are down. */ if ((ifreq.ifr_flags & IFF_UP) == 0) { Tprintf ((" down\n")); diff --git a/crypto/krb5/src/util/ss/listen.c b/crypto/krb5/src/util/ss/listen.c index fe18475447be..08427df1e5c7 100644 --- a/crypto/krb5/src/util/ss/listen.c +++ b/crypto/krb5/src/util/ss/listen.c @@ -14,6 +14,9 @@ #include #include +#ifdef __FreeBSD__ +#include +#else #if defined(HAVE_LIBEDIT) #include #elif defined(HAVE_READLINE) @@ -22,6 +25,7 @@ #else #define NO_READLINE #endif +#endif static ss_data *current_info; static jmp_buf listen_jmpb; diff --git a/crypto/krb5/src/util/ss/ss_internal.h b/crypto/krb5/src/util/ss/ss_internal.h index 1f5ddfff91b5..d37d86014eb3 100644 --- a/crypto/krb5/src/util/ss/ss_internal.h +++ b/crypto/krb5/src/util/ss/ss_internal.h @@ -85,7 +85,9 @@ typedef struct _ss_data { /* init values */ #define ss_current_request(sci_idx,code_ptr) \ (*code_ptr=0,ss_info(sci_idx)->current_request) void ss_unknown_function(); +#ifndef __FreeBSD__ void ss_delete_info_dir(); +#endif char **ss_parse (int, char *, int *); ss_abbrev_info *ss_abbrev_initialize (char *, int *); void ss_page_stdin (void);