From nobody Sun Jun 28 18:40:34 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 4gpJBW24Rfz6jkWc for ; Sun, 28 Jun 2026 18:40: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBV6c6vz3Y9f for ; Sun, 28 Jun 2026 18:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672034; 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=Qwuuba8nRKgM2XLHyIpo4WgXj1WXK7CAtXg3TFFra4s=; b=I49de1cgALbfpPMZ3vU1B6UNhns1ChIEigsnNFzsRAT22Y3CED3bYJD6S1/XVDFVQ/mRJT w5bOybmPjQxS9zq4OdnbM+qbfKDXhF6YLxA+V7gc+NLkmM6LqLyVnlu76ISDpcI5yHwrgD +6ykSQTdZVirHvFQKf49E+umNzGwQj8I0mrF9CJvklQthUYz/ndnAJVk1V95JJyaE8Ztuw sBcYkd5+q6gtcigOGVgE+ebYSojY6/q8CULhRF19JzKs+gqVH+J2SSEMjr7D45cFGgq6NJ 9Ru3pmGQtix957svygJc89JCk1ryQkreJJaIFgpyJ454vF1iIWcpLdzcNR4Wfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672034; a=rsa-sha256; cv=none; b=sywukdhJk/3WOv4NutAdK/jXAX5p4zgdkJvl7kxtRkvyBsL1i/LSwbQyvWoB8jcLl3zwua zjNwQ+E2FCoG5IjJE49VgiYvTo4HR/4PqByEPVkfOAmS/DcgcrscptIXWoLcg/3Q6W/zee aF9+BeT+GottANq0Wh8VRofcPFKTufg7QI5gW1do+aSDcDMsSrUSxjNtEUqQyDdzJXwOh5 HTr8YUJsk1h+FL0w6oP/xHQxwgm/LZAo3SOU61+vnM7QP11m4cEsgI97xqehW+ivQBphfH pYRdwxh2JAe/NEgKhsV4qyLdm4/ASXFD0tUUxZ66MwCLYFrAlBefWeDXLnA23Q== 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=1782672034; 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=Qwuuba8nRKgM2XLHyIpo4WgXj1WXK7CAtXg3TFFra4s=; b=sQE26ngXE7Ww3L+d3VMET45qoknl3E0bLc3Z1BFFaSuVXiQ35i0WfY8nuf0LnPHgLTjqa4 eH+vB3yQLExAEJV3V9qcz/kaKEGLKcHwFda0lq3oXJC9mI9PMagAtfjN9K5XjG6+eLrE1C PcRtYZPQE44zSsGdaCzByHSj4ASFxlqkH8nyX4Eyu2ockNPt7hJD+3LKFspv99lfsA49gh vvwQs+Et69bWlip/OORrOaJPtJl3lAhOmbUSrej+ey90xcHCBJ+7bMKJ7werJs8if7I8Sq yu+CDCEcqUT/BT49FFc0Zc8TNmSad4LZR8MN38mEMgpvORtcrClghPfUVw3zNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBV5X2sz6Ys for ; Sun, 28 Jun 2026 18:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cd82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2dd4c50deeaf - stable/15 - pw: fix inverted condition in shell_path error handling 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 2dd4c50deeaf9007c181ccaf063bac298c8ae78d Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:34 +0000 Message-Id: <6a416aa2.1cd82.4121dab@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2dd4c50deeaf9007c181ccaf063bac298c8ae78d commit 2dd4c50deeaf9007c181ccaf063bac298c8ae78d Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:12:35 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:32:26 +0000 pw: fix inverted condition in shell_path error handling (cherry picked from commit 4fd8a69ec6623da5ef33818be134efffebe37f75) --- usr.sbin/pw/pw_user.c | 2 +- usr.sbin/pw/tests/pw_useradd_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index 413eac4882cc..dcf870ca1edc 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -464,7 +464,7 @@ shell_path(char const * path, char *shells[], char *sh) return shellpath; } } - if (sh == NULL) + if (sh != NULL) errx(EX_OSFILE, "can't find shell `%s' in shell paths", sh); errx(EX_CONFIG, "no default shell available or defined"); return NULL; diff --git a/usr.sbin/pw/tests/pw_useradd_test.sh b/usr.sbin/pw/tests/pw_useradd_test.sh index 75e96a64ba8e..4b0778759203 100755 --- a/usr.sbin/pw/tests/pw_useradd_test.sh +++ b/usr.sbin/pw/tests/pw_useradd_test.sh @@ -402,7 +402,7 @@ user_add_bad_shell_body() { populate_etc_skel atf_check -s exit:0 ${PW} useradd foo -s sh - atf_check -s exit:78 -e ignore ${PW} useradd bar -s badshell + atf_check -s exit:72 -e inline:"pw: can't find shell \`badshell' in shell paths\n" ${PW} useradd bar -s badshell } atf_test_case user_add_already_exists