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

[openwrt/svn-archive/archive.git] / package / base-files / files / bin / login.sh

diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh
index ff5d3660e40df8608032d7c6a2e05f8f7adca69f..00f2f81ab421b13dd97ed19793c540ad7f5fd1d4 100755 (executable)
--- a/package/base-files/files/bin/login.sh
+++ b/package/base-files/files/bin/login.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
+
+regpassresult="0"
 grep '^root:[^!]' /etc/passwd >&- 2>&-
-[ "$?" = "0" -a -z "$FAILSAFE" ]  &&  
-{
+regpassresult="$?"
+shadowresult="0"
+if [ -e "/etc/shadow" ]; then
+       grep '^root:[^!]' /etc/shadow >&- 2>&-
+        shadowresult="$?"
+fi
+[ "$regpassresult" = "0" ] && [ "$shadowresult" = "0" ] && [ -z "$FAILSAFE" ] && {
     echo "Login failed."
     exit 0
 } || {