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

[openwrt/svn-archive/archive.git] / package / busybox / files / telnet

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index 082aba7e90b9984cd024751925b6e3effc0ecb84..2fbbb23575f58364e06e95d25bd9495f49d80f77 100755 (executable)
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -4,7 +4,8 @@ START=50
 
 start() {
        if      [ \! -f /etc/passwd ] || \
-               awk -F: '/^root:/ && ($2 != "") && ($2 !~ /\!/) {exit 1}' /etc/passwd 2>/dev/null || \
+               ( 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.sh