[package] base-files & telnet: Fixed telnet starting even with root password when...

[openwrt.git] / package / busybox / files / telnet

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