From nobody Mon Sep 21 01:50:17 2026 X-Original-To: dev-commits-src-all@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 4hp5lg1CdNz6t2vc for ; Mon, 21 Sep 2026 01:50:23 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hp5lg0VLCz3MFq for ; Mon, 21 Sep 2026 01:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789955423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLIpALIgoSZvT8wsJmrCrpVjZvVstUq+d+eD4yd3wrI=; b=munOo5o9JyYqM4SMET0G5U//dfPY+dRhOaylHTYK6mt0DSDrtiW/Noh8EaD77ay4r7kcHj iy+rwIFDBEkm9/dhx3beVeLkhnPWjCQMh8FQWfiZVklVzOJOOudsrG4LaUmatbdx1GXAAr T7J6ylIP0tASMZDvOKhXaKAJQbnyOZmmcwo+dTRCMzTgvfBVDP33E4y3EEunvIXnrN8Sqs 71b8dLTm28S7qH4iBl9rkbOh+PvQyHtti3wEYZU0KyLMI9CTC5XKn6H6SFB3CCLz073fsC SBvCVBiDDXVgTM3xjHud6/MGy9/z0O/eOyTNgbGsgwnrtt7Za5mV9QuZa4tVcw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789955423; b=lAeElMhHicZHVY3XtrT2JExw1UzIlahKH01rjiUv1A/58xmLW4ceb4tW/0NlgZPh8bu9dz 3L2bC3S6fLvgnL/4t7JviC8OV1eAkVaJ33ppPcYlU8fBT42vvRQ4ASoVdmsrM1WiXZxJ8I l3oxPWX3GniMCQxA1M5wA7gcHTRKxDtEHNmDPhzRbXwVJ8OJHRsWbX3vVRQbo6cbBNCvD/ k4ehThq6NIpaJsHPdBFwis+CFbeDVnlbMdSJ6sRQhzgZaTyYDnfyMcw9yqDu8zbPyk8f7S VHSGeAB2tW5IjeJYXIyQJOKiUSrqF/00j9P+j+LFCLgxbJC0ya6H1EaYBDeiNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789955423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLIpALIgoSZvT8wsJmrCrpVjZvVstUq+d+eD4yd3wrI=; b=ROB9H/lxe2Ykbm4mGtTlLaA2QqVbI1fS2f1GEb5mwAI0MB93YVU/G47uLoN/m8Z3SGyYUB cMbTYVSXDaiq3oF7XhsGmf4YE/OFSeWtVdOn+X3uBhgz/GuN1L0hYDrOWOYXo6kNq+7oH6 NjXTJRjGlDf9y162LvbAlrF4B2NsZyDdmwUVIaKm8ivbVCKRwGgB38UjPglK0X/EIQ6uqx BMtDQs+H+LQIOdzD2qM9j7w3uHB4N0LpkdnH0Jv59ZrX1NR7MPJ4ZapdiU3uGcjT/4PtH9 7F+4evnBpZN9F1qS8C4a/I/cqP2ZlG8h6DnD/mSJsuB7/uYidaL6ncwlXr/BMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hp5lf6NLtz1090 for ; Mon, 21 Sep 2026 01:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 197a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 01:50:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Emanuel Helms From: Rick Macklem Subject: git: 2d20de9ffe4d - stable/14 - nfsuserd.c: Fix handling where pw_name/gr_name differ from lookup name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2d20de9ffe4d59c523592b2558a998043b4b9ccb Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 01:50:17 +0000 Message-Id: <6ab08d59.197a4.ae973b6@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2d20de9ffe4d59c523592b2558a998043b4b9ccb commit 2d20de9ffe4d59c523592b2558a998043b4b9ccb Author: Emanuel Helms AuthorDate: 2026-09-07 19:50:58 +0000 Commit: Rick Macklem CommitDate: 2026-09-21 01:48:27 +0000 nfsuserd.c: Fix handling where pw_name/gr_name differ from lookup name When an NSS backend returns a canonical pw_name or gr_name that differs from the lookup name supplied by the NFSv4 upcall, nfsuserd stores the successful mapping in the kernel cache under the canonical name instead of the requested name. This causes the retry lookup performed by nfsv4_strtouid() or nfsv4_strtogid() to miss the newly inserted cache entry, resulting in the default UID/GID being returned although the NSS lookup itself succeeded. PR: 296753 (cherry picked from commit 1771ab245c2341033f0cee3bd098c76888cf3515) --- usr.sbin/nfsuserd/nfsuserd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/nfsuserd/nfsuserd.c b/usr.sbin/nfsuserd/nfsuserd.c index e5fd6fb18c81..e4c3480f8e7e 100644 --- a/usr.sbin/nfsuserd/nfsuserd.c +++ b/usr.sbin/nfsuserd/nfsuserd.c @@ -704,7 +704,8 @@ nfsuserdsrv(struct svc_req *rqstp, SVCXPRT *transp) if (pwd != NULL) { nid.nid_usertimeout = defusertimeout; nid.nid_uid = pwd->pw_uid; - nid.nid_name = pwd->pw_name; + /* NSS may canonicalize the name used for the lookup. */ + nid.nid_name = info.name; } else { nid.nid_usertimeout = 5; nid.nid_uid = defaultuid; @@ -737,7 +738,8 @@ nfsuserdsrv(struct svc_req *rqstp, SVCXPRT *transp) if (grp != NULL) { nid.nid_usertimeout = defusertimeout; nid.nid_gid = grp->gr_gid; - nid.nid_name = grp->gr_name; + /* NSS may canonicalize the name used for the lookup. */ + nid.nid_name = info.name; } else { nid.nid_usertimeout = 5; nid.nid_gid = defaultgid;