diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2005-03-04 08:48:47 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2005-03-04 08:48:47 +0000 |
| commit | a902b3157432c30758ef8198543277a848832d10 (patch) | |
| tree | a3856b5d4a932e31b33f62e8aac9214094238fe8 /regress | |
| parent | d1d59fc36bd46b4d5550e8131a010f302bfdcc3b (diff) | |
regress test for SendEnv config parsing bug; ok dtucker@
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/ssh/Makefile | 4 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/envpass.sh | 21 |
2 files changed, 17 insertions, 8 deletions
diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile index c17afbd0c45..4b2bf222aa3 100644 --- a/regress/usr.bin/ssh/Makefile +++ b/regress/usr.bin/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2005/01/14 04:21:18 david Exp $ +# $OpenBSD: Makefile,v 1.36 2005/03/04 08:48:46 djm Exp $ REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 @@ -45,7 +45,7 @@ CLEANFILES+= authorized_keys_${USER} known_hosts pidfile \ rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ ls.copy banner.in banner.out empty.in \ - scp-ssh-wrapper.exe + scp-ssh-wrapper.exe ssh_proxy_envpass #LTESTS+= ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp diff --git a/regress/usr.bin/ssh/envpass.sh b/regress/usr.bin/ssh/envpass.sh index 5a7e178d810..af7eafe3d16 100644 --- a/regress/usr.bin/ssh/envpass.sh +++ b/regress/usr.bin/ssh/envpass.sh @@ -1,13 +1,20 @@ -# $OpenBSD: envpass.sh,v 1.3 2004/06/22 22:42:02 dtucker Exp $ +# $OpenBSD: envpass.sh,v 1.4 2005/03/04 08:48:46 djm Exp $ # Placed in the Public Domain. tid="environment passing" # NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST) +# Prepare a custom config to test for a configuration parsing bug fixed in 4.0 +cat << EOF > $OBJ/ssh_proxy_envpass +Host test-sendenv-confparse-bug + SendEnv * +EOF +cat $OBJ/ssh_proxy >> $OBJ/ssh_proxy_envpass + trace "pass env, don't accept" verbose "test $tid: pass env, don't accept" -_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \ +_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy_envpass otherhost \ sh << 'EOF' test -z "$_TEST_ENV" EOF @@ -18,7 +25,7 @@ fi trace "don't pass env, accept" verbose "test $tid: don't pass env, accept" -${SSH} -F $OBJ/ssh_proxy otherhost \ +_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -F $OBJ/ssh_proxy_envpass otherhost \ sh << 'EOF' test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B" EOF @@ -29,8 +36,8 @@ fi trace "pass single env, accept single env" verbose "test $tid: pass single env, accept single env" -_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \ - sh << 'EOF' +_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy_envpass \ + otherhost sh << 'EOF' test X"$_XXX_TEST" = X"blah" EOF r=$? @@ -41,7 +48,7 @@ fi trace "pass multiple env, accept multiple env" verbose "test $tid: pass multiple env, accept multiple env" _XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \ - -F $OBJ/ssh_proxy otherhost \ + -F $OBJ/ssh_proxy_envpass otherhost \ sh << 'EOF' test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2" EOF @@ -49,3 +56,5 @@ r=$? if [ $r -ne 0 ]; then fail "environment not found" fi + +rm -f $OBJ/ssh_proxy_envpass |