From c9cb1873ad4cec5a4c4a9cbdec3eca86068a65cf Mon Sep 17 00:00:00 2001
From: Deepti Kulkarni <deepti@vyatta.com>
Date: Thu, 1 Jul 2010 02:00:57 +0000
Subject: Revert "fix for bug 5408."

This reverts commit 5110c9f3af7f4d2f4b9f8c14a073a1fd70d852ac.
---
 scripts/system/vyatta_update_telnet | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'scripts')

diff --git a/scripts/system/vyatta_update_telnet b/scripts/system/vyatta_update_telnet
index 69afae35..0725a85f 100755
--- a/scripts/system/vyatta_update_telnet
+++ b/scripts/system/vyatta_update_telnet
@@ -3,27 +3,13 @@
 # and block changes when logged in over telnet
 
 # Block changes to telnet daemon when logged in over telnet
-#pid=$(who -um | awk -F " " '{print $7}')
-#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
-
-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
+pid=$(who -um | awk -F " " '{print $7}')
+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
 
-
 usage() {
     echo "Usage: $0 enable <port>"
     echo "       $0 disable"
-- 
cgit v1.2.3