From d8e4e69a3233d8f3aa730bd39a574157aed5083f Mon Sep 17 00:00:00 2001
From: acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 8 Feb 2011 01:01:17 +0000
Subject: [PATCH] [package] busybox: get root home dir from /etc/passwd in
telnet init script (thanks tripolar)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25417 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/busybox/files/telnet | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index f294c5590b..88f8af9d75 100755
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -10,9 +10,16 @@ has_root_pwd() {
test -n "${pwd#!}"
}
+get_root_home() {
+ local homedir=$([ -f "$1" ] && cat "$1")
+ homedir="${homedir#*:*:0:0:*:}"
+
+ echo "${homedir%%:*}"
+}
+
has_ssh_pubkey() {
( /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 )
+ ( /etc/init.d/sshd enabled 2> /dev/null && grep -qs "^ssh-" "$(get_root_home /etc/passwd)"/.ssh/authorized_keys )
}
start() {
--
GitLab