declare ssh_gssapi_krb5_updatecreds() before reference

[gssapi-openssh.git] / openssh / regress / envpass.sh

diff --git a/openssh/regress/envpass.sh b/openssh/regress/envpass.sh
index af7eafe3d16ee4e52d7c2afb36cc1079a6d856ce..5a7e178d8107f6de002cbf074fca2e885aa84be1 100644 (file)
--- a/openssh/regress/envpass.sh
+++ b/openssh/regress/envpass.sh
@@ -1,20 +1,13 @@
-#      $OpenBSD: envpass.sh,v 1.4 2005/03/04 08:48:46 djm Exp $
+#      $OpenBSD: envpass.sh,v 1.3 2004/06/22 22:42:02 dtucker 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_envpass otherhost \
+_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
        sh << 'EOF'
        test -z "$_TEST_ENV"
 EOF
@@ -25,7 +18,7 @@ fi
 
 trace "don't pass env, accept"
 verbose "test $tid: don't pass env, accept"
-_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -F $OBJ/ssh_proxy_envpass otherhost \
+${SSH} -F $OBJ/ssh_proxy otherhost \
        sh << 'EOF'
        test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B"
 EOF
@@ -36,8 +29,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_envpass \
-    otherhost sh << 'EOF'
+_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \
+       sh << 'EOF'
        test X"$_XXX_TEST" = X"blah"
 EOF
 r=$?
@@ -48,7 +41,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_envpass otherhost \
+    -F $OBJ/ssh_proxy otherhost \
        sh << 'EOF'
        test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2"
 EOF
@@ -56,5 +49,3 @@ r=$?
 if [ $r -ne 0 ]; then
        fail "environment not found"
 fi
-
-rm -f $OBJ/ssh_proxy_envpass