[package] busybox: get root home dir from /etc/passwd in telnet init script (thanks...
authorVasilis Tsiligiannis <acinonyx@openwrt.gr>
Tue, 8 Feb 2011 01:01:17 +0000 (01:01 +0000)
committerVasilis Tsiligiannis <acinonyx@openwrt.gr>
Tue, 8 Feb 2011 01:01:17 +0000 (01:01 +0000)
SVN-Revision: 25417

package/busybox/files/telnet

index f294c55..88f8af9 100755 (executable)
@@ -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() {