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

Fix a regression in the "Login Management" module introduced by r251242 in

Browse Source 
which choosing to cancel the manual input of expiration time (in seconds
since the UNIX epoch) for either account expiration or password expiration
would see the original value lost.
This commit is contained in:
dteske 2013-06-08 17:36:31 +00:00
parent 4c3e94bc91
commit f088cbc9d3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -591,14 +591,16 @@ f_dialog_input_expire_password()
break ;;
4) # Enter value manually
local msg
local msg ret_secs
msg=$( printf "$msg_number_of_seconds_since_epoch" \
"$( date -r 1 "+%c %Z" )" )
# Return to menu if either ESC or Cancel/No
f_dialog_input _input \
f_dialog_input ret_secs \
"$msg" "$_input" "$hline" || continue
_input="$ret_secs"
# Taint-check the user's input
if ! f_isinteger "${_input:-0}"; then
f_dialog_msgbox \
@ -772,14 +774,16 @@ f_dialog_input_expire_account()
break ;;
4) # Enter value manually
local msg
local msg ret_secs
msg=$( printf "$msg_number_of_seconds_since_epoch" \
"$( date -r 1 "+%c %Z" )" )
# Return to menu if either ESC or Cancel/No
f_dialog_input _input "$msg" \
f_dialog_input ret_secs "$msg" \
"$_input" "$hline" || continue
_input="$ret_secs"
# Taint-check the user's input
if ! f_isinteger "${_input:-0}"; then
f_dialog_msgbox \