From f67f3fbe6a0da06db327647fe0aacafaad18e601 Mon Sep 17 00:00:00 2001
From: Alex Harpin <development@landsofshadow.co.uk>
Date: Sat, 13 Jun 2015 12:42:59 +0100
Subject: 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
---
 .../login/user/node.tag/authentication/encrypted-password/node.def    | 4 ----
 .../login/user/node.tag/authentication/plaintext-password/node.def    | 2 --
 2 files changed, 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
-- 
cgit v1.2.3