From nobody Tue Jun 23 13:18:11 2026 X-Original-To: dev-commits-src-main@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 4gl5Gq41p8z6hMtV for ; Tue, 23 Jun 2026 13:18:11 +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 4gl5Gq33P6z3m43 for ; Tue, 23 Jun 2026 13:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782220691; 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=onyy0W+R6jlR+9iLvgWzfBbItB1k9TyDuBT77wFGh3s9JZxdn3Gi7CR9Sf2rV3XlP/mBBN iMHxNv8UnEjdKPRXpXs4KFZXvmMLtKsQyVHwJkiLMusOm+Djf91LAIDNJvLMJnAHjZ7vgK +JyCkighG97/MRnnZBUv7ASPs+rFjONefRUZt7WqgqYiz1sTfLTcgkEyFDKEv0LSS5VvbP MwKzcYsK0v0eOx5+MkDOeHZhCINlCutiReHXF8TiAP6cCkYl2X5Pu3dCHNyb8Ctv6MxEGj QpCzzpY5G5Nu6IkRUYogdnOCPx2pzO+RBu3l3IJ7bM1sGJT3VINB7Tp6BViSgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782220691; a=rsa-sha256; cv=none; b=hPCoWqsvTpbyL/nVuh+339981D1PuAgHqDt4JPnwLrDdH/6KqkA/ZJMOJFFtQuM1dNkho+ WUKr6gwQXh3P5bIf1usAbOXqt5ZB6bYZ22W2wgtC+8cb3N4w3Wbznhek2yvsqVSx23IhPF ZPpV9u18zuuY0uPRv0FyiP89FF11MzQiBzEs+hYpkZOk9e8RNQvaAlPcsE57fYLt0rjSvD uhsb3P4ybc8BpEv/CBoews27L5OMoCzu/trMnUA3+R8Od2UBBB8t1IyN5jo1A6GXeh2zYm JUTGbGft8dg/YVbAjLUQNWyTIXS/TML+rS7qBNvp2jnUNFJHW+wNygwAyVjOFQ== 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=1782220691; 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=HMJYcSj4SKqzq+Z737ST55pcAQWKPeFOS2YDgnOLPgKiKXMsA3+mgjTDlB8r3pIo1K+6c0 jKWmUZdQLha1TFTDVOKZfc1hr2M4i4hMAQtFEbaG1/1tetsKvNDMUd3nKiuUI8Z03WRFN3 4RZ5Vawr5k+Qe2GaFZclTpfwisFzEWeEa68XtQi7KJDcPU2WWyaZofOiAgC3ymBYRNeZlJ B1KiijnNOkAKTXABcF1/AthOZhbVi3b52l+3N0Gj+pCqtmrMgmsBxu0aqRpqVYumCENJVC lObJ8v/k8MzZEw705rUzY1S8IQ2wpwX27GfiCGfdLYFZdpgE4+VKm6K7HCQdPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl5Gq1qdFzc6h for ; Tue, 23 Jun 2026 13:18:11 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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 #