Date: Sat, 8 Jun 2013 17:46:39 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251543 - head/usr.sbin/bsdconfig/usermgmt/share Message-ID: <201306081746.r58HkdbJ047201@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Sat Jun 8 17:46:39 2013 New Revision: 251543 URL: http://svnweb.freebsd.org/changeset/base/251543 Log: Track defaultitem in the password and account expiry menus; if the user presses ESC or chooses Cancel/No in any of the sub-menus, we want to return to the expiry menu with that item selected. 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 17:36:31 2013 (r251542) +++ head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Sat Jun 8 17:46:39 2013 (r251543) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306081746.r58HkdbJ047201>