From nobody Mon Apr 29 10:30:09 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 4VSfjF47B9z5J2MJ; Mon, 29 Apr 2024 10:30:09 +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 4VSfjF3Z1Gz4ktD; Mon, 29 Apr 2024 10:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714386609; 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=AX8aUhsrQBCcrXDAUDZlKW6TAJkH+SquYqhc5BtbLDs=; b=fWkCG5rT3McwIVNB+cXNAlE8bun/xgZt6oR9lvpYXjjSeGSKnzQ+pze7yetbaKUaX5uks7 Z0IXqU3r5y3FbpJmP4PKD1l3wupUY57Xf8nbMSnLFFjaAhxitK3RnXOzBP+d9oejetd/DC kV2Dt+WjWPBTw1UB2jl8tg49BH9MBh1MBZEYqkS6JyKUReOrCCB/KhJpRO3IqMN+s+lqM1 p6SOsOZ93hQjpvF7W0QfXjz2S6D+1UM/SkBMXRvEZMYeNZMlk6g+GI/KHolyr8OGwcKaU6 ysL6x7Z04ntkhNaSKE+gzdWllH2ZTa59k+/ndPJIUOIFe7rxPtzQeHM0YoGM+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714386609; a=rsa-sha256; cv=none; b=XTWOKPmLFYwpJ7vvB7f1LQRk0OfcwwEF6PqEu4tqO/dSdWqZo6qAAQxnhTFUBBA7fsDUwm t4vjjudWl8H/5nDxJoi2Exb3IGzxR7YqZHq1Drx1bfHrW+qASjfcdC1lkdAWIZoxn3vpOB QVLuijXg/7qppUE5h6PMBFSbrx+8E2uPYV81WeUzLA+qFoCfHskxOHI0zdEX4mWfsOCWcf w2IuC9dVVAc+MK5s4nwdFw9xuWgEubygsfvKuXVSk5J5UL2wjaDOIA9rtkcLDis9uOmjGJ 4bS82T2d45XvbGtpeY02auub/H7HeFpnwROANnU1IT6uXyoAuoT5qFCAKzFueQ== 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=1714386609; 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=AX8aUhsrQBCcrXDAUDZlKW6TAJkH+SquYqhc5BtbLDs=; b=DXwUIQfcgDQYqEv2WWLHLt+CphO/F+b/FdGiSICjyE0qogozz3RKE1eBizO5P03pFLUfyk /FxFesesX1hYPA9I27ltcdBuONpbU8H3AVsQ6df4H526+3l+DvI2I1/sck53WxpAETbaC0 2GAoHghMlbjZgxSkg6b4LPB61jGxKXjrior1+MY6FVFdxWdtaRNjWPyIrsZp3pDnmTpYgx yE7WAF9IPY2niooySHnAujsG4fd8HGpblTiJL5MUisQMbxzqNj3SDBPmoIhbhoWLyjGVzX Y8D6D9jOyzDmQ64MYWiDAraljmkczg7kZii3uCNdwukqx85Pa3PbgmG/8nAGIQ== 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 4VSfjF32sdz14w9; Mon, 29 Apr 2024 10:30:09 +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 43TAU90l058240; Mon, 29 Apr 2024 10:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TAU9QQ058234; Mon, 29 Apr 2024 10:30:09 GMT (envelope-from git) Date: Mon, 29 Apr 2024 10:30:09 GMT Message-Id: <202404291030.43TAU9QQ058234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9e8618276fad - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9e8618276fada5c68cc64676fba2ae2abd0544f5 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8618276fada5c68cc64676fba2ae2abd0544f5 commit 9e8618276fada5c68cc64676fba2ae2abd0544f5 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-29 10:29:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-29 10:29:35 +0000 adduser: Really fix a syntax error Fixes: 5cafc38f1129 Differential Revision: https://reviews.freebsd.org/D44871 --- 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) ||