From 6d5e270564e93264b97532c3c535fff97c35606c Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Tue, 2 Feb 2010 10:45:22 -0800
Subject: Fix allowed strings for hostname/ipaddress

Need to use echo -n
---
 templates/ping/node.tag/node.def             | 2 +-
 templates/ping6/node.tag/node.def            | 2 +-
 templates/set/date/ntp/node.tag/node.def     | 2 +-
 templates/show/host/lookup/node.tag/node.def | 2 +-
 templates/show/ntp/node.tag/node.def         | 2 +-
 templates/telnet/node.tag/node.def           | 2 +-
 templates/traceroute/node.tag/node.def       | 2 +-
 templates/traceroute6/node.tag/node.def      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/templates/ping/node.tag/node.def b/templates/ping/node.tag/node.def
index 6a05e3b..efd7127 100644
--- a/templates/ping/node.tag/node.def
+++ b/templates/ping/node.tag/node.def
@@ -3,6 +3,6 @@
 #
 
 help:   Send ICMP echo request to specified <hostname|IPv4 address>
-allowed: echo "<hostname> <x.x.x.x>"
+allowed: echo -n '<hostname> <x.x.x.x>'
 
 run:	/bin/ping $2
diff --git a/templates/ping6/node.tag/node.def b/templates/ping6/node.tag/node.def
index f6bade7..9241a00 100644
--- a/templates/ping6/node.tag/node.def
+++ b/templates/ping6/node.tag/node.def
@@ -3,6 +3,6 @@
 #
 
 help:   Send IPv6 ICMP echo request to specified <hostname|IPv6 address>
-allowed: echo "<hostname> <x:x:x:x:x>"
+allowed: echo -n '<hostname> <x:x:x:x:x>'
 
 run:	/bin/ping6 $2
diff --git a/templates/set/date/ntp/node.tag/node.def b/templates/set/date/ntp/node.tag/node.def
index 71f2697..7cf543c 100644
--- a/templates/set/date/ntp/node.tag/node.def
+++ b/templates/set/date/ntp/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Set system date and time with given NTP server
-allowed: echo "<hostname> <x.x.x.x> ntp.vyatta.com"
+allowed: echo -n '<hostname> <x.x.x.x> ntp.vyatta.com'
 run: sudo ntpdate ${4:-ntp.vyatta.com}
diff --git a/templates/show/host/lookup/node.tag/node.def b/templates/show/host/lookup/node.tag/node.def
index 3b1dd38..ea7426e 100644
--- a/templates/show/host/lookup/node.tag/node.def
+++ b/templates/show/host/lookup/node.tag/node.def
@@ -1,4 +1,4 @@
 help: Lookup host information for specified name or address
-allowed: echo "<hostname> <x.x.x.x> <y:y:y:y:y>"
+allowed: echo -n '<hostname> <x.x.x.x> <y:y:y:y:y>'
 
 run: /usr/bin/host $4
diff --git a/templates/show/ntp/node.tag/node.def b/templates/show/ntp/node.tag/node.def
index 2710671..e4898bb 100644
--- a/templates/show/ntp/node.tag/node.def
+++ b/templates/show/ntp/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Show date and time of specified NTP server
-allowed: echo ntp.vyatta.com; awk '/^server/ { print $2 }'  /etc/ntp.conf
+allowed: echo -n ntp.vyatta.com; awk '/^server/ { print "",$2 }'  /etc/ntp.conf
 run: /usr/sbin/ntpdate -q ${3:-ntp.vyatta.com}
diff --git a/templates/telnet/node.tag/node.def b/templates/telnet/node.tag/node.def
index d9b78e6..0b1ecf0 100644
--- a/templates/telnet/node.tag/node.def
+++ b/templates/telnet/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Telnet to host
-allowed: echo "<hostname> <x.x.x.x> <y:y:y:y:y>"
+allowed: echo -n '<hostname> <x.x.x.x> <y:y:y:y:y>'
 
 run: if [ -x /usr/bin/telnet ] ; then
      	/usr/bin/$*
diff --git a/templates/traceroute/node.tag/node.def b/templates/traceroute/node.tag/node.def
index b079582..7309798 100644
--- a/templates/traceroute/node.tag/node.def
+++ b/templates/traceroute/node.tag/node.def
@@ -3,7 +3,7 @@
 #
 
 help:   Track network path to specified <hostname|IPv4 address>
-allowed: echo "<hostname> <x.x.x.x>"
+allowed: echo -n '<hostname> <x.x.x.x>'
 
 run:
      if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $2
diff --git a/templates/traceroute6/node.tag/node.def b/templates/traceroute6/node.tag/node.def
index 7d91a39..59d5367 100644
--- a/templates/traceroute6/node.tag/node.def
+++ b/templates/traceroute6/node.tag/node.def
@@ -3,7 +3,7 @@
 #
 
 help:   Track network path to specified <hostname|IPv6 address>
-allowed: echo "<hostname> <x:x:x:x:x>"
+allowed: echo -n '<hostname> <x:x:x:x:x>'
 
 run:
      if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $2
-- 
cgit v1.2.3