From nobody Mon Apr 22 19:09: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 4VNZYg3Yr5z5HhgB; Mon, 22 Apr 2024 19:09: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 4VNZYg1cTVz4dv4; Mon, 22 Apr 2024 19:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713812967; 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=+z5i5vXHKltlbnxyiFNktYbpVJIIHLgLCEtoaOQTGbc=; b=tsV8ddW2s3YMutMhWhVsr9d6P+ng6J13Xv03urB9mD8IOII/1D8olme5n6pxKu/bKuX96h N6VQl8TmHskQ3hy7nHUTBK0Imy7pFdFvvdmtqprjNc8hs8xSHA39w/CFjM8Px0vwChT8g9 Wy7gE9N8glKSS1YdMMucpu64uWPN4jxP+kXZm9Rf8nYr0JpwKmpDffqz6t3Yp69uwMAm0x CLQCtAGcB12r+ftIVjVG+2ohNWt+pj/nXxv8ZGeMtWsI14yWIEIdQ6yg3X4yLxZ7vrRdDO ZF6G1KwEne3NMz3PBgilJO8gqcmUQ16YSSswRjphkQyGAUYMyaZAT1vQNaXgcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713812967; a=rsa-sha256; cv=none; b=LJUlONZqclm738RyRPkL/21+kuhyFLpcyV2XUWk41jCA14oQkHWWQSpr8NoC06OrbsHaUc uGWxDUShQHE3S960ET3KB1FmVhdpgkJ9S9WctBXUcqYxS4Gg0p2Dvu/cNbsNmayduaDZ9z wY1u5HRDg9PB36g5pb8ZwQP8Fk9jHB8bVLKMLeFdWygj6gGnSBWUWV91QBnZNHuPUA2pFX +wti5JSv3nQZ1iJ3PW6DZHfy9mXI91h7AzF9jLPyUSoEC9n8oBzm8+rfQsfWICQDWx5tdk kdZz04WXpNm3PUFRAEJjyfHpXXsOyz/yXXM+Mx18ph2PXsVdBY5u7lP/3H2MXA== 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=1713812967; 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=+z5i5vXHKltlbnxyiFNktYbpVJIIHLgLCEtoaOQTGbc=; b=XAEMFtvnhq8fnFOs9dCZ274N7gOVv/sNaKX2SC4B5DJl9rNjarI5lTzbFH9vhdqrf3b8k3 iMsAG2nCF58zBy+HoEWU4LNNLIN11tUoQ92QuzEFm39AjkMAxQpu/JHSSU54BqImKOuXKG Sc0Rs9MRsV58bOl6rZeukYRZO5AiVhW7wODob/9cRkja0U5ixmXB2cgBqVuvmwluxjrBSh FI7l60JHWqG2gNmC6KQXptiaXuZOKHlip/sSVYAfy0jog7/Vsc0hCycvFpsaM70ZjLqiEV dvs3ss7BYRWIhzlEp0cHDaxmXosJlR/hAbpRl3ooUkFk15QEO9/s7ztAji97Sg== 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 4VNZYg1DXgz10nQ; Mon, 22 Apr 2024 19:09: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 43MJ9ROQ065849; Mon, 22 Apr 2024 19:09:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MJ9RY4065846; Mon, 22 Apr 2024 19:09:27 GMT (envelope-from git) Date: Mon, 22 Apr 2024 19:09:27 GMT Message-Id: <202404221909.43MJ9RY4065846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 5cafc38f1129 - main - adduser: 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cafc38f11297cb302514f3cedb703a3ed199a22 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=5cafc38f11297cb302514f3cedb703a3ed199a22 commit 5cafc38f11297cb302514f3cedb703a3ed199a22 Author: Joseph Mingrone AuthorDate: 2024-04-22 19:04:13 +0000 Commit: Joseph Mingrone CommitDate: 2024-04-22 19:06:38 +0000 adduser: Fix a syntax error Reported by: Jose Luis Duran Fixes: b37333899bd2 MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44871 --- usr.sbin/adduser/adduser.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index d1c9e12098f7..9739b2e589fa 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -477,8 +477,7 @@ 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" + if ! "$KLDSTATCMD" -q -m zfs || Zcreate="no"; then return fi if ! _prefix=$(${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null) ||