diff options
| author | Daniil Baturin <daniil@baturin.org> | 2015-06-29 00:56:29 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-06-29 00:56:29 +0200 |
| commit | bfa0be96e86d793e6978ce3f7750c3a21fec0ba4 (patch) | |
| tree | 7ad12db9912ed1294e8e92d7205ca7b02f564867 /templates | |
| parent | 0d53445cf639a4072e6d2ecd71da6c9f1c78d4b8 (diff) | |
| parent | 06073474594426a2da5cb9907fc7587df56c0c23 (diff) | |
| download | vyatta-cfg-system-bfa0be96e86d793e6978ce3f7750c3a21fec0ba4.tar.gz vyatta-cfg-system-bfa0be96e86d793e6978ce3f7750c3a21fec0ba4.zip | |
Merge branch 'lithium' of github.com:vyos/vyatta-cfg-system into lithium
Diffstat (limited to 'templates')
| -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 |