aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasilis Tsiligiannis <acinonyx@openwrt.gr>2011-02-07 21:45:02 +0000
committerVasilis Tsiligiannis <acinonyx@openwrt.gr>2011-02-07 21:45:02 +0000
commit0cd254bdee1f2575502e0c4c71e1ca2b7dfc5259 (patch)
treec443540ffbdf9e74078a8c3dc67116c0318ee29f
parent95ed53f5741c61e66841f1e90304fdad3c2a8a24 (diff)
downloadupstream-0cd254bdee1f2575502e0c4c71e1ca2b7dfc5259.tar.gz
upstream-0cd254bdee1f2575502e0c4c71e1ca2b7dfc5259.tar.bz2
upstream-0cd254bdee1f2575502e0c4c71e1ca2b7dfc5259.zip
busybox: Check if an SSH daemon is enabled before disabling telnet access (#8760)
SVN-Revision: 25411
-rwxr-xr-xpackage/busybox/files/telnet8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index a1e17275a3..f294c5590b 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
START=50
has_root_pwd() {
@@ -11,14 +11,14 @@ has_root_pwd() {
}
has_ssh_pubkey() {
- ( test -x /usr/sbin/dropbear && grep -qs "^ssh-" /etc/dropbear/authorized_keys ) || \
- ( test -x /usr/sbin/sshd && grep -qs "^ssh-" /root/.ssh/authorized_keys )
+ ( /etc/init.d/dropbear enabled 2> /dev/null && grep -qs "^ssh-" /etc/dropbear/authorized_keys ) || \
+ ( /etc/init.d/sshd enabled 2> /dev/null && grep -qs "^ssh-" /root/.ssh/authorized_keys )
}
start() {
if ( ! has_ssh_pubkey && \
! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
- ( [ ! -x /usr/sbin/dropbear ] && [ ! -x /usr/sbin/sshd ] );
+ ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
then
telnetd -l /bin/login.sh
fi