2014-12-05 17:58:25 +00:00
|
|
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
|
Date: Fri, 5 Dec 2014 18:57:16 +0100
|
|
|
|
|
Subject: busybox: enable telnet only when root password is really empty, not when it is locked
|
|
|
|
|
|
|
|
|
|
diff --git a/package/utils/busybox/files/telnet b/package/utils/busybox/files/telnet
|
2016-12-20 00:09:53 +00:00
|
|
|
index a1d1cdf9b18d69895e7a08a8b1318f1ff591ea07..f95be90490597f6251d8c3e1247b522dfd9e72c0 100755
|
2014-12-05 17:58:25 +00:00
|
|
|
--- a/package/utils/busybox/files/telnet
|
|
|
|
|
+++ b/package/utils/busybox/files/telnet
|
|
|
|
|
@@ -11,7 +11,7 @@ has_root_pwd() {
|
|
|
|
|
pwd="${pwd#*root:}"
|
|
|
|
|
pwd="${pwd%%:*}"
|
|
|
|
|
|
|
|
|
|
- test -n "${pwd#[\!x]}"
|
|
|
|
|
+ test -n "${pwd}"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
get_root_home() {
|
|
|
|
|
@@ -28,7 +28,7 @@ has_ssh_pubkey() {
|
|
|
|
|
|
|
|
|
|
start_service() {
|
|
|
|
|
if ( ! has_ssh_pubkey && \
|
|
|
|
|
- ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
|
|
|
|
|
+ ( ! has_root_pwd /etc/passwd || ! has_root_pwd /etc/shadow ) ) || \
|
|
|
|
|
( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
|
|
|
|
|
then
|
|
|
|
|
procd_open_instance
|
