From 8974bc6ae28c1a90529f700f145ebe7e7c501e84 Mon Sep 17 00:00:00 2001 From: Daniel Dickinson Date: Sun, 18 Jul 2010 15:18:38 +0000 Subject: base-files & telnet: Fixed telnet starting even with root password when shadow passwords in use. SVN-Revision: 22279 --- package/base-files/files/bin/login.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'package/base-files') diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh index ff5d3660e4..00f2f81ab4 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