summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-08-20 17:32:46 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-08-20 17:32:46 -0700
commit28b30ad069bf77394c85e28261fb2652dc61539a (patch)
tree1036c947f3fcf30cf1a292f01804b277e105fbbd
parent0051a049c8ca3af94a9a4fbc71585d0bdcc0a495 (diff)
downloadvyatta-cfg-system-28b30ad069bf77394c85e28261fb2652dc61539a.tar.gz
vyatta-cfg-system-28b30ad069bf77394c85e28261fb2652dc61539a.zip
Add checking of port range
Bug 6058 Put consitent checking port range on snmp, ssh, and telnet
-rw-r--r--templates/service/snmp/trap-target/node.tag/port/node.def4
-rw-r--r--templates/service/ssh/port/node.def4
-rw-r--r--templates/service/telnet/port/node.def4
-rw-r--r--templates/system/login/radius-server/node.tag/port/node.def6
4 files changed, 17 insertions, 1 deletions
diff --git a/templates/service/snmp/trap-target/node.tag/port/node.def b/templates/service/snmp/trap-target/node.tag/port/node.def
index f3157d77..d5ee579a 100644
--- a/templates/service/snmp/trap-target/node.tag/port/node.def
+++ b/templates/service/snmp/trap-target/node.tag/port/node.def
@@ -1,2 +1,6 @@
type: u32
help: Destination port used for trap notification
+
+val_help: u32:1-65535; Numeric IP port
+syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \
+ "Port number must be in range 1 to 65535"
diff --git a/templates/service/ssh/port/node.def b/templates/service/ssh/port/node.def
index 1b1248f4..d4f53378 100644
--- a/templates/service/ssh/port/node.def
+++ b/templates/service/ssh/port/node.def
@@ -1,3 +1,7 @@
type: u32
default: 22
help: Port for SSH service
+val_help: u32:1-65535; Numeric IP port
+
+syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \
+ "Port number must be in range 1 to 65535"
diff --git a/templates/service/telnet/port/node.def b/templates/service/telnet/port/node.def
index f3920831..b15d4b6a 100644
--- a/templates/service/telnet/port/node.def
+++ b/templates/service/telnet/port/node.def
@@ -1,3 +1,7 @@
type: u32
default: 23
help: Port for TELNET service
+
+val_help: u32:1-65535; Numeric IP port
+syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \
+ "Port number must be in range 1 to 65535"
diff --git a/templates/system/login/radius-server/node.tag/port/node.def b/templates/system/login/radius-server/node.tag/port/node.def
index f5eae942..06ff7f02 100644
--- a/templates/system/login/radius-server/node.tag/port/node.def
+++ b/templates/system/login/radius-server/node.tag/port/node.def
@@ -1,4 +1,8 @@
type: u32
help: Radius port [REQUIRED]
-syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
default: 1812
+
+val_help: u32:1-65535; Numeric IP port
+syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \
+ "Port number must be in range 1 to 65535"
+