sync with OpenBSD -current
This commit is contained in:
parent
be37d2a32b
commit
5ef25cadd3
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: dynamic-forward.sh,v 1.16 2023/01/11 00:51:27 djm Exp $
|
||||
# $OpenBSD: dynamic-forward.sh,v 1.17 2024/03/08 11:34:10 dtucker Exp $
|
||||
# Placed in the Public Domain.
|
||||
|
||||
tid="dynamic forwarding"
|
||||
@ -51,9 +51,9 @@ check_socks() {
|
||||
for s in 4 5; do
|
||||
for h in 127.0.0.1 localhost; do
|
||||
trace "testing ssh socks version $s host $h (-$direction)"
|
||||
${REAL_SSH} -q -F $OBJ/ssh_config \
|
||||
-o "ProxyCommand ${proxycmd}${s} $h $PORT 2>/dev/null" \
|
||||
somehost cat ${DATA} > ${COPY}
|
||||
${REAL_SSH} -q -F $OBJ/ssh_config -o \
|
||||
"ProxyCommand ${TEST_SHELL} -c '${proxycmd}${s} $h $PORT 2>/dev/null'" \
|
||||
somehost cat ${DATA} > ${COPY}
|
||||
r=$?
|
||||
if [ "x$expect_success" = "xY" ] ; then
|
||||
if [ $r -ne 0 ] ; then
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: test-exec.sh,v 1.107 2024/02/19 09:25:52 dtucker Exp $
|
||||
# $OpenBSD: test-exec.sh,v 1.108 2024/03/08 11:34:10 dtucker Exp $
|
||||
# Placed in the Public Domain.
|
||||
|
||||
#SUDO=sudo
|
||||
@ -63,6 +63,9 @@ DBCLIENT=/usr/local/bin/dbclient
|
||||
DROPBEARKEY=/usr/local/bin/dropbearkey
|
||||
DROPBEARCONVERT=/usr/local/bin/dropbearconvert
|
||||
|
||||
# So we can override this in Portable.
|
||||
TEST_SHELL="${TEST_SHELL:-/bin/sh}"
|
||||
|
||||
# Tools used by multiple tests
|
||||
NC=nc
|
||||
OPENSSL_BIN="${OPENSSL_BIN:-openssl}"
|
||||
|
Loading…
Reference in New Issue
Block a user