summaryrefslogtreecommitdiff
path: root/templates/interfaces/tunnel/node.def
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-02 19:18:05 +0200
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-02 19:18:05 +0200
commit2e57bf9a4220a1c99cdb87136fad1b83d14cc454 (patch)
tree936ceb033be8fdcbb82f97a34bec3bad661db2d8 /templates/interfaces/tunnel/node.def
parent73f0546e5f5c8d9bd367771ae0012797114ca340 (diff)
parent21031c67393d26a814298a8755d4bea43b0834de (diff)
downloadvyatta-cfg-system-2e57bf9a4220a1c99cdb87136fad1b83d14cc454.tar.gz
vyatta-cfg-system-2e57bf9a4220a1c99cdb87136fad1b83d14cc454.zip
Fix overlapping edits of standalone_pw_reset
Put in new code to set password, rather than reset it to default Although resetting passwd to default sounds good from a usuablity point of view, it is a potential security hole when system is rebooted. Instead, allow user to choose new passwd.
Diffstat (limited to 'templates/interfaces/tunnel/node.def')
-rw-r--r--templates/interfaces/tunnel/node.def3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def
index d152dbe5..89ee200c 100644
--- a/templates/interfaces/tunnel/node.def
+++ b/templates/interfaces/tunnel/node.def
@@ -2,7 +2,8 @@ tag:
type: txt
help: Set tunnel interface
-syntax:expression: exec "echo $VAR(@) | grep \"tun[0-9][0-9]\\{0,2\\}\$\" > /dev/null "; "tunnel must be (tun0-tun999)"
+syntax:expression: pattern $VAR(@) "^tun[0-9]+$" \
+ ; "tunnel must be (tun0-tun999)"
commit:expression: $VAR(./local-ip/) != "" ; \
"Must configure the tunnel local-ip for $VAR(@)"