X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fbusybox%2Ffiles%2Ftelnet;h=994e713e704fb84b173bebcc8667c9327df12a66;hb=28fb077c35922671c3b1b0761923c7304f0af7ca;hp=c61fe73ad5c43abe7294d1d56c5cfe169295a06d;hpb=a6f470987e6035ee650e95b996ca96980f6d92bc;p=openwrt.git

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index c61fe73ad5..994e713e70 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -1,15 +1,37 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=50
+
+has_root_pwd() {
+	local pwd=$([ -f "$1" ] && cat "$1")
+	      pwd="${pwd#*root:}"
+	      pwd="${pwd%%:*}"
+
+	test -n "${pwd#[\!x]}"
+}
+
+get_root_home() {
+	local homedir=$([ -f "$1" ] && cat "$1")
+	homedir="${homedir#*:*:0:0:*:}"
+
+	echo "${homedir%%:*}"
+}
+
+has_ssh_pubkey() {
+	( /etc/init.d/dropbear enabled 2> /dev/null && grep -qs "^ssh-" /etc/dropbear/authorized_keys ) || \
+	( /etc/init.d/sshd enabled 2> /dev/null && grep -qs "^ssh-" "$(get_root_home /etc/passwd)"/.ssh/authorized_keys )
+}
 
 start() {
-	if 	[ \! -f /etc/passwd ] || \
-		awk -F: '/^root:/ && ($2 != "") && ($2 !~ /\!/) {exit 1}' /etc/passwd 2>/dev/null || \
-		[ \! -x /usr/sbin/dropbear ]
-	then \
-		telnetd -l /bin/login
+	if ( ! has_ssh_pubkey && \
+	     ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
+	   ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
+	then
+		service_start /usr/sbin/telnetd -l /bin/login.sh
 	fi
 }
 
 stop() {
-	killall telnetd
+	service_stop /usr/sbin/telnetd
 }