Author: dteske
Date: Sat Jun 8 17:36:31 2013
New Revision: 251542
URL: http://svnweb.freebsd.org/changeset/base/251542
Log:
Fix a regression in the "Login Management" module introduced by r251242 in
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.
Modified:
head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
Modified: head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Sat Jun 8
16:49:19 2013 (r251541)
+++ head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Sat Jun 8
17:36:31 2013 (r251542)
@@ -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 \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
