summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Grennan <tgrennan@vyatta.com>2007-11-28 12:03:09 -0800
committerTom Grennan <tgrennan@vyatta.com>2007-11-28 12:03:09 -0800
commita2d883a080a5f2d95efdc84d8667ce9bfef6add3 (patch)
tree6ce1da6a0d18024601ee275f79a2904d7add3830
parent4af6a3dd7a1f842afe18aac99a19832615b67539 (diff)
downloadvyatta-op-a2d883a080a5f2d95efdc84d8667ce9bfef6add3.tar.gz
vyatta-op-a2d883a080a5f2d95efdc84d8667ce9bfef6add3.zip
use utility function to retrieve allowed hosts/addresses
-rw-r--r--templates/set/date/ntp/node.tag/node.def3
-rw-r--r--templates/show/ntp/node.tag/node.def3
-rw-r--r--templates/telnet/node.tag/node.def3
3 files changed, 3 insertions, 6 deletions
diff --git a/templates/set/date/ntp/node.tag/node.def b/templates/set/date/ntp/node.tag/node.def
index 3d573f7..2bb348c 100644
--- a/templates/set/date/ntp/node.tag/node.def
+++ b/templates/set/date/ntp/node.tag/node.def
@@ -1,4 +1,3 @@
help: Set system date and time with given NTP server
-allowed: echo -n HOSTNAME A.B.C.D X:X::X:X ntp.vyatta.com ;
- sed 's/#.*//; s/^[^ \t]*[ \t]//; /^$/d' ${HOSTFILE:-/dev/null}
+allowed: vyatta-allowed-hosts ntp.vyatta.com
run: sudo ntpdate ${4:-ntp.vyatta.com}
diff --git a/templates/show/ntp/node.tag/node.def b/templates/show/ntp/node.tag/node.def
index b2678d8..0706975 100644
--- a/templates/show/ntp/node.tag/node.def
+++ b/templates/show/ntp/node.tag/node.def
@@ -1,4 +1,3 @@
help: Show date and time of given NTP server
-allowed: echo -n HOSTNAME A.B.C.D X:X::X:X ntp.vyatta.com ;
- sed 's/#.*//; s/^[^ \t]*[ \t]//; /^$/d' ${HOSTFILE:-/dev/null}
+allowed: vyatta-allowed-hosts ntp.vyatta.com
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 3e0bf32..5bcce24 100644
--- a/templates/telnet/node.tag/node.def
+++ b/templates/telnet/node.tag/node.def
@@ -1,6 +1,5 @@
help: telnet to <hostname|address>
-allowed: echo -n HOSTNAME A.B.C.D X:X::X:X ;
- sed 's/#.*//; s/^[^ \t]*[ \t]//; /^$/d' ${HOSTFILE:-/dev/null}
+allowed: vyatta-allowed-hosts
run: test -x ${vyatta_sbindir}/telnet &&
${vyatta_sbindir}/telnet $2 $3 ||
/usr/bin/telnet $2 $3