summaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-18 18:36:12 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-18 18:36:12 +0000
commit825dbb37aaba84f1b341dc6647ba71f89bb6faa6 (patch)
treeb21b76cda5df920295ec1dc7230ec75eea5617fb /package/busybox
parentb1acaee34372be92b3f635bc30318a3dcca7bd4f (diff)
[package] base-files, busybox: fix 22279, simplify code and get rid of awk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22282 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox')
-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 2fbbb2357..b8823379b 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
}
+