summaryrefslogtreecommitdiff
path: root/regress/envpass.sh
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-05-25 11:01:01 +0000
committerColin Watson <cjwatson@debian.org>2005-05-25 11:01:01 +0000
commite88de75a1a236779a10e8ccbcc51d25308be8840 (patch)
tree7495477a2a7d0cac17a9fcded020b6ea816182ef /regress/envpass.sh
parent30a0f9443782cd9d7308acd09430bf586186aa55 (diff)
parent5d05471f6657646d1d6500c7c43134462c407ee6 (diff)
Merge 4.0p1 to the trunk.
Diffstat (limited to 'regress/envpass.sh')
-rw-r--r--regress/envpass.sh21
1 files changed, 15 insertions, 6 deletions
diff --git a/regress/envpass.sh b/regress/envpass.sh
index 5a7e178d8..af7eafe3d 100644
--- a/regress/envpass.sh
+++ b/regress/envpass.sh
@@ -1,13 +1,20 @@
1# $OpenBSD: envpass.sh,v 1.3 2004/06/22 22:42:02 dtucker Exp $ 1# $OpenBSD: envpass.sh,v 1.4 2005/03/04 08:48:46 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="environment passing" 4tid="environment passing"
5 5
6# NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST) 6# NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST)
7 7
8# Prepare a custom config to test for a configuration parsing bug fixed in 4.0
9cat << EOF > $OBJ/ssh_proxy_envpass
10Host test-sendenv-confparse-bug
11 SendEnv *
12EOF
13cat $OBJ/ssh_proxy >> $OBJ/ssh_proxy_envpass
14
8trace "pass env, don't accept" 15trace "pass env, don't accept"
9verbose "test $tid: pass env, don't accept" 16verbose "test $tid: pass env, don't accept"
10_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \ 17_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy_envpass otherhost \
11 sh << 'EOF' 18 sh << 'EOF'
12 test -z "$_TEST_ENV" 19 test -z "$_TEST_ENV"
13EOF 20EOF
@@ -18,7 +25,7 @@ fi
18 25
19trace "don't pass env, accept" 26trace "don't pass env, accept"
20verbose "test $tid: don't pass env, accept" 27verbose "test $tid: don't pass env, accept"
21${SSH} -F $OBJ/ssh_proxy otherhost \ 28_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -F $OBJ/ssh_proxy_envpass otherhost \
22 sh << 'EOF' 29 sh << 'EOF'
23 test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B" 30 test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B"
24EOF 31EOF
@@ -29,8 +36,8 @@ fi
29 36
30trace "pass single env, accept single env" 37trace "pass single env, accept single env"
31verbose "test $tid: pass single env, accept single env" 38verbose "test $tid: pass single env, accept single env"
32_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \ 39_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy_envpass \
33 sh << 'EOF' 40 otherhost sh << 'EOF'
34 test X"$_XXX_TEST" = X"blah" 41 test X"$_XXX_TEST" = X"blah"
35EOF 42EOF
36r=$? 43r=$?
@@ -41,7 +48,7 @@ fi
41trace "pass multiple env, accept multiple env" 48trace "pass multiple env, accept multiple env"
42verbose "test $tid: pass multiple env, accept multiple env" 49verbose "test $tid: pass multiple env, accept multiple env"
43_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \ 50_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \
44 -F $OBJ/ssh_proxy otherhost \ 51 -F $OBJ/ssh_proxy_envpass otherhost \
45 sh << 'EOF' 52 sh << 'EOF'
46 test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2" 53 test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2"
47EOF 54EOF
@@ -49,3 +56,5 @@ r=$?
49if [ $r -ne 0 ]; then 56if [ $r -ne 0 ]; then
50 fail "environment not found" 57 fail "environment not found"
51fi 58fi
59
60rm -f $OBJ/ssh_proxy_envpass