diff options
| author | Alex Harpin <development@landsofshadow.co.uk> | 2015-06-13 12:42:59 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-08-16 08:20:09 +0200 |
| commit | bf4115a924fc44dd70b4cfb744eda2b775ce044d (patch) | |
| tree | b4774dd07ecfaab8807938def7a1df5d7bdd9eb9 | |
| parent | ee051deebe7ad73ee8f17f2ec5c9726a83274df6 (diff) | |
| download | vyatta-cfg-system-bf4115a924fc44dd70b4cfb744eda2b775ce044d.tar.gz vyatta-cfg-system-bf4115a924fc44dd70b4cfb744eda2b775ce044d.zip | |
vyatta-cfg-system: 'delete system login user' doesn't remove the user
Following the fix for bug #336 that prevents the deletion of the
encrypted password, which resulted in a broken config node on reboot,
it was no longer possible to delete users. This reverts the fix for
that bug.
Bug #557 http://bugzilla.vyos.net/show_bug.cgi?id=557
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/encrypted-password/node.def | 4 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/plaintext-password/node.def | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def index e0fb4132..29ad14a8 100644 --- a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def +++ b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def @@ -9,7 +9,3 @@ syntax:expression: ($VAR(@) == "*" || $VAR(@) == "!" \ || ( pattern $VAR(@) "^\\$5\\$[a-zA-Z0-9\./]*\\$[a-zA-Z0-9\./]{43}$" ) \ || ( pattern $VAR(@) "^\\$6\\$[a-zA-Z0-9\./]*\\$[a-zA-Z0-9\./]{86}$" )) \ ; "Not a valid encrypted password for user $VAR(../../@)" - -# Deleting the encrypted password set it to "!" to disable password -# access for this account, SSH RSA key login will still work. -delete:expression: $VAR(@) = "!"
\ No newline at end of file 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 87210453..407f49b5 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 @@ -7,5 +7,3 @@ update:expression: $VAR(@) == "" \ || ($VAR(../encrypted-password/@) \ = `/usr/bin/mkpasswd --method=sha-512 '$VAR(@)' | tr -d \\\\n` \ && $VAR(@) = "") - -delete:expression: $VAR(@) = ""
\ No newline at end of file |