diff options
| author | Vasilis Tsiligiannis <acinonyx@openwrt.gr> | 2011-02-08 01:01:17 +0000 |
|---|---|---|
| committer | Vasilis Tsiligiannis <acinonyx@openwrt.gr> | 2011-02-08 01:01:17 +0000 |
| commit | 7de85846527ec38c759377999533b81feccf409f (patch) | |
| tree | 8cb9ac6ee5ed5646dc4174d85012531470adb374 | |
| parent | d063af3fcffc275e46543d65432d0d5d7565ac88 (diff) | |
| download | upstream-7de85846527ec38c759377999533b81feccf409f.tar.gz upstream-7de85846527ec38c759377999533b81feccf409f.tar.bz2 upstream-7de85846527ec38c759377999533b81feccf409f.zip | |
busybox: get root home dir from /etc/passwd in telnet init script (thanks tripolar)
SVN-Revision: 25417
| -rwxr-xr-x | package/busybox/files/telnet | 9 |
1 files changed, 8 insertions, 1 deletions
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() { |