mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-23 11:31:06 +02:00
package/dropbear: simplify & reduce init script size (closes #7985)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23118 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
76dacb06e8
commit
db4dc9eb53
@ -26,40 +26,32 @@ dropbear_start()
|
|||||||
# increase pid file count to handle multiple instances correctly
|
# increase pid file count to handle multiple instances correctly
|
||||||
PIDCOUNT="$(( ${PIDCOUNT} + 1))"
|
PIDCOUNT="$(( ${PIDCOUNT} + 1))"
|
||||||
|
|
||||||
# prepare parameters
|
# prepare parameters (initialise with pid file)
|
||||||
|
local args="-P /var/run/${NAME}.${PIDCOUNT}.pid"
|
||||||
|
local val
|
||||||
# A) password authentication
|
# A) password authentication
|
||||||
local nopasswd
|
config_get_bool val "${section}" PasswordAuth 1
|
||||||
local passauth
|
[ "${val}" -eq 0 ] && append args "-s"
|
||||||
config_get_bool passauth "${section}" PasswordAuth 1
|
|
||||||
[ "${passauth}" -eq 0 ] && nopasswd=1
|
|
||||||
# B) listen interface and port
|
# B) listen interface and port
|
||||||
local port
|
|
||||||
local interface
|
local interface
|
||||||
local address
|
local address
|
||||||
config_get port "${section}" Port
|
|
||||||
config_get interface "${section}" Interface
|
config_get interface "${section}" Interface
|
||||||
config_get address "${interface}" ipaddr
|
config_get address "${interface}" ipaddr
|
||||||
port="${address:+${address}:}${port}"
|
config_get val "${section}" Port
|
||||||
|
val="${address:+${address}:}${val}"
|
||||||
|
[ -n "${val}" ] && append args "-p ${val}"
|
||||||
# C) banner file
|
# C) banner file
|
||||||
local bannerfile
|
config_get val "${section}" BannerFile
|
||||||
config_get bannerfile "${section}" BannerFile
|
[ -f "${val}" ] && append args "-b ${val}"
|
||||||
[ -f "$bannerfile" ] || bannerfile=''
|
|
||||||
# D) gatewayports
|
# D) gatewayports
|
||||||
local gatewayports
|
config_get_bool val "${section}" GatewayPorts 0
|
||||||
config_get_bool gatewayports "${section}" GatewayPorts 0
|
[ "${val}" -eq 1 ] && append args "-a"
|
||||||
[ "${gatewayports}" -eq 1 ] || gatewayports=''
|
|
||||||
# E) root password authentication
|
# E) root password authentication
|
||||||
local norootpasswd
|
config_get_bool val "${section}" RootPasswordAuth 1
|
||||||
local rootpassauth
|
[ "${val}" -eq 0 ] && append args "-g"
|
||||||
config_get_bool rootpassauth "${section}" RootPasswordAuth 1
|
# F) root login
|
||||||
[ "${rootpassauth}" -eq 0 ] && norootpasswd=1
|
config_get_bool val "${section}" RootLogin 1
|
||||||
local rootloginallowed
|
[ "${val}" -eq 0 ] && append args "-w"
|
||||||
local norootlogin
|
|
||||||
config_get_bool rootloginallowed "${section}" RootLogin 1
|
|
||||||
[ "${rootloginallowed}" -eq 0 ] && norootlogin=1
|
|
||||||
# concatenate parameters
|
|
||||||
local args
|
|
||||||
args="${nopasswd:+-s }${norootpasswd:+-g }${norootlogin:+-w }${port:+-p ${port} }${bannerfile:+-b $bannerfile }${gatewayports:+-a }-P /var/run/${NAME}.${PIDCOUNT}.pid"
|
|
||||||
|
|
||||||
# execute program and return its exit code
|
# execute program and return its exit code
|
||||||
[ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"
|
[ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user