package/kernel: renable kmod-input on 2.4 (closes: #7063)

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

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 85a90d0..fabf54e 100755 (executable)
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -32,20 +32,30 @@ dropbear_start()
        local passauth
        config_get_bool passauth "${section}" PasswordAuth 1
        [ "${passauth}" -eq 0 ] && nopasswd=1
        local passauth
        config_get_bool passauth "${section}" PasswordAuth 1
        [ "${passauth}" -eq 0 ] && nopasswd=1

-       # B) listen port
+       # B) listen interface and port

        local port
        local port

+       local interface
+       local address

        config_get port "${section}" Port
        config_get port "${section}" Port

+       config_get interface "${section}" Interface
+       config_get address "${interface}" ipaddr
+       port="${address:+${address}:}${port}"

        # C) banner file
        local bannerfile
        # C) banner file
        local bannerfile

-       config_get bannerfile ${section} BannerFile
-       [ -f $bannerfile ] || bannerfile=''
+       config_get bannerfile "${section}" BannerFile
+       [ -f "$bannerfile" ] || bannerfile=''

        # D) gatewayports
        local gatewayports
        config_get_bool gatewayports "${section}" GatewayPorts 0
        [ "${gatewayports}" -eq 1 ] || gatewayports=''
        # D) gatewayports
        local gatewayports
        config_get_bool gatewayports "${section}" GatewayPorts 0
        [ "${gatewayports}" -eq 1 ] || gatewayports=''

+       # E) root password authentication
+       local norootpasswd
+       local rootpassauth
+       config_get_bool rootpassauth "${section}" RootPasswordAuth 1
+       [ "${rootpassauth}" -eq 0 ] && norootpasswd=1

        # concatenate parameters
        local args
        # concatenate parameters
        local args

-       args="${nopasswd:+-s }${port:+-p ${port} }${bannerfile:+-b $bannerfile }${gatewayports:+-a }-P /var/run/${NAME}.${PIDCOUNT}.pid"
+       args="${nopasswd:+-s }${norootpasswd:+-g }${port:+-p ${port} }${bannerfile:+-b $bannerfile }${gatewayports:+-a }-P /var/run/${NAME}.${PIDCOUNT}.pid"

 
        # execute program and return its exit code
        [ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"
 
        # execute program and return its exit code
        [ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"


@@ -81,6 +91,8 @@ start()
        [ -s /etc/dropbear/dropbear_rsa_host_key -a \
          -s /etc/dropbear/dropbear_dss_host_key ] || keygen
 
        [ -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
 }
        config_load "${NAME}"
        config_foreach dropbear_start dropbear
 }