From nobody Mon Apr 20 11:16:34 2026 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 4fzjc34kXWz6bYZg for ; Mon, 20 Apr 2026 11:16:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fzjc302BDz3cLs for ; Mon, 20 Apr 2026 11:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776683795; 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=utew2pT3Msv1twFvMSpL7Y/hO/1ONiMF40bTYZm5ZsI=; b=j/XZVxEau2YtH6dL45gz5FOKhx6XOAg6nd78YqU3/1+aczF9m1Osnqp67a2smFkE7DQajL bZ1BdVTCf8TN178Py3fjc3yUP8UiHdAQ5fgoxMD3gq0hKMUdl47pgOu/vY/TU5qkhBPUVV GDnJ/oJEMwWsDd35sBB1MJiBkjIph2u5mO1Uf0mTd6PvgddyCJmR6qRbCT/98EBmExWVfD 6+zUhSPRjDR9GTrmTIM6LIrPoKQOtPfEqTbPIr5UPSu1i0GFW1E9PksxmjBfPsuy3ONjHP Z+z9WJidFa7bkyoerhZqGkTAE9Yqe2ZXMPlkGTmYVuehun/kAhFuRvAAyNX9EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776683795; a=rsa-sha256; cv=none; b=BqLPjstFksGSI9j1WBqh2K8LxAIHqozZKnI3QSym988FiWeS4bRcyNgvcYxxaItqPvnkCz 2GOELppb21vjn/KGHKRWIm/O3DGSKcF4cJbPpbD0GJKMpnGgDrTsLqjrICaDVRHZvWEmR7 kI0NshSnNENcKhynjs38XG/J6rP2MK3dYmtwAX1APTv2FbRNmBINlv0ktwI8+lVJnzu2Xi zfmfOJsE/WzrQ9VZZbJnY5sJSRAJATS7Y2f5vI9l5/zHaGRPMTF5MC1ZkdNRf+735SWnON +76hO1WagoL03Qg1Ys5bRRJDTPPO+7TVrYjLeqHaTsSjUlqE3CN6bw7VIO/beQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776683795; 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=utew2pT3Msv1twFvMSpL7Y/hO/1ONiMF40bTYZm5ZsI=; b=n19pU8fhvGv38JcuOdwTT8jag+5wwzO3h42bxDN6Rlx1zSkvF7TMXStruONzjWA4nLZY1y fIPH1Y5SSdR6fWHbUINDjeqRwNPY5rV7OsZChvl0g3HJIaeueC9nNoMH5QRm8cGbokHCXN et3kuA/YIMiY7Cv+MYGeBhH7X6LL0ovdHGKvVtj3hhesPn2iyyo6b6Ce1vLu7uZLkuYgMk HS1jLr5MwH03T9a1po9wXdbmwdIPjCcjF8izNLrj9IC/5suerMVh1m3W+IvlFsWetR2qDz VKReHgJSm0Tv6kk+U95F1adtYp5WZRqxLBQmhfASGmOnyVeoKhHBToxlkthmeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fzjc25tfRzvy9 for ; Mon, 20 Apr 2026 11:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Apr 2026 11:16:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 395c8f0855e0 - main - nfs: make no-IP kernels compile 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 395c8f0855e0039205d9cb97adec39d9b9307c8b Auto-Submitted: auto-generated Date: Mon, 20 Apr 2026 11:16:34 +0000 Message-Id: <69e60b12.38b0a.2fbdb1ea@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=395c8f0855e0039205d9cb97adec39d9b9307c8b commit 395c8f0855e0039205d9cb97adec39d9b9307c8b Author: Bjoern A. Zeeb AuthorDate: 2026-04-18 13:27:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-20 11:15:48 +0000 nfs: make no-IP kernels compile Compiling a LINT-NOIP kernel (assumingly also a NOINET) port and ip are set but not used in nfsrv_getclientipaddr(). Hide the variables behind #ifdef checks and do likewise for the parsing results. Admittingly the code probably wants to be rewritten one day. Found with: gcc15 tinderbox build MFC after: 3 days Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D56502 --- sys/fs/nfsserver/nfs_nfsdstate.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 845949b8f630..ccee9187bfec 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -4100,14 +4100,18 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struct nfsclient *clp) #endif u_char *addr; int error = 0, cantparse = 0; +#ifdef INET union { in_addr_t ival; u_char cval[4]; } ip; +#endif +#if defined(INET6) || defined(INET) union { in_port_t sval; u_char cval[2]; } port; +#endif /* 8 is the maximum length of the port# string. */ addr = malloc(INET6_ADDRSTRLEN + 8, M_TEMP, M_WAITOK); @@ -4243,9 +4247,15 @@ nfsrv_getclientipaddr(struct nfsrv_descript *nd, struct nfsclient *clp) j = nfsrv_getipnumber(cp); if (j >= 0) { if (i < 4) +#ifdef INET ip.cval[3 - i] = j; +#else + ; +#endif +#if defined(INET6) || defined(INET) else port.cval[5 - i] = j; +#endif } else { cantparse = 1; break;