From nobody Mon Apr 29 10:30:27 2024 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 4VSfjb3SjXz5J2D6; Mon, 29 Apr 2024 10:30:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSfjb2n8Lz4lPH; Mon, 29 Apr 2024 10:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714386627; 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=SvjnmbQ1raGzFHhMWK5iETmQhDOuzygcAmuSYuiZSnQ=; b=eNwRBhvmQEXxqjzgpDmmXB0RO0Be8Kq0PVaAU14hdWZNxkR1fU/Go7hmGWrCoB3ETQ9CEs eRdis1HywrmoDI0txe7QXpiSnOS0TtKkUgaKT/lnFaGTwtdk1WFbLmghWQI2vKytAldwMo FNFlLAhjjOppC6uU0mazC86pcJLYL5GRfh7candWM73A1HaQkRfxbINiJ2vsuGh6S9eyRB ZieIDGOQlcG0csqH5jc3mjwUHfsFW8LICuGL5I6z73SbGNsNvwuyHFOpxVqCzgFUTeoKQR WWyEfUzT8Mk2LegDrHKWWwqAAk8ATpyo4DjkHOMhRstZOFg51WtRmk4T3ssP3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714386627; a=rsa-sha256; cv=none; b=IDSNwHtl3GxkIlSXT2aU1xFd7zHthOgFLmumm0tfe+EG+Bpt0vdl+TfPslI+cFP6mU2/R4 vMLAEy/ggjKVa0oaHpfrru2pd1BchLc7QcL6U37lUwqcaoE3r2KBWEwXmnE/H7FuzDreNX JlfLhuXq2btlQ6kZ2DOwAEKNPMw82GEOaKFqq+Lk0XFlu6oXLSlPAB4yr7B8erUvV5v7Xa bQGn/4FKTYNfkN+UiYx0uJeSSODkYa896uJcg9QSkx18zcUSCzh96K2HCjwa2Zt9FQvl4i dJdWS0/UcZso/QHSqNqwVCmpiSd8Y6nWKJ0exqyloX9PP+eUH57Jm7XAFFqomg== 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=1714386627; 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=SvjnmbQ1raGzFHhMWK5iETmQhDOuzygcAmuSYuiZSnQ=; b=KTy6kNMXn0sKe+6cx+vUVjoElMmTJWhZr7vwnFi9sCYonSI/0xZAnOhdAN6+5jDlGOeYai DqOkWflxxmTaJgdzLyAXVPIVtcFa+lq10Yfo0Kl2vAiOOCTy6CGgnuvgJqU8c27Yt9bdxg 0OczZXYhRw48lPaa16rF101YBm7M6Uqqq+EuekTix98j165LTKgqk0MtMV7ffgvt7XfhUK xZDgrV9ReWlmmpOCz7ztC07X+OsrQviOj34tzNJApedqmRDLEb5F7xmg8Q5BRd3SCFOCas ByEQ/LWWvw+W608X+I+pJKKOE4ozPsZ60/Nf1/2BnYz9iWPCWXOARq1Naw3U0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSfjb2Nnmz14k2; Mon, 29 Apr 2024 10:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43TAURYs063427; Mon, 29 Apr 2024 10:30:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TAURfG063424; Mon, 29 Apr 2024 10:30:27 GMT (envelope-from git) Date: Mon, 29 Apr 2024 10:30:27 GMT Message-Id: <202404291030.43TAURfG063424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: edff88aee215 - stable/14 - adduser: Really fix a syntax error 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: edff88aee2150ad4e1e855f07f1eddbba7f193cd Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=edff88aee2150ad4e1e855f07f1eddbba7f193cd commit edff88aee2150ad4e1e855f07f1eddbba7f193cd Author: Dag-Erling Smørgrav AuthorDate: 2024-04-29 10:29:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-29 10:30:20 +0000 adduser: Really fix a syntax error Fixes: 5cafc38f1129 Differential Revision: https://reviews.freebsd.org/D44871 (cherry picked from commit 9e8618276fada5c68cc64676fba2ae2abd0544f5) --- usr.sbin/adduser/adduser.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 9739b2e589fa..e9027b6b7876 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -477,7 +477,8 @@ get_zfs_home() { # check if zfs kernel module is loaded before attempting to run zfs to # prevent loading the kernel module on systems that don't use ZFS - if ! "$KLDSTATCMD" -q -m zfs || Zcreate="no"; then + if ! "$KLDSTATCMD" -q -m zfs; then + Zcreate="no" return fi if ! _prefix=$(${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null) ||