Fix 2819 Plain-text authentication should be identified as such

5 files changed, 15 insertions, 11 deletions

diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def
index a2a1ef7a..a55e38b0 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/simple/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -1,20 +1,23 @@
 type: txt
-help: Configure simple password
+help: Configure plain text password
 syntax:expression: exec "                              \
         if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then   \
           echo Password must be 8 characters or less ; \
           exit 1 ;                                     \
         fi ; "
+
 update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl  \
          -c \"configure terminal\"                     \
          -c \"interface $VAR(../../../../@) \"         \
 	 -c \"no ip ospf authentication \"             \
 	 -c \"ip ospf authentication \"                \
 	 -c \"ip ospf authentication-key $VAR(@) \"; "
+
 delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl  \
          -c \"configure terminal\"                     \
          -c \"interface $VAR(../../../../@) \"         \
 	 -c \"no ip ospf authentication \"             \
 	 -c \"no ip ospf authentication-key \"; "
+
 comp_help: possible completions:
- <text>             Simple password (8 characters or less)
+ <text>             Plain text password (8 characters or less)
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
index cff270e2..5664aa46 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
@@ -4,7 +4,7 @@ syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint
        "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
 
 update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
-       -c \"configure terminal\"                      \ 
+       -c \"configure terminal\"                      \
        -c \"interface $VAR(../../../@) \"             \
        -c \"ip ospf network $VAR(@) \"; "
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def
index af7a0a1f..bb6c0eeb 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/simple-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def
@@ -1,9 +1,9 @@
 type: txt
-help: Simple password authentication key
-syntax:expression: exec "                              \
-        if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then  \
+help: Plain text password
+syntax:expression: exec "                               \
+        if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then   \
           echo Password must be 16 characters or less ; \
-          exit 1 ;                                     \
+          exit 1 ;                                      \
         fi ; "
 
 update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl                 \
@@ -15,5 +15,6 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl                 \
        -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \
        -c \"no ip rip authentication mode\"                           \
        -c \"no ip rip authentication string $VAR(@)\"; "
+
 comp_help: possible completions:
  <text>             Password (16 characters or less)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 987cdfe0..ac3c7b87 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/simple/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Configure simple password
+help: Configure plain text password
 syntax:expression: exec "                              \
         if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then   \
           echo Password must be 8 characters or less ; \
@@ -20,4 +20,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl                 \
 	 -c \"no ip ospf authentication-key \"; "
 
 comp_help: possible completions:
- <text>             Simple password (8 characters or less)
+ <text>             Plain text password (8 characters or less)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
index fe3bbe16..2b9dac5b 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/simple-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Simple password authentication key
+help: Plain text password
 syntax:expression: exec "                               \
         if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then   \
           echo Password must be 16 characters or less ; \
@@ -19,4 +19,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl               \
        -c \"no ip rip authentication string $VAR(@) \"; "
 
 comp_help: possible completions:
- <text>             Password (16 characters or less)
+ <text>             Plain text password (16 characters or less)