diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-18 18:36:12 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-18 18:36:12 +0000 |
| commit | 1dd824a358ca3f33bbc3f53ef021b638eb8d0d3a (patch) | |
| tree | c268bcf9c2542211d058b814ac4b641374886724 /package | |
| parent | 8974bc6ae28c1a90529f700f145ebe7e7c501e84 (diff) | |
| download | upstream-1dd824a358ca3f33bbc3f53ef021b638eb8d0d3a.tar.gz upstream-1dd824a358ca3f33bbc3f53ef021b638eb8d0d3a.tar.bz2 upstream-1dd824a358ca3f33bbc3f53ef021b638eb8d0d3a.zip | |
base-files, busybox: fix 22279, simplify code and get rid of awk
SVN-Revision: 22282
Diffstat (limited to 'package')
| -rwxr-xr-x | package/base-files/files/bin/login.sh | 21 | ||||
| -rwxr-xr-x | package/busybox/files/telnet | 21 |
2 files changed, 20 insertions, 22 deletions
diff --git a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh index 00f2f81ab4..a64c84e1e2 100755 --- a/package/base-files/files/bin/login.sh +++ b/package/base-files/files/bin/login.sh @@ -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 diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet index 2fbbb23575..b8823379b9 100755 --- a/package/busybox/files/telnet +++ b/package/busybox/files/telnet @@ -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 } + |