d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Track defaultitem in the password and account expiry menus; if the user

Browse Source 
presses ESC or chooses Cancel/No in any of the sub-menus, we want to return
to the expiry menu with that item selected.
This commit is contained in:
dteske 2013-06-08 17:46:39 +00:00
parent f088cbc9d3
commit a84a4d50b2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/bsdconfig/usermgmt/share/user_input.subr
View File

@ -483,12 +483,13 @@ f_dialog_input_expire_password()
#
# Loop until the user provides taint-free/cancellation-free input
#
local date_type
local date_type defaultitem=
while :; do
date_type=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--default-item \"\$defaultitem\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$prompt\" \
@ -498,6 +499,7 @@ f_dialog_input_expire_password()
)
retval=$?
f_dialog_data_sanitize date_type
defaultitem="$date_type"
f_dprintf "retval=%u date_type=[%s]" $retval "$date_type"
# Return if user has either pressed ESC or chosen Cancel/No
@ -666,12 +668,13 @@ f_dialog_input_expire_account()
#
# Loop until the user provides taint-free/cancellation-free input
#
local date_type
local date_type defaultitem=
while :; do
date_type=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--default-item \"\$defaultitem\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$prompt\" \
@ -681,6 +684,7 @@ f_dialog_input_expire_account()
)
retval=$?
f_dialog_data_sanitize date_type
defaultitem="$date_type"
f_dprintf "retval=%u date_type=[%s]" $retval "$date_type"
# Return if user has either pressed ESC or chosen Cancel/No