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 58025840298e6cb058a83e65fb47699af4aed754..ec99172cfd30fb534d120ff8f42c05d293c91d21 100755 (executable)
--- 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 || \
 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
        then \
                telnetd -l /bin/login
        fi