From 46c4e86ebf1819fc09084c8aa79423d96fcaad4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Mon, 6 May 2024 18:18:47 +0200
Subject: [PATCH] adduser: Fix confusion between `uclass` and `_class`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This caused adduser to produce an invalid `pw(8)` command line.  Due to
bugs in `pw(8)`, the command line was silently accepted and led to the
user being created, but locked out and with no home directory.

Also fix the default value for the “Another user?” prompt.

Fixes:		170d0882903e
MFC after:	3 days
Reviewed by:	karels, allanjude
Differential Revision:	https://reviews.freebsd.org/D45098
---
 usr.sbin/adduser/adduser.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index e9027b6b7876..61a4b3b5058f 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -194,7 +194,7 @@ save_config() {
 #
 add_user() {
 	local _uid _name _comment _gecos _home _group _grouplist _shell _class
-	local _dotdir _expire _pwexpire _passwd _upasswd _passwdmethod
+	local _dotdir _expire _pwexpire _passwd _upasswd _passwdmethod _pwcmd
 
 	# Is this a configuration run? If so, don't modify user database.
 	#
@@ -519,7 +519,7 @@ get_uid() {
 #	Reads login class of account. Can be used in interactive or batch mode.
 #
 get_class() {
-	local _input _uclass
+	local _input _class
 	uclass="$defaultclass"
 	_class=${uclass:-"default"}
 
@@ -740,7 +740,6 @@ input_interactive() {
 	local _logingroup_ok="no"
 	local _groups_ok="no"
 	local _all_ok="yes"
-	local _another_user="no"
 	case $passwdtype in
 	none)
 		_emptypass="yes"
@@ -1129,6 +1128,7 @@ if [ -n "$fflag" ]; then
 else
 	input_interactive
 	while : ; do
+		_another_user="no"
 		if [ -z "$configflag" ]; then
 			echo -n "Add another user? (yes/no) [$_another_user]: "
 		else