KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files & telnet: Fixed telnet starting even with root password when shadow passwords in use.

Browse source 
SVN-Revision: 22279
This commit is contained in:
Daniel Dickinson 2010-07-18 15:18:38 +00:00
parent 370e1f64de
commit 8974bc6ae2
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
package/base-files/files/bin/login.sh
View file

@ -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
} || {

3
package/busybox/files/telnet
View file

@ -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