[oe-commits] Roman I Khimov : dropbear: support comma-separated list of addresses in port spec

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 44f496d37df485f16d67bcb88885c5f4437a002f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=44f496d37df485f16d67bcb88885c5f4437a002f

Author: Roman I Khimov <khimov at altell.ru>
Date:   Thu Jun  3 18:18:05 2010 +0400

dropbear: support comma-separated list of addresses in port spec

Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/dropbear/dropbear.inc  |    2 +-
 recipes/dropbear/dropbear/init |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc
index f0b621a..5da00f2 100644
--- a/recipes/dropbear/dropbear.inc
+++ b/recipes/dropbear/dropbear.inc
@@ -6,7 +6,7 @@ DEPENDS = "zlib"
 PROVIDES = "ssh sshd"
 RPROVIDES = "ssh sshd"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "\
   http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2 \
diff --git a/recipes/dropbear/dropbear/init b/recipes/dropbear/dropbear/init
index 5c8dfc1..275aa32 100755
--- a/recipes/dropbear/dropbear/init
+++ b/recipes/dropbear/dropbear/init
@@ -19,6 +19,9 @@ test "$NO_START" = "0" || exit 0
 test -x "$DAEMON" || exit 0
 test ! -h /var/service/dropbear || exit 0
 
+# Allows comma-separated list of addresses/ports
+DROPBEAR_PORT=`echo $DROPBEAR_PORT | sed "s/,/ -p /g"`
+
 readonly_rootfs=0
 for flag in `awk '{ if ($2 == "/") { split($4,FLAGS,",") } }; END { for (f in FLAGS) print FLAGS[f] }' </proc/mounts`; do
   case $flag in
@@ -74,7 +77,7 @@ case "$1" in
 	test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
 	start-stop-daemon -S \
 	  -x "$DAEMON" -- $KEY_ARGS \
-	    -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
+	    -p $DROPBEAR_PORT $DROPBEAR_EXTRA_ARGS
 	echo "$NAME."
 	;;
   stop)
@@ -91,7 +94,7 @@ case "$1" in
 	test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
 	start-stop-daemon -S \
 	  -x "$DAEMON" -- $KEY_ARGS \
-	    -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
+	    -p $DROPBEAR_PORT $DROPBEAR_EXTRA_ARGS
 	echo "$NAME."
 	;;
   *)