kernel: update ssb and bcma to linux-next next-20110627

[openwrt.git] / package / dropbear / files / dropbear.init

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 36c3700..aa7e07d 100755 (executable)
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -1,10 +1,11 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 # Copyright (C) 2006 Carlos Sobrinho
 
 NAME=dropbear
 PROG=/usr/sbin/dropbear
 START=50
+STOP=50
 PIDCOUNT=0
 EXTRA_COMMANDS="killclients"
 EXTRA_HELP="   killclients Kill ${NAME} processes except servers and yourself"
@@ -25,26 +26,37 @@ dropbear_start()
        # increase pid file count to handle multiple instances correctly
        PIDCOUNT="$(( ${PIDCOUNT} + 1))"
 
-       # prepare parameters
+       # prepare parameters (initialise with pid file)
+       local args="-P /var/run/${NAME}.${PIDCOUNT}.pid"
+       local val
        # A) password authentication
-       local nopasswd
-       local passauth
-       config_get_bool passauth "${section}" PasswordAuth 1
-       [ "${passauth}" -eq 0 ] && nopasswd=1
-       # B) listen port
-       local port
-       config_get port "${section}" Port
+       config_get_bool val "${section}" PasswordAuth 1
+       [ "${val}" -eq 0 ] && append args "-s"
+       # B) listen interface and port
+       local interface
+       local address
+       config_get interface "${section}" Interface
+       config_get address "${interface}" ipaddr
+       config_get val "${section}" Port
+       val="${address:+${address}:}${val}"
+       [ -n "${val}" ] && append args "-p ${val}"
        # C) banner file
-       local bannerfile
-       config_get bannerfile ${section} BannerFile
-       [ -f $bannerfile ] || bannerfile=''
+       config_get val "${section}" BannerFile
+       [ -f "${val}" ] && append args "-b ${val}"
        # D) gatewayports
-       local gatewayports
-       config_get_bool gatewayports "${section}" GatewayPorts 0
-       [ "${gatewayports}" -eq 1 ] || gatewayports=''
-       # concatenate parameters
-       local args
-       args="${nopasswd:+-s }${port:+-p ${port} }${bannerfile:+-b $bannerfile }${gatewayports:+-a }-P /var/run/${NAME}.${PIDCOUNT}.pid"
+       config_get_bool val "${section}" GatewayPorts 0
+       [ "${val}" -eq 1 ] && append args "-a"
+       # E) root password authentication
+       config_get_bool val "${section}" RootPasswordAuth 1
+       [ "${val}" -eq 0 ] && append args "-g"
+       # F) root login
+       config_get_bool val "${section}" RootLogin 1
+       [ "${val}" -eq 0 ] && append args "-w"
+       # G) host keys
+       config_get val "${section}" rsakeyfile
+       [ -f "${val}" ] && append args "-r ${val}"
+       config_get val "${section}" dsskeyfile
+       [ -f "${val}" ] && append args "-d ${val}"
 
        # execute program and return its exit code
        [ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"
@@ -80,6 +92,8 @@ start()
        [ -s /etc/dropbear/dropbear_rsa_host_key -a \
          -s /etc/dropbear/dropbear_dss_host_key ] || keygen
 
+       include /lib/network
+       scan_interfaces
        config_load "${NAME}"
        config_foreach dropbear_start dropbear
 }
@@ -90,7 +104,7 @@ stop()
        local pidfile
        for pidfile in `ls /var/run/${NAME}.*.pid`
         do
-               start-stop-daemon -K -s KILL -p "${pidfile}" -n "${NAME}" >/dev/null
+               start-stop-daemon -q -K -s KILL -p "${pidfile}" -n "${NAME}"
                rm -f "${pidfile}"
        done
        [ -z "${pidfile}" ] && echo "${initscript}: no pid files, if you get problems with start then try killclients"
@@ -111,12 +125,10 @@ killclients()
                [ "${pid}" -eq 0 ] && break
 
                # check if client connection
-               ps | grep -e "^[ ]*${pid} " | grep "${PROG}" >/dev/null
-               if [ $? -eq 0 ]
-                then
+               grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" && {
                        append ignore "${pid}"
                        break
-               fi
+               }
        done
 
        # get all server pids that should be ignored
@@ -129,9 +141,10 @@ killclients()
        local skip
        for pid in `pidof "${NAME}"`
         do
-               # check if correct program
-               ps | grep -e "^[ ]*${pid} " | grep "${PROG}" >/dev/null
-               [ $? -ne 0 ] && continue
+               # check if correct program, otherwise process next pid
+               grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" || {
+                       continue
+               }
 
                # check if pid should be ignored (servers, ourself)
                skip=0