From 26a96076ce8a7fe98aa43d81b11258d8dc6c990f Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Fri, 2 Jul 2010 20:45:27 +0000
Subject: Corrected the fix for bug 5408.

---
 scripts/system/vyatta_update_telnet | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/scripts/system/vyatta_update_telnet b/scripts/system/vyatta_update_telnet
index 1a1f5f70..07d6946f 100755
--- a/scripts/system/vyatta_update_telnet
+++ b/scripts/system/vyatta_update_telnet
@@ -3,18 +3,14 @@
 # and block changes when logged in over telnet
 
 # Block changes to telnet daemon when logged in over telnet
-parent_proc_id=`ps -fp $$ | tail -1 | awk '{print $3}'`
-while [ "$parent_proc_id" != "1" ]
-do
- proc_id=$parent_proc_id
- parent_proc_id=`ps -fp $proc_id | tail -1 | awk '{print $3}'`
-done
-
- if ps $proc_id | grep -q telnetd
- then
-  echo "Please configure telnet settings via ssh or console"
-  exit 1
- fi
+pid=$(who -um | awk -F " " '{print $7}')
+if [ -n "$pid" ]; then
+ if ps --pid $(ps --pid $pid -o ppid=) -o cmd= | grep -q telnetd
+  then
+    echo "Please configure telnet settings via ssh or console."
+    exit 1
+  fi
+fi
 
 usage() {
     echo "Usage: $0 enable <port>"
-- 
cgit v1.2.3