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

base-files, busybox: fix 22279, simplify code and get rid of awk

Browse source 
SVN-Revision: 22282
This commit is contained in:
Jo-Philipp Wich 2010-07-18 18:36:12 +00:00
parent 8974bc6ae2
commit 1dd824a358
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,25 +1,16 @@
#!/bin/sh
# Copyright (C) 2006 OpenWrt.org
# Copyright (C) 2006-2010 OpenWrt.org
regpassresult="0"
grep '^root:[^!]' /etc/passwd >&- 2>&-
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
} || {
if grep -qs '^root:[^!]' /etc/passwd /etc/shadow && [ -z "$FAILSAFE" ]; then
echo "Login failed."
exit 0
else
cat << EOF
=== IMPORTANT ============================
Use 'passwd' to set your login password
this will disable telnet and enable SSH
------------------------------------------
EOF
}
fi
exec /bin/ash --login

21
package/busybox/files/telnet
View file

@ -1,17 +1,24 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2006 OpenWrt.org
# Copyright (C) 2006-2010 OpenWrt.org
START=50
has_root_pwd() {
local pwd=$([ -f "$1" ] && cat "$1")
pwd="${pwd#*root:}"
pwd="${pwd%%:*}"
test -n "${pwd#!}"
}
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/shadow 2>/dev/null ) || \
( [ \! -x /usr/sbin/dropbear ] && [ \! -x /usr/sbin/sshd ] )
then \
if ( ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
( [ ! -x /usr/sbin/dropbear ] && [ ! -x /usr/sbin/sshd ] );
then
telnetd -l /bin/login.sh
fi
}
stop() {
killall telnetd
killall telnetd 2>/dev/null
}