[tools] mm-macros: update to 0.9.5

[openwrt.git] / package / busybox / files / telnet

diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
index f294c55..994e713 100755 (executable)
--- a/package/busybox/files/telnet
+++ b/package/busybox/files/telnet
@@ -1,5 +1,6 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006-2011 OpenWrt.org
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006-2011 OpenWrt.org

+

 START=50
 
 has_root_pwd() {
 START=50
 
 has_root_pwd() {


@@ -7,12 +8,19 @@ has_root_pwd() {
              pwd="${pwd#*root:}"
              pwd="${pwd%%:*}"
 
              pwd="${pwd#*root:}"
              pwd="${pwd%%:*}"
 

-       test -n "${pwd#!}"
+       test -n "${pwd#[\!x]}"
+}
+
+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 ) || \
 }
 
 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() {
 }
 
 start() {


@@ -20,11 +28,10 @@ start() {
             ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
           ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
        then
             ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
           ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
        then

-               telnetd -l /bin/login.sh
+               service_start /usr/sbin/telnetd -l /bin/login.sh

        fi
 }
 
 stop() {
        fi
 }
 
 stop() {

-       killall telnetd 2>/dev/null
+       service_stop /usr/sbin/telnetd

 }
 }

-