From b1acaee34372be92b3f635bc30318a3dcca7bd4f Mon Sep 17 00:00:00 2001
From: cshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 18 Jul 2010 15:18:38 +0000
Subject: [package] base-files & telnet: Fixed telnet starting even with root
 password when shadow passwords in use.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22279 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/files/bin/login.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'package/base-files/files/bin')

diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh
index ff5d3660e..00f2f81ab 100755
--- 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
 } || {
-- 
cgit v1.2.3