From nobody Fri Sep 04 17:54:43 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 4hc3yJ6bzyz6r2Td for ; Fri, 04 Sep 2026 17:54:48 +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 4hc3yJ4pmYz42x7 for ; Fri, 04 Sep 2026 17:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788544488; 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=xe7ghudY/qyFEJrlV3+8xGcssA0NLmg5IA++H8wnZz8=; b=yDy8XhioXBVSO+ntRDNs2JoI3UL6h8GD7LqbDxrogdjgG746hppLxUmgeAamGf/wEOIWgY cxg8g0lWSSqGM64rzgJUD7M+hYRItreXWjAA4hb7jt99rJH898BSN+kT2HSmRpkzX6o7l2 5T8pvDIECFYtKZ48w5mP34mW2pVo1ALSPLZxbyvuP3rL4eRBaC8ny6V7Y5SWrBMXxkzqTM Q3t37WEhGzClzJkjLVoQe3LwyYNmniWH1aUGOwPzPfQiOr8iV+Qd5P3GJQM71YxDW2+Yef ocDk+95qjQlz0qKISgKALU7SenPYfXob04xaZh3jRQ5DsplqXFLX/1JxkguNIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788544488; a=rsa-sha256; cv=none; b=p8qHhpd/6Ew3sPuMMic+N54nsndrVVIsH9pH4FNDUMlS55xMg3FOGsSlzTUN9ixpryODFC liO6mK0MGRsNFwcSdWiBpBrpfQHb+oRuNvYoAxDfYnypNtgFn2hEaXGRhM6J/woqhVQTBR GEPVcnuHhpRfXoGEHej8crdVL1iaRqgTgbhqf/rm23napH7YGKmE3AtLMdLfKM1ZCyz78S cZHyDIBWkYPNLGymejuPCVPYqCxebLI8ksdhqsgCJV1noLyLEj8BDEetfnbNGCUTt9bG85 gVlD6yjVXLnSlRaGmv65s8FSWNtBoSaHnWQcvg5FfYh9scpsn7FFvUox8J2V7A== 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=1788544488; 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=xe7ghudY/qyFEJrlV3+8xGcssA0NLmg5IA++H8wnZz8=; b=ukiyfBTw7SFjogcbZTJu7D0mvVIl/U8UMMwp7fuz6rQknSTn0Sbm0Y4Y3kJ+QaZ4g4EUW9 L3WFkK/Y3GTmNwDakSFsbeZGi6cOj6nI5Pi4iXDRA3gCLM5GVL3k+3PGGZ7+vYx+q00sKh KHpRToaor5CXESuKZuY+5dAwCA104e3oWrXn5+0PAh4ZJChSqTjtA5SeEBkCbCFmc1F9QN VF3CvHtOmnCl5J+JZpy80G9mc3qU9WIcuwcGoCeBqVzY/hSiqf17jBOhyFezB3pkFx7VSV iyqnKU7hoDV4Gver6JRRJTGHj33DFRIGoqQLawaFJUCLLnD70uqOpRkQ4Fqjuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hc3yJ3ZtQz196D for ; Fri, 04 Sep 2026 17:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dba1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 17:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 885b0483fe2e - main - pw: simplify group lookup in usermod 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 885b0483fe2e1afc45caaf1294b4b755d1c7abae Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 17:54:43 +0000 Message-Id: <6a9b05e3.1dba1.32d0482@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=885b0483fe2e1afc45caaf1294b4b755d1c7abae commit 885b0483fe2e1afc45caaf1294b4b755d1c7abae Author: Baptiste Daroussin AuthorDate: 2026-09-04 17:53:26 +0000 Commit: Baptiste Daroussin CommitDate: 2026-09-04 17:54:39 +0000 pw: simplify group lookup in usermod MFC After: 1 week --- usr.sbin/pw/pw_user.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index e8611b1323af..492c44731178 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -1701,9 +1701,7 @@ pw_user_mod(int argc, char **argv, char *arg1) } if (grname && pwd->pw_uid != 0) { - grp = GETGRNAM(grname); - if (grp == NULL) - grp = GETGRGID(pw_checkid(grname, GID_MAX)); + grp = group_from_name_or_id(grname); if (grp->gr_gid != pwd->pw_gid) { pwd->pw_gid = grp->gr_gid; edited = true;