X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cce5cf4ccd3427b804952d4d53f47454c586f630..a3eeda1387d629c7f9f25e480bca2a0636835560:/package/dropbear/files/dropbear.init?ds=inline

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 85a90d02f..d5aa40310 100755
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -32,20 +32,34 @@ dropbear_start()
 	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 interface
+	local address
 	config_get port "${section}" Port
+	config_get interface "${section}" Interface
+	config_get address "${interface}" ipaddr
+	port="${address:+${address}:}${port}"
 	# 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=''
+	# E) root password authentication
+	local norootpasswd
+	local rootpassauth
+	config_get_bool rootpassauth "${section}" RootPasswordAuth 1
+	[ "${rootpassauth}" -eq 0 ] && norootpasswd=1
+	local rootloginallowed
+	local norootlogin
+	config_get_bool rootloginallowed "${section}" RootLogin 1
+	[ "${rootloginallowed}" -eq 0 ] && norootlogin=1
 	# 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 }${norootlogin:+-w }${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}"
@@ -81,6 +95,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
 }