Author: dteske
Date: Sat Jun 8 18:23:41 2013
New Revision: 251547
URL: http://svnweb.freebsd.org/changeset/base/251547
Log:
Curb another regression (this one introduced by r251545, itself trying to
fix the regression introduced by r251544; which was trying to make things
consistent w/respect to ESC versus YES versus NO in the password disable
prompt in "Login Management".
(need stronger coffee; very sorry for the churn)
With this revision, the "YES", "NO", and implied ESC options all work as-
expected. Choosing "YES" allows you to proceed and the password will be
disabled. Choosing "NO" will bring back around to enter a password for the
account. Pressing ESC will drop you out of either user or group input and
back to the usermgmt screen.
Modified:
head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
Modified: head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr Sat Jun 8
18:16:41 2013 (r251546)
+++ head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr Sat Jun 8
18:23:41 2013 (r251547)
@@ -239,9 +239,13 @@ f_dialog_input_group_password()
if [ ! "$_password1" ]; then
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
- continue # back to password prompt
+ if [ $retval -eq 255 ]; then # ESC was pressed
+ return $retval
+ elif [ $retval -eq $SUCCESS ]; then
+ pw_group_password_disable=1
+ else
+ continue # back to password prompt
+ fi
else
pw_group_password_disable=
fi
Modified: head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Sat Jun 8
18:16:41 2013 (r251546)
+++ head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Sat Jun 8
18:23:41 2013 (r251547)
@@ -336,9 +336,13 @@ f_dialog_input_password()
if [ ! "$_password1" ]; then
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
- continue # back to password prompt
+ if [ $retval -eq 255 ]; then # ESC was pressed
+ return $retval
+ elif [ $retval -eq $SUCCESS ]; then
+ pw_password_disable=1
+ else
+ continue # back to password prompt
+ fi
else
pw_password_disable=
fi
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
