X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbusybox%2Ffiles%2Ftelnet;h=b8823379b9a8e1c61546090c7527447fe9aa5275;hb=HEAD;hp=082aba7e90b9984cd024751925b6e3effc0ecb84;hpb=fcd35cb0612843f78e375122e501ee602e8fc692;p=openwrt-10.03%2F.git

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index 082aba7e9..b8823379b 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -1,16 +1,24 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 START=50
 
+has_root_pwd() {
+	local pwd=$([ -f "$1" ] && cat "$1")
+	      pwd="${pwd#*root:}"
+	      pwd="${pwd%%:*}"
+
+	test -n "${pwd#!}"
+}
+
 start() {
-	if 	[ \! -f /etc/passwd ] || \
-		awk -F: '/^root:/ && ($2 != "") && ($2 !~ /\!/) {exit 1}' /etc/passwd 2>/dev/null || \
-		( [ \! -x /usr/sbin/dropbear ] && [ \! -x /usr/sbin/sshd ] )
-	then \
+	if ( ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
+	   ( [ ! -x /usr/sbin/dropbear ] && [ ! -x /usr/sbin/sshd ] );
+	then
 		telnetd -l /bin/login.sh
 	fi
 }
 
 stop() {
-	killall telnetd
+	killall telnetd 2>/dev/null
 }
+