From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Tue, 8 Feb 2011 01:01:17 +0000 (+0000)
Subject: busybox: get root home dir from /etc/passwd in telnet init script (thanks tripolar)
X-Git-Tag: reboot~17634
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7de85846527ec38c759377999533b81feccf409f;p=oweals%2Fopenwrt.git

busybox: get root home dir from /etc/passwd in telnet init script (thanks tripolar)

SVN-Revision: 25417
---

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() {