Deleted Added
full compact
password.subr (245437) password.subr (249751)
1if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; then _PASSWORD_PASSWORD_SUBR=1
2#
1if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; then _PASSWORD_PASSWORD_SUBR=1
2#
3# Copyright (c) 2012 Devin Teske
3# Copyright (c) 2012-2013 Devin Teske
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:
9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright

--- 7 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:
9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright

--- 7 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/password/share/password.subr 245437 2013-01-14 21:03:34Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/password/share/password.subr 249751 2013-04-22 05:52:06Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." password/password.subr
34f_include $BSDCFG_SHARE/dialog.subr
35

--- 7 unchanged lines hidden (view full) ---

43# Prompt the user to enter a password (twice). If the user does not cancel or
44# press ESC, the $pw_password environment variable will hold the password.
45#
46f_dialog_input_password()
47{
48 local hline="$hline_alnum_punc_tab_enter"
49 local msg size rmsg rsize
50
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." password/password.subr
34f_include $BSDCFG_SHARE/dialog.subr
35

--- 7 unchanged lines hidden (view full) ---

43# Prompt the user to enter a password (twice). If the user does not cancel or
44# press ESC, the $pw_password environment variable will hold the password.
45#
46f_dialog_input_password()
47{
48 local hline="$hline_alnum_punc_tab_enter"
49 local msg size rmsg rsize
50
51 msg=$( printf "$msg_password" )
51 msg=$( printf "$msg_enter_new_password" )
52 size=$( f_dialog_inputbox_size \
53 "$DIALOG_TITLE" \
54 "$DIALOG_BACKTITLE" \
55 "$msg" \
56 "" \
57 "$hline" )
58
59 rmsg=$( printf "$msg_reenter_password" )

--- 73 unchanged lines hidden ---
52 size=$( f_dialog_inputbox_size \
53 "$DIALOG_TITLE" \
54 "$DIALOG_BACKTITLE" \
55 "$msg" \
56 "" \
57 "$hline" )
58
59 rmsg=$( printf "$msg_reenter_password" )

--- 73 unchanged lines hidden ---