Deleted Added
full compact
password.subr (251242) password.subr (251264)
1if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; then _PASSWORD_PASSWORD_SUBR=1
2#
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:

--- 10 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#
1if [ ! "$_PASSWORD_PASSWORD_SUBR" ]; then _PASSWORD_PASSWORD_SUBR=1
2#
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:

--- 10 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 251242 2013-06-02 05:45:25Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/password/share/password.subr 251264 2013-06-02 20:02:50Z 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

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

40
41# f_dialog_input_password
42#
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{
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

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

40
41# f_dialog_input_password
42#
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 prompt1="$msg_enter_new_password"
49 local prompt2="$msg_reenter_password"
48 local hline="$hline_alnum_punc_tab_enter"
50 local hline="$hline_alnum_punc_tab_enter"
49 local msg rmsg
50
51
51 msg=$( printf "$msg_enter_new_password" )
52 local height1 width1
53 f_dialog_inputbox_size height1 width1 \
54 "$DIALOG_TITLE" \
55 "$DIALOG_BACKTITLE" \
52 local height1 width1
53 f_dialog_inputbox_size height1 width1 \
54 "$DIALOG_TITLE" \
55 "$DIALOG_BACKTITLE" \
56 "$msg" \
56 "$prompt1" \
57 "" \
58 "$hline"
59
57 "" \
58 "$hline"
59
60 rmsg=$( printf "$msg_reenter_password" )
61 local height2 width2
62 f_dialog_inputbox_size height2 width2 \
63 "$DIALOG_TITLE" \
64 "$DIALOG_BACKTITLE" \
60 local height2 width2
61 f_dialog_inputbox_size height2 width2 \
62 "$DIALOG_TITLE" \
63 "$DIALOG_BACKTITLE" \
65 "$rmsg" \
64 "$prompt2" \
66 "" \
67 "$hline"
68
69 #
70 # Loop until the user provides taint-free/valid input
71 #
72 local _password1 _password2
73 while :; do
74 _password1=$( $DIALOG \
75 --title "$DIALOG_TITLE" \
76 --backtitle "$DIALOG_BACKTITLE" \
77 --hline "$hline" \
78 --ok-label "$msg_ok" \
79 --cancel-label "$msg_cancel" \
80 --insecure \
65 "" \
66 "$hline"
67
68 #
69 # Loop until the user provides taint-free/valid input
70 #
71 local _password1 _password2
72 while :; do
73 _password1=$( $DIALOG \
74 --title "$DIALOG_TITLE" \
75 --backtitle "$DIALOG_BACKTITLE" \
76 --hline "$hline" \
77 --ok-label "$msg_ok" \
78 --cancel-label "$msg_cancel" \
79 --insecure \
81 --passwordbox "$msg" \
80 --passwordbox "$prompt1" \
82 $height1 $width1 \
83 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
84 ) || return $?
85 # Return if user either pressed ESC or chose Cancel/No
86 debug= f_dialog_line_sanitize _password1
87
88 _password2=$( $DIALOG \
89 --title "$DIALOG_TITLE" \
90 --backtitle "$DIALOG_BACKTITLE" \
91 --hline "$hline" \
92 --ok-label "$msg_ok" \
93 --cancel-label "$msg_cancel" \
94 --insecure \
81 $height1 $width1 \
82 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
83 ) || return $?
84 # Return if user either pressed ESC or chose Cancel/No
85 debug= f_dialog_line_sanitize _password1
86
87 _password2=$( $DIALOG \
88 --title "$DIALOG_TITLE" \
89 --backtitle "$DIALOG_BACKTITLE" \
90 --hline "$hline" \
91 --ok-label "$msg_ok" \
92 --cancel-label "$msg_cancel" \
93 --insecure \
95 --passwordbox "$rmsg" \
94 --passwordbox "$prompt2" \
96 $height2 $width2 \
97 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
98 ) || return $?
99 # Return if user either pressed ESC or chose Cancel/No
100 debug= f_dialog_line_sanitize _password2
101
102 # Check for NULL entry
103 if ! [ "$_password1" -o "$_password2" ]; then

--- 22 unchanged lines hidden ---
95 $height2 $width2 \
96 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
97 ) || return $?
98 # Return if user either pressed ESC or chose Cancel/No
99 debug= f_dialog_line_sanitize _password2
100
101 # Check for NULL entry
102 if ! [ "$_password1" -o "$_password2" ]; then

--- 22 unchanged lines hidden ---