aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authorDaniel Dickinson <daniel@cshore.neomailbox.net>2010-07-18 15:18:38 +0000
committerDaniel Dickinson <daniel@cshore.neomailbox.net>2010-07-18 15:18:38 +0000
commitb98d2df29574ff92346b7aa05da132be39c8daaa (patch)
tree93f23114e06dc96646b6335733a2c9fdc0ccef76 /package/busybox
parent734780f95022e2f01d0e81dd22ca1583d43a7ff1 (diff)
downloadupstream-b98d2df29574ff92346b7aa05da132be39c8daaa.tar.gz
upstream-b98d2df29574ff92346b7aa05da132be39c8daaa.tar.bz2
upstream-b98d2df29574ff92346b7aa05da132be39c8daaa.zip
[package] base-files & telnet: Fixed telnet starting even with root password when shadow passwords in use.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22279 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox')
-rwxr-xr-xpackage/busybox/files/telnet3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index 082aba7e90..2fbbb23575 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -4,7 +4,8 @@ START=50
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/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 \
telnetd -l /bin/login.sh