aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/files
diff options
context:
space:
mode:
authorDaniel Dickinson <crazycshore@gmail.com>2010-07-18 15:18:38 +0000
committerDaniel Dickinson <crazycshore@gmail.com>2010-07-18 15:18:38 +0000
commit8974bc6ae28c1a90529f700f145ebe7e7c501e84 (patch)
tree39471d3b1af53259116323753766aafb33d44d97 /package/busybox/files
parent370e1f64dea4542709e9ab07b921fb5545e589dc (diff)
downloadupstream-8974bc6ae28c1a90529f700f145ebe7e7c501e84.tar.gz
upstream-8974bc6ae28c1a90529f700f145ebe7e7c501e84.tar.bz2
upstream-8974bc6ae28c1a90529f700f145ebe7e7c501e84.zip
base-files & telnet: Fixed telnet starting even with root password when shadow passwords in use.
SVN-Revision: 22279
Diffstat (limited to 'package/busybox/files')
-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