summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2008-02-14 16:43:07 -0800
committerStig Thormodsrud <stig@vyatta.com>2008-02-14 16:43:07 -0800
commit82b50b961a42d52ea6945e54e0e0dfc88ff4a5e3 (patch)
tree461fb71c187ad7d8be8b11c800610ee5ac1128b0
parent7082f5c70f29502de722dcbfe06d4a13e2954795 (diff)
downloadvyatta-cfg-quagga-82b50b961a42d52ea6945e54e0e0dfc88ff4a5e3.tar.gz
vyatta-cfg-quagga-82b50b961a42d52ea6945e54e0e0dfc88ff4a5e3.zip
Fix 2819 Plain-text authentication should be identified as such.
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def7
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def7
-rw-r--r--templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def7
-rw-r--r--templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def7
4 files changed, 22 insertions, 6 deletions
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 412d8274..63f1bc32 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -1,2 +1,9 @@
type: txt
help: Password text
+syntax:expression: exec " \
+ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \
+ echo Password must be 8 characters or less ; \
+ exit 1 ; \
+ fi ; "
+comp_help: possible completions:
+ <text> Password (8 characters or less)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 33fbdae9..d8e157d3 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -1,6 +1,7 @@
type: txt
help: Authentication type
-syntax:expression: $VAR(@) in "simple", "AH", "ah"; "authentication must be simple or AH"
+syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
+ "authentication must be simple or ah"
comp_help: possible completions:
- simple Set simple password mode
- AH Set IP Authentication Header mode
+ plaintext-password Set plain text password mode
+ ah Set IP Authentication Header mode
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 412d8274..63f1bc32 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -1,2 +1,9 @@
type: txt
help: Password text
+syntax:expression: exec " \
+ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \
+ echo Password must be 8 characters or less ; \
+ exit 1 ; \
+ fi ; "
+comp_help: possible completions:
+ <text> Password (8 characters or less)
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 33fbdae9..32a802d5 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -1,6 +1,7 @@
type: txt
help: Authentication type
-syntax:expression: $VAR(@) in "simple", "AH", "ah"; "authentication must be simple or AH"
+syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
+ "authentication must be simple or ah"
comp_help: possible completions:
- simple Set simple password mode
- AH Set IP Authentication Header mode
+ plaintext-password Set plain text password mode
+ ah Set IP Authentication Header mode