aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-07-18 18:36:12 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-07-18 18:36:12 +0000
commit1dd824a358ca3f33bbc3f53ef021b638eb8d0d3a (patch)
treec268bcf9c2542211d058b814ac4b641374886724 /package/busybox/files
parent8974bc6ae28c1a90529f700f145ebe7e7c501e84 (diff)
downloadupstream-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/busybox/files')
-rwxr-xr-xpackage/busybox/files/telnet21
1 files changed, 14 insertions, 7 deletions
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
}
+