From owner-svn-src-head@FreeBSD.ORG Sat Jun 8 17:36:32 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 45AE6F64; Sat, 8 Jun 2013 17:36:32 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3794D18C9; Sat, 8 Jun 2013 17:36:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58HaWMN044179; Sat, 8 Jun 2013 17:36:32 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58HaWhY044178; Sat, 8 Jun 2013 17:36:32 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306081736.r58HaWhY044178@svn.freebsd.org> From: Devin Teske Date: Sat, 8 Jun 2013 17:36:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251542 - head/usr.sbin/bsdconfig/usermgmt/share X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jun 2013 17:36:32 -0000 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 \