X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fbusybox%2Ffiles%2Ftelnet;h=b8823379b9a8e1c61546090c7527447fe9aa5275;hb=589d5bb0681d7ee21232f59861e74cfb161db13e;hp=c994c6052fa983929ee344a2ac831c5fd6f07718;hpb=6f447d09dfa4c4ee2321f327c5b62e79db3f9173;p=openwrt.git

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index c994c6052f..b8823379b9 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -1,10 +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 awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null && [ -x /usr/sbin/dropbear ]; then telnetd -l /bin/login; fi
+	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
 }
+