aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commit34cd55fae3bb3424fbc75bfbd845a511d6a90d78 (patch)
tree4e4af7f891e425a2dd8e4f366ea8c029eaf187ea /package
parent2d046869764444d88dde5c20e92a05bca8024f45 (diff)
downloadmaster-187ad058-34cd55fae3bb3424fbc75bfbd845a511d6a90d78.tar.gz
master-187ad058-34cd55fae3bb3424fbc75bfbd845a511d6a90d78.tar.bz2
master-187ad058-34cd55fae3bb3424fbc75bfbd845a511d6a90d78.zip
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
Diffstat (limited to 'package')
-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