X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fbusybox%2Ffiles%2Ftelnet;h=b8823379b9a8e1c61546090c7527447fe9aa5275;hb=56be88af82ef5779114af83f6c9345c6f50f2100;hp=ec99172cfd30fb534d120ff8f42c05d293c91d21;hpb=606962d07141ff2ef35bd7f6e16560aa643550ac;p=openwrt.git

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index ec99172cfd..b8823379b9 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 \
-		telnetd -l /bin/login
+	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
 }
+