From c7f651009e0df6a117bf7c6a726440a8963e251b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 18 Jul 2010 18:36:12 +0000 Subject: [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 --- package/busybox/files/telnet | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'package/busybox') 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 } + -- cgit v1.2.3