diff options
| author | Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr> | 2011-02-07 21:45:02 +0000 |
|---|---|---|
| committer | Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr> | 2011-02-07 21:45:02 +0000 |
| commit | d3dddd3f7ed259534b7a71ad6b0f8e3ec7e52291 (patch) | |
| tree | 8b18011515702da1709ee8aae82ea7f6deaaed86 | |
| parent | e1f1b1074e658be3e4d2c2c302d798073acbf75a (diff) | |
| download | upstream-d3dddd3f7ed259534b7a71ad6b0f8e3ec7e52291.tar.gz upstream-d3dddd3f7ed259534b7a71ad6b0f8e3ec7e52291.tar.bz2 upstream-d3dddd3f7ed259534b7a71ad6b0f8e3ec7e52291.zip | |
[package] busybox: Check if an SSH daemon is enabled before disabling telnet access (#8760)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25411 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/busybox/files/telnet | 8 |
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 |