From nobody Tue Jun 23 13:18:11 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 4gl5Gw3tt3z6hMlL for ; Tue, 23 Jun 2026 13:18:16 +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 4gl5Gw387kz3mFF for ; Tue, 23 Jun 2026 13:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782220696; 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=cvku93FBWx26vHd1tIW/lIzIKytJuqStSuECL5dXMvU=; b=XOU74ru5+jQGg+k+Ba3WqUMgcOXArobpsyfv6157LFqKmSwKoFT6mSOK//eV9fmI980wmC iuuth6fWHvNubBSL14sE5umIQcE5TWupwWCmgPjeiB6Rd1HjJ5GtQzYKYrFz4eQ2ws0dGR NCKZOTpanxLAWcB/qMrp+bnhY+5pqr1iEyLtVqiRuml4UqsQw1P6fPKJ1qVBW0HbSMe4+P lrQ3AkN9DjW+BkjtewqLYcsDXmBLyZDAVJsKkL9JoI/8fj5c6k5CuEYOXSxYzPOhpa9Y6z s3NkXnw/yH6579aSMedVPJ/Bf9Xw5Fb+ezRlPlfDWAB1FcQFE+hUYcVdcYS25Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782220696; a=rsa-sha256; cv=none; b=Q9JyeGZcFvTRnsGzcupUI3BaNgcJ+5AbpqByflLDd7sb7KwdpveM6Trt7b+FpfqsZPgLLj McH29nAqEdjOmlMWp3Dg0MNiCe/XZTNHehW6jeF7+k5jfFhRKbEnvyXbd79A3fQeUJqEdh JoISHq1kFq+LgWO1ebhV99CJ4otLyoEqOyh1vOFgHfS6r8OJ5adW6e6r44tck9EuMnYmyF 8HcjyL8LcDbNi2g1QuQJnlKPLAf/Y3n3pbOgmoVNYPdoVJ09Gl/hITAFnAzEZfYsJaGeGL /2BZG0F1mYiC0aVNmFmM99ZTfbY4mIsvwIUxLrJj1qmxUEWfUQOyFmnTGyYOtQ== 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=1782220696; 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=cvku93FBWx26vHd1tIW/lIzIKytJuqStSuECL5dXMvU=; b=ASwwBXZNmf0XyTezRcyFiau+4ZnkdyoETR6eEOQsIZK/x02X6mQnakW1qb0rpyxEC1YJgn CkzyKFmZPtwoeALxrr72WUnXqkU9nprbemy0pMgnkNC8BBiOP/Q0iXiG6n/9V/P02yG3wP KJJgLxNqTfie5qXD7ocu9JMAji6YaA6fFHJ6x/yOrhDklLRT2aherWybD+Z4WwzWTioI9T diYI28EMa2N+hiZk9j+bi8TYdjIcOtU2EYl3+l6YW3HB4DlXC0mXh8bAUvDHzzE770oZDk +UiXKBP7SnDPt1LFggRbnFWl9KqSJcNEa8REqraJMoBHTCy1BLE1vmUCRu+ZUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl5Gw1cyvzb6v for ; Tue, 23 Jun 2026 13:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a6b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 13:18:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Benedict Reuschling Subject: git: 15a1ba4a1c46 - main - adduser.sh: Add info which separator to use in the question itself 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: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15a1ba4a1c467a686573158fd5e49abafa42d587 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 13:18:11 +0000 Message-Id: <6a3a8793.3a6b0.3f275318@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=15a1ba4a1c467a686573158fd5e49abafa42d587 commit 15a1ba4a1c467a686573158fd5e49abafa42d587 Author: Benedict Reuschling AuthorDate: 2026-06-23 13:13:44 +0000 Commit: Benedict Reuschling CommitDate: 2026-06-23 13:13:44 +0000 adduser.sh: Add info which separator to use in the question itself During the non-root user setup (adduser.sh), people are often confused what the separator is when they are asked which groups to join the new user into. For example, wheel and operator: users often assume that the two groups are separated by a comma (and maybe even a space after it), but the script will check for that and refuses such entries. Help the users by mentioning that the groups need to be space separated in the question itself. That way, it does not take up extra space and avoids confusion about what the separator is. Reviewed by: jrm Event: Halifax Hackathon 202626 Differential Revision: https://reviews.freebsd.org/D57768 --- usr.sbin/adduser/adduser.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index ecac7478befd..94a59830c21e 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -574,7 +574,7 @@ get_groups() { if [ -z "$configflag" ]; then [ -z "$fflag" ] && echo -n "Login group is $_group. Invite $username" - [ -z "$fflag" ] && echo -n " into other groups? [$ugroups]: " + [ -z "$fflag" ] && echo -n " into other (space separated) groups? [$ugroups]: " else [ -z "$fflag" ] && echo -n "Enter additional groups [$ugroups]: " fi @@ -1018,7 +1018,7 @@ for _i in $* ; do done if [ -n "$readconfig" ] && [ -r "${ADDUSERCONF}" ]; then . "${ADDUSERCONF}" -fi +fi # Process command-line options #