diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-09-25 10:16:57 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-09-25 10:16:57 -0700 |
| commit | ed7cdece4009646b7f2d67030c439108c3692485 (patch) | |
| tree | 8274096d8283f885ff2373976d7af97f9b557523 /scripts/install/install-functions | |
| parent | 0aabbfdb8bf8b51eb774f385f1ec8da0c599a2b4 (diff) | |
| parent | 647f7b50a80925bed700525aebd225ad59319cf4 (diff) | |
| download | vyatta-cfg-system-ed7cdece4009646b7f2d67030c439108c3692485.tar.gz vyatta-cfg-system-ed7cdece4009646b7f2d67030c439108c3692485.zip | |
Bugfix 8290: Detect original unsalted password
Diffstat (limited to 'scripts/install/install-functions')
| -rwxr-xr-x | scripts/install/install-functions | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 9290d88b..34ced705 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -237,9 +237,13 @@ change_password() { local pwd2="2" until [[ "$pwd1" == "$pwd2" && "$pwd1" != "vyatta" ]]; do - read -p "Enter $user password:" -r -s pwd1 <>/dev/tty 2>&0 + read -p "Enter password for user '$user':" -r -s pwd1 <>/dev/tty 2>&0 echo - read -p "Retype $user password:" -r -s pwd2 <>/dev/tty 2>&0 + if [[ "$pwd1" == "" ]]; then + echo "'' is not a valid password" + continue + fi + read -p "Retype password for user '$user':" -r -s pwd2 <>/dev/tty 2>&0 echo if [ "$pwd1" != "$pwd2" ]; then |