summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authoracinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-02 18:50:50 +0000
committeracinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-02 18:50:50 +0000
commitd3c45eaee122516d0620bb523d09661a8e6f71ca (patch)
treed9469fec9ea86ec2aee9608de06c97cf79117e88 /package
parent1bba18de7a6c725ad4758393d329d50222a18f15 (diff)
[package] busybox: Disable telnet if an SSH public key for root exists (#8760)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25317 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rwxr-xr-xpackage/busybox/files/telnet8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index b8823379b9..a1e17275a3 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -10,8 +10,14 @@ has_root_pwd() {
test -n "${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 )
+}
+
start() {
- if ( ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
+ if ( ! has_ssh_pubkey && \
+ ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
( [ ! -x /usr/sbin/dropbear ] && [ ! -x /usr/sbin/sshd ] );
then
telnetd -l /bin/login.sh