summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/usr.bin/ssh/dynamic-forward.sh5
-rw-r--r--regress/usr.bin/ssh/test-exec.sh9
2 files changed, 9 insertions, 5 deletions
diff --git a/regress/usr.bin/ssh/dynamic-forward.sh b/regress/usr.bin/ssh/dynamic-forward.sh
index 6a485ec6fdf..7d93f536704 100644
--- a/regress/usr.bin/ssh/dynamic-forward.sh
+++ b/regress/usr.bin/ssh/dynamic-forward.sh
@@ -1,10 +1,9 @@
-# $OpenBSD: dynamic-forward.sh,v 1.3 2004/02/28 12:16:57 dtucker Exp $
+# $OpenBSD: dynamic-forward.sh,v 1.4 2004/06/22 22:55:56 dtucker Exp $
# Placed in the Public Domain.
tid="dynamic forwarding"
-PORT=4242
-FWDPORT=4243
+FWDPORT=`expr $PORT + 1`
if [ -x "`which nc`" ] && nc -h 2>&1 | grep "proxy address" >/dev/null; then
proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh
index 18357a5fbe1..9d1b1734ed9 100644
--- a/regress/usr.bin/ssh/test-exec.sh
+++ b/regress/usr.bin/ssh/test-exec.sh
@@ -1,11 +1,16 @@
-# $OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $
+# $OpenBSD: test-exec.sh,v 1.21 2004/06/22 22:55:56 dtucker Exp $
# Placed in the Public Domain.
-PORT=4242
USER=`id -un`
SUDO=
#SUDO=sudo
+if [ ! -z "$TEST_SSH_PORT" ]; then
+ PORT="$TEST_SSH_PORT"
+else
+ PORT=4242
+fi
+
OBJ=$1
if [ "x$OBJ" = "x" ]; then
echo '$OBJ not defined'