summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--envpass.sh44
2 files changed, 5 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog
index 738741405..f5d6b0e6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120051201
2 - (djm) [envpass.sh] Remove regress script that was accidentally committed
3 in top level directory and not noticed for over a year :)
4
120051129 520051129
2 - (tim) [ssh-keygen.c] Move DSA length test after setting default when 6 - (tim) [ssh-keygen.c] Move DSA length test after setting default when
3 bits == 0. 7 bits == 0.
@@ -3385,4 +3389,4 @@
3385 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3389 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3386 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3390 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3387 3391
3388$Id: ChangeLog,v 1.4015 2005/11/29 02:40:34 tim Exp $ 3392$Id: ChangeLog,v 1.4016 2005/12/01 01:51:59 djm Exp $
diff --git a/envpass.sh b/envpass.sh
deleted file mode 100644
index 67044d421..000000000
--- a/envpass.sh
+++ /dev/null
@@ -1,44 +0,0 @@
1# $OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $
2# Placed in the Public Domain.
3
4tid="environment passing"
5
6# NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST)
7
8trace "pass env, don't accept"
9verbose "test $tid: pass env, don't accept"
10_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
11 '[ -z "$_TEST_ENV" ]'
12r=$?
13if [ $r -ne 0 ]; then
14 fail "environment found"
15fi
16
17trace "don't pass env, accept"
18verbose "test $tid: don't pass env, accept"
19${SSH} -F $OBJ/ssh_proxy otherhost \
20 '[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]'
21r=$?
22if [ $r -ne 0 ]; then
23 fail "environment found"
24fi
25
26trace "pass single env, accept single env"
27verbose "test $tid: pass single env, accept single env"
28_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \
29 '[ "x$_XXX_TEST" = "xblah" ]'
30r=$?
31if [ $r -ne 0 ]; then
32 fail "environment not found"
33fi
34
35trace "pass multiple env, accept multiple env"
36verbose "test $tid: pass multiple env, accept multiple env"
37_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \
38 -F $OBJ/ssh_proxy otherhost \
39 '[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]'
40r=$?
41if [ $r -ne 0 ]; then
42 fail "environment not found"
43fi
44