From f1d2641cfe05663d825eefc3bf4f8ba4d08f630b Mon Sep 17 00:00:00 2001 From: Alex Harpin Date: Mon, 22 Jun 2015 21:14:13 +0100 Subject: Revert "vyatta-cfg-system: prevent deletion of all user authentication" This reverts commit 593899accdff03af23e6bb6c7189ad4ed05a4d8e. This commit reintroduced the inability to delete a user configured on the system, which was resolved in bug #557. Reverting this for the time being until a better fix can be implemented. --- .../login/user/node.tag/authentication/encrypted-password/node.def | 3 --- .../system/login/user/node.tag/authentication/public-keys/node.def | 4 ---- 2 files changed, 7 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 a8b3ee54..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,6 +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(../../@)" - -delete:expression: $VAR(../public-keys) != "" - ; "either user encrypted password or public keys must be set" \ No newline at end of file diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.def index d813fb9e..245e7197 100644 --- a/templates/system/login/user/node.tag/authentication/public-keys/node.def +++ b/templates/system/login/user/node.tag/authentication/public-keys/node.def @@ -7,7 +7,3 @@ commit:expression: $VAR(./type/) != "" ; \ "Must configure public key type for $VAR(@)" commit:expression: $VAR(./key/) != "" ; \ "Must configure public key value for $VAR(@)" - -delete:expression: ($VAR(../encrypted-password) != "" && - $VAR(../encrypted-password/@) != "!") - ; "either user encrypted password or public keys must be set" \ No newline at end of file -- cgit v1.2.3