X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d4e077a6dcdb0eb7c608ebc0b91ed577b5c1be16..bebb0ec8a15f2314b9232811e523adb91dcb9de4:/package/dropbear/files/dropbear.init

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 4ee130c3a..d5aa40310 100755
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 # Copyright (C) 2006 Carlos Sobrinho
 
 NAME=dropbear
@@ -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
 }
@@ -91,7 +107,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"
@@ -112,12 +128,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
@@ -130,9 +144,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