From owner-svn-src-head@FreeBSD.ORG Sun Jun 2 23:12:33 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6AC3E58F; Sun, 2 Jun 2013 23:12:33 +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 4BA6C1C9A; Sun, 2 Jun 2013 23:12:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r52NCXig092403; Sun, 2 Jun 2013 23:12:33 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r52NCWtH092401; Sun, 2 Jun 2013 23:12:32 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201306022312.r52NCWtH092401@svn.freebsd.org> From: Devin Teske Date: Sun, 2 Jun 2013 23:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251273 - in 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: Sun, 02 Jun 2013 23:12:33 -0000 Author: dteske Date: Sun Jun 2 23:12:32 2013 New Revision: 251273 URL: http://svnweb.freebsd.org/changeset/base/251273 Log: Change the name of a couple of functions in `usermgmt/user_input.subr' to make their purpose more clear by their names: f_dialog_input_change() and f_dialog_input_expire() Are now (respectively): f_dialog_input_expire_password() and f_dialog_input_expire_account() Upon revisit to this portion of code, the former names were too confusing. Modified: head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr head/usr.sbin/bsdconfig/usermgmt/userinput Modified: head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr ============================================================================== --- head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Sun Jun 2 23:08:21 2013 (r251272) +++ head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Sun Jun 2 23:12:32 2013 (r251273) @@ -441,14 +441,14 @@ f_dialog_input_class() return $SUCCESS } -# f_dialog_input_change [$seconds] +# f_dialog_input_expire_password [$seconds] # # Allow the user to enter a date/time (in number-of-seconds since the `epoch') # for when a given user's password must be changed. If the user does not cancel # or press ESC, the $pw_password_expire variable will hold the newly- # configured value upon return. # -f_dialog_input_change() +f_dialog_input_expire_password() { local prompt="$msg_password_expires_on" local menu_list=" @@ -622,14 +622,14 @@ f_dialog_input_change() return $SUCCESS } -# f_dialog_input_expire [$seconds] +# f_dialog_input_expire_account [$seconds] # # Allow the user to enter a date/time (in number-of-seconds since the `epoch') # for when a given user's account should become expired. If the user does not # cancel or press ESC, the $pw_account_expire variable will hold the newly- # configured value upon return. # -f_dialog_input_expire() +f_dialog_input_expire_account() { local prompt="$msg_account_expires_on" local menu_list=" Modified: head/usr.sbin/bsdconfig/usermgmt/userinput ============================================================================== --- head/usr.sbin/bsdconfig/usermgmt/userinput Sun Jun 2 23:08:21 2013 (r251272) +++ head/usr.sbin/bsdconfig/usermgmt/userinput Sun Jun 2 23:12:32 2013 (r251273) @@ -254,8 +254,8 @@ if [ "$mode" = "Add" ]; then f_dialog_input_gid || exit 0 f_dialog_input_member_groups || exit 0 f_dialog_input_class || exit 0 - f_dialog_input_change || exit 0 - f_dialog_input_expire || exit 0 + f_dialog_input_expire_password || exit 0 + f_dialog_input_expire_account || exit 0 f_dialog_input_home_dir "$homeprefix/$pw_name" || exit 0 pw_dotfiles_create="$msg_no" if [ ! -d "$homeprefix/$pw_name" ]; then @@ -472,10 +472,10 @@ while :; do f_dialog_input_class "$pw_class" ;; 8) # Password Expire on - f_dialog_input_change "$pw_password_expire" + f_dialog_input_expire_password "$pw_password_expire" ;; 9) # Account Expire on - f_dialog_input_expire "$pw_account_expire" + f_dialog_input_expire_account "$pw_account_expire" ;; A) # Home Directory f_dialog_input_home_dir "$pw_home_dir"