summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/group_input.subr8
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/user_input.subr8
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/bsdconfig/usermgmt/share/group_input.subr b/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
index ef45070..1c8ed67 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
@@ -237,10 +237,10 @@ f_dialog_input_group_password()
# Check for NULL entry
if [ ! "$_password1" ]; then
- f_dialog_yesno \
- "$msg_disable_password_auth_for_group" ||
- continue
- pw_group_password_disable=1
+ f_dialog_yesno "$msg_disable_password_auth_for_group"
+ local retval=$?
+ [ $retval -eq 255 ] && return $retval # ESC was pressed
+ [ $retval -eq $SUCCESS ] && pw_group_password_disable=1
else
pw_group_password_disable=
fi
diff --git a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
index a06f707..db5b8b9 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
@@ -334,10 +334,10 @@ f_dialog_input_password()
# Check for NULL entry
if [ ! "$_password1" ]; then
- f_dialog_yesno \
- "$msg_disable_password_auth_for_account" ||
- continue
- pw_password_disable=1
+ f_dialog_yesno "$msg_disable_password_auth_for_account"
+ local retval=$?
+ [ $retval -eq 255 ] && return $retval # ESC was pressed
+ [ $retval -eq $SUCCESS ] && pw_password_disable=1
else
pw_password_disable=
fi
OpenPOWER on IntegriCloud