X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1bba18de7a6c725ad4758393d329d50222a18f15..d3c45eaee122516d0620bb523d09661a8e6f71ca:/package/busybox/files/telnet

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index b8823379b..a1e17275a 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -10,8 +10,14 @@ has_root_pwd() {
 	test -n "${pwd#!}"
 }
 
+has_ssh_pubkey() {
+	( test -x /usr/sbin/dropbear && grep -qs "^ssh-" /etc/dropbear/authorized_keys ) || \
+	( test -x /usr/sbin/sshd && grep -qs "^ssh-" /root/.ssh/authorized_keys )
+}
+
 start() {
-	if ( ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
+	if ( ! has_ssh_pubkey && \
+	     ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
 	   ( [ ! -x /usr/sbin/dropbear ] && [ ! -x /usr/sbin/sshd ] );
 	then
 		telnetd -l /bin/login.sh