From nobody Fri Jun 5 06:02:36 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 4gWrSX6cVKz6gSrK for ; Fri, 05 Jun 2026 06:02:36 +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 4gWrSX3mpdz3HZZ for ; Fri, 05 Jun 2026 06:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780639356; 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=mc2vja7qP6qPrPRPIIdzqoqUFS0dyJTLHG7fL3X1xcY=; b=nFgUv6arqfoh4JyriUZBtOd59zZ4tP5AURQFxNyqMSkPBJHM1jPXOqRZzHGpusMGrwBob1 m7VB7IwX+7DKXmWUVCytdZZOcyoyNp6wpYXNXeGdCpvVFMtsPeT59+zOZBRsyrceVwmXWZ ROXIzRhNqhQaL0dZGEtawUBvdlFEL4SmaDNJHOsq4Gscb1HXhZHuZZBBmFxQHW6G9w+eGA 6HqtPWhcyHeQCLj4McHRN7lkV8AQPwxs5ijOIQFFieJPuA/TRSC2J+aYbZIRrH/54oIuXx 6pqjV1ls7zy0DzsbNkVm44HlqLQXcq+elNwKYoO9QFtupPudpaC7gbWeABFa0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780639356; a=rsa-sha256; cv=none; b=r3codUF1IMeG1EVjXpGHT0iALCjWLR+R4xwbEV5CE5npl56Z8rJ7/I9huNGmmZc0fsQFzk THsDa69H8Y+F+sF2pyqIbzoJ8It02YrF79ZC53dhCOFw30ePlDaET9VAuMuP/p4NaQwaT2 Bj8BHPYOw4qBPJ7D4dseSXMuGXpQShyKBSuky7XQRN77OYb96zeCwVQ7GnvriG2DTr4MS6 a269t6GEjSGmxI3RSCK2WpRT8eFcXGPR384oQrKEZgJLuWdLL8v7/cphfduy43aOToMTMx r+s7e1CndNDEauN8dtauj07VGqD6AavYCQC3NlwInYFnOEPMFwdTbF3QVTfXSw== 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=1780639356; 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=mc2vja7qP6qPrPRPIIdzqoqUFS0dyJTLHG7fL3X1xcY=; b=jM8jDD3cAk5cCPUXUBKm/pFa/LxCadqazVCJd4/jmKr2vOp1zqxfNy5fpysUMaxYUIM2Sy /3JUZS6Ngg1dAYWW40/jIXb9+RfHs3K6Cu6njB0QO4AwvFxVGqOdxZu7rNW/Bv7YmHXYCw HSQWGoNDz3sAM61rL1nuQdsRA0ybBrn1fKEk4m5lNkNAIo56qr4BPdxDjFBObFX7oMGa0q pGhZOP8OJ1UXtmsD6flt5UA1gOQvmIpqg1rkVf8d7G6Q68Gvhv1iWP5T+j6J5R9ARC0O8X kB+/rdVOj6fxWKwIepGHXGXjpJStgb2g4c6gxCHgZS5Ffbl+gMO03Ze8EGrT/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWrSX3N1Pz1fH for ; Fri, 05 Jun 2026 06:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a86 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 06:02:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4fd8a69ec662 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4fd8a69ec6623da5ef33818be134efffebe37f75 Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 06:02:36 +0000 Message-Id: <6a22667c.26a86.5df1e333@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4fd8a69ec6623da5ef33818be134efffebe37f75 commit 4fd8a69ec6623da5ef33818be134efffebe37f75 Author: Baptiste Daroussin AuthorDate: 2026-06-04 22:12:35 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-05 06:01:35 +0000 pw: fix inverted condition in shell_path error handling --- 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