diff options
| author | Alex Harpin <development@landsofshadow.co.uk> | 2015-06-22 21:14:13 +0100 |
|---|---|---|
| committer | Alex Harpin <development@landsofshadow.co.uk> | 2015-06-22 21:14:13 +0100 |
| commit | f1d2641cfe05663d825eefc3bf4f8ba4d08f630b (patch) | |
| tree | 463f2deafe37c440c535667e0ccecf2454508d5d /templates/system/login | |
| parent | 115be5c819f94eac468faf217d16fe36c436f9f0 (diff) | |
| download | vyatta-cfg-system-f1d2641cfe05663d825eefc3bf4f8ba4d08f630b.tar.gz vyatta-cfg-system-f1d2641cfe05663d825eefc3bf4f8ba4d08f630b.zip | |
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.
Diffstat (limited to 'templates/system/login')
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/encrypted-password/node.def | 3 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/public-keys/node.def | 4 |
2 files changed, 0 insertions, 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 |