ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 21:58:04 +00:00
Code Issues Actions 6 Packages Projects Releases 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 #!/bin/sh
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
if grep -qs '^root:[^!]' /etc/passwd /etc/shadow && [ -z "$FAILSAFE" ]; then
regpassresult="0" echo "Login failed."
grep '^root:[^!]' /etc/passwd >&- 2>&- exit 0
regpassresult="$?" else
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
} || {
cat << EOF cat << EOF
=== IMPORTANT ============================ === IMPORTANT ============================
Use 'passwd' to set your login password Use 'passwd' to set your login password
this will disable telnet and enable SSH this will disable telnet and enable SSH
------------------------------------------ ------------------------------------------
EOF EOF
} fi
exec /bin/ash --login exec /bin/ash --login

21
package/busybox/files/telnet
View File

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