27 lines
903 B
Diff
27 lines
903 B
Diff
|
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
|
||
|
|
index a1d1cdf..f95be90 100755
|
||
|
|
--- 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
|