summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-08-09 09:50:12 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-08-09 09:50:12 +0000
commita53aa71c83e3dd48d0a19986d423d7ea98906924 (patch)
tree91bd3361706551e821ddaeb584dbaad4c1ba6ea0
parent0be07086760251a53e98254244429d13ae573a16 (diff)
downloadmaster-31e0f0ae-a53aa71c83e3dd48d0a19986d423d7ea98906924.tar.gz
master-31e0f0ae-a53aa71c83e3dd48d0a19986d423d7ea98906924.tar.bz2
master-31e0f0ae-a53aa71c83e3dd48d0a19986d423d7ea98906924.zip
Do not run telnet if either dropbear or openssh server are running (#3839)
SVN-Revision: 12258
-rwxr-xr-xpackage/busybox/files/telnet2
1 files changed, 1 insertions, 1 deletions
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