Explorar o código

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

SVN-Revision: 25417
Vasilis Tsiligiannis %!s(int64=15) %!d(string=hai) anos
pai
achega
7de8584652
Modificáronse 1 ficheiros con 8 adicións e 1 borrados
  1. 8 1
      package/busybox/files/telnet

+ 8 - 1
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() {