summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Harpin <development@landsofshadow.co.uk>2014-10-18 10:22:19 +0100
committerAlex Harpin <development@landsofshadow.co.uk>2014-10-18 10:22:19 +0100
commita6da4b3ad29b5da1b2d1df5ff651ebf4e17bdba6 (patch)
tree0f14f887a3b3b45c463e4aa872f7a12e73a6640f
parent618434754c871ad7c75364af1f9e2adf7f9a16b3 (diff)
downloadvyatta-cfg-system-a6da4b3ad29b5da1b2d1df5ff651ebf4e17bdba6.tar.gz
vyatta-cfg-system-a6da4b3ad29b5da1b2d1df5ff651ebf4e17bdba6.zip
vyatta-cfg-system: comment change in the plaintext-password node
Remove the comment from the plaintext-password node regarding empty encrypted password values as you can't set them as empty.
-rw-r--r--templates/system/login/user/node.tag/authentication/plaintext-password/node.def5
1 files changed, 2 insertions, 3 deletions
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 939ff0bc..87210453 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
@@ -1,9 +1,8 @@
type: txt
help: Plaintext password for encryption
# if plaintext is empty, assume this is left-over from blanking the plaintext
-# and do nothing. to set password to empty, user needs to set the
-# "encrypted-password" to an empty string (which actually allows login without
-# password).
+# and do nothing.
+
update:expression: $VAR(@) == "" \
|| ($VAR(../encrypted-password/@) \
= `/usr/bin/mkpasswd --method=sha-512 '$VAR(@)' | tr -d \\\\n` \