From 4a9dadf356a83ee0270d3848c506d1ca969d2565 Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Mon, 23 Jun 2008 17:56:44 +0000
Subject: Fix Bug 2871 Internal errors reported with traceroute use host
 command to resolve only if input is not a valid IP address also, if name
 server not configured, prompt user and ask to only enter valid IPv4 address

---
 templates/traceroute/node.tag/node.def | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/templates/traceroute/node.tag/node.def b/templates/traceroute/node.tag/node.def
index 55acbb7..83a3f31 100644
--- a/templates/traceroute/node.tag/node.def
+++ b/templates/traceroute/node.tag/node.def
@@ -6,9 +6,21 @@ help:   Track network path to specified <hostname|IPv4 address>
 allowed:
 	vyatta-allowed-hosts
 
-run: if /usr/bin/host $2 &>/dev/null
-     then
-        /usr/bin/traceroute $2
-     else
-        echo Cannot identify $2
+run:
+     if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $2
+       then
+           /usr/bin/traceroute $2
+           echo
+       else
+           if cat /etc/resolv.conf | grep -q nameserver
+             then
+                 if /usr/bin/host $2 &> /dev/null
+                   then
+                       /usr/bin/traceroute $2
+                   else
+                       echo "Invalid IP address or host name '$2'"
+                 fi
+             else
+                 echo "Either enter a valid IPv4 address or configure Domain Name Server to resolve host names"
+           fi
      fi
-- 
cgit v1.2.3