From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 9 Aug 2008 09:50:12 +0000 (+0000)
Subject: Do not run telnet if either dropbear or openssh server are running (#3839)
X-Git-Tag: reboot~25822
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a53aa71c83e3dd48d0a19986d423d7ea98906924;p=openwrt%2Fstaging%2Fjogo.git

Do not run telnet if either dropbear or openssh server are running (#3839)

SVN-Revision: 12258
---

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index 5802584029..ec99172cfd 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -5,7 +5,7 @@ START=50
 start() {
 	if 	[ \! -f /etc/passwd ] || \
 		awk -F: '/^root:/ && ($2 != "") && ($2 !~ /\!/) {exit 1}' /etc/passwd 2>/dev/null || \
-		[ \! -x /usr/sbin/dropbear ]
+		( [ \! -x /usr/sbin/dropbear ] && [ \! -x /usr/sbin/sshd ] )
 	then \
 		telnetd -l /bin/login
 	fi