diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-09-05 14:04:30 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-09-05 14:04:30 -0700 |
| commit | e2811040b1b6bf1e94f1878ade872dfef3cdf0ea (patch) | |
| tree | cbcaf56cc575695333b0df88ef45eaf47c956e8d | |
| parent | 27f5c1063dc835de4d0b6ea2052e6adef72a264f (diff) | |
| download | vyatta-cfg-system-e2811040b1b6bf1e94f1878ade872dfef3cdf0ea.tar.gz vyatta-cfg-system-e2811040b1b6bf1e94f1878ade872dfef3cdf0ea.zip | |
Bugfix 8326
Fix password change script save function to work as it does in
vyattacfg.
Fix empty substitution on 'plaintext-password ""' causing script error.
| -rwxr-xr-x | scripts/vyatta-first-login-passwd.sh | 4 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/plaintext-password/node.def | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/vyatta-first-login-passwd.sh b/scripts/vyatta-first-login-passwd.sh index ff28c57d..d75e5c0c 100755 --- a/scripts/vyatta-first-login-passwd.sh +++ b/scripts/vyatta-first-login-passwd.sh @@ -47,7 +47,9 @@ commit () save () { - /opt/vyatta/sbin/vyatta-save-config.pl + # do this the same way that vyatta-cfg does it + local save_cmd=/opt/vyatta/sbin/vyatta-save-config.pl + eval "sudo sg vyattacfg \"umask 0002 ; $save_cmd\"" } show () diff --git a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def index 5f1d09ed..84fd972c 100644 --- a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def +++ b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def @@ -5,7 +5,7 @@ help: Plaintext password for encryption # "encrypted-password" to an empty string (which actually allows login without # password). syntax:expression: exec "\ - if [[ -e /opt/vyatta/etc/.nofirstpasswd && $VAR(@) == 'vyatta' ]]; then \ + if [[ -e /opt/vyatta/etc/.nofirstpasswd && '$VAR(@)' == 'vyatta' ]]; then \ echo 'Invalid password [$VAR(@)]';\ exit 1;\ fi" |