From nobody Mon Apr 29 10:34:24 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 4VSfp84sZPz5J2DT; Mon, 29 Apr 2024 10:34:24 +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 4VSfp84GR0z4lsX; Mon, 29 Apr 2024 10:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714386864; 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=bs45+3EBdVQvN4+gvateN5bnsmT6hw7xVUVOP9v+4ps=; b=v8UxvrIGu2svUzKa9VzaDNbfokWAMbrrWzhNKGmTfUjA5tb2XsEd4VtVoXCST4C2JFIdIk zSPRAemIKTzDKEhqtNa7tNDtIZqxZ4VEqRAKc2vCRO/eGWV8ki6sBiQvfrrBvafq400XQY aUf78I3PhSuZmarRP3tYR4oWyFW6/MhFWW9OvbGRWHyxC1hEZj/s+9O3X/m40IID5QbQq/ 4QohVDhEoamdaqt4/+GwOMIBtJs3qf83NQOnUNTAgi1T4J9B7lbwcURkWXxl8a86JCy4Aa h7qgAudxthaXQBFyd5ssx424fSAEWj7TI6bweDQeWj2lxsoJRhugp4CN6TrKHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714386864; a=rsa-sha256; cv=none; b=G/pl1G6HdmcSth5d3Rb6j5FYbu1e3IkBnA534ntBvhyYVg0t3gZu4QXSNXMHDtGoyGmCui I48wFtPfHExUIMt+r6TmnRZf/2UmpskeMBwb30UbeuYVjd6EhRADFrS11g05HBK1addoZk efaJ/+QVAxxWFfWk1qMhZ1Mqzc03Afk4QvzRKZ5+9k08InbF22e2OpD+hYW603swb6dGfi CrG1JAiNkprBQMlqSyvzVSi3r39aYuUHdtlW5O6E9JSXwJlDBCAbsNX3m7ScnLdTs7JHtA kL2ceHRlTFdre7XUUvakx/xdV0KYSpaps1Em8YT3D6eBg1EJZDCcIvNzVpQaVA== 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=1714386864; 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=bs45+3EBdVQvN4+gvateN5bnsmT6hw7xVUVOP9v+4ps=; b=d2yjkpgG3I1rMGXqGkZa82ZNVolZi9KkokYrzm6qXVokI608EaNWBF0uDs3nyfXEK2urKl DSpennJG5ARZpLLFe9Ge6vRBRlBqfdnNmHKugYcCEs7gQyJs89jk0/4pMrBk7pUUI2b18b uxuXJmNFX446yELatUupsshwSWhbjfMdKosOYVSPh9LEJ4ixrKiFiAaYDbhjVSlwh+g0fI Sr4sRlULxBYep9JMZSAzC5mdFLUSVqLqk8ZGtWKQvb+QbrjbAdDmcXyXnfs7AUU3p7WKQ2 M1XbaH8p6pi4a2E6AMTuDMQH/pAxW9YWxgxo12WPDms77RZzjCRIqA57pD/kcg== 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 4VSfp83sTFz14F4; Mon, 29 Apr 2024 10:34:24 +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 43TAYOr7071347; Mon, 29 Apr 2024 10:34:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TAYOWd071344; Mon, 29 Apr 2024 10:34:24 GMT (envelope-from git) Date: Mon, 29 Apr 2024 10:34:24 GMT Message-Id: <202404291034.43TAYOWd071344@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: 1da8405cdec4 - stable/13 - add defaults for adduser.sh (OK? [yes] & additional user [no]) 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/13 X-Git-Reftype: branch X-Git-Commit: 1da8405cdec442bc75c5443a727905f0f2c5800d Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1da8405cdec442bc75c5443a727905f0f2c5800d commit 1da8405cdec442bc75c5443a727905f0f2c5800d Author: Sven Ruediger AuthorDate: 2023-07-18 17:37:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-29 10:16:06 +0000 add defaults for adduser.sh (OK? [yes] & additional user [no]) Event: Kitchener-Waterloo Hackathon 202305 Differential Revision: https://reviews.freebsd.org/D40157 (cherry picked from commit 9efad6f9e1084e97dd6e2599562e7db0bd31a4ab) --- usr.sbin/adduser/adduser.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 89dec9cf3d25..fef9e293c1ce 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -656,6 +656,8 @@ input_interactive() { _usepass="yes" _logingroup_ok="no" _groups_ok="no" + _all_ok="yes" + _another_user="no" case $passwdtype in none) _emptypass="yes" @@ -816,8 +818,11 @@ input_interactive() { printf "%-10s : %s\n" "Shell" "$ushell" printf "%-10s : %s\n" "Locked" "$_disable" while : ; do - echo -n "OK? (yes/no): " + echo -n "OK? (yes/no) [$_all_ok]: " read _input + if [ -z "$_input" ]; then + _input=$_all_ok + fi case $_input in [Nn][Oo]|[Nn]) return 1 @@ -1029,11 +1034,14 @@ else input_interactive while : ; do if [ -z "$configflag" ]; then - echo -n "Add another user? (yes/no): " + echo -n "Add another user? (yes/no) [$_another_user]: " else - echo -n "Re-edit the default configuration? (yes/no): " + echo -n "Re-edit the default configuration? (yes/no) [$_another_user]: " fi read _input + if [ -z "$_input" ]; then + _input=$_another_user + fi case $_input in [Yy][Ee][Ss]|[Yy][Ee]|[Yy]) uidstart=`get_nextuid $uidstart`