summaryrefslogtreecommitdiff
path: root/package/base-files
diff options
context:
space:
mode:
authorcshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-18 15:18:38 +0000
committercshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-18 15:18:38 +0000
commitb1acaee34372be92b3f635bc30318a3dcca7bd4f (patch)
tree93f23114e06dc96646b6335733a2c9fdc0ccef76 /package/base-files
parentaf139e0177a37caa0cd6f28741ee48a985622a1b (diff)
[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
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/bin/login.sh11
1 files changed, 9 insertions, 2 deletions
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
} || {