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-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=34cd55fae3bb3424fbc75bfbd845a511d6a90d78;p=15.05%2Fopenwrt.git

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12258 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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