From 9fe95da3ea9f8f0a53f4c2144348e8258900472b Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Jun 2004 20:33:55 +1000
Subject: Add missing regress/envpass.sh

---
 regress/envpass.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 regress/envpass.sh

(limited to 'regress/envpass.sh')

diff --git a/regress/envpass.sh b/regress/envpass.sh
new file mode 100644
index 000000000..67044d421
--- /dev/null
+++ b/regress/envpass.sh
@@ -0,0 +1,44 @@
+#	$OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $
+#	Placed in the Public Domain.
+
+tid="environment passing"
+
+# NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST)
+
+trace "pass env, don't accept"
+verbose "test $tid: pass env, don't accept"
+_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
+	'[ -z "$_TEST_ENV" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment found"
+fi
+
+trace "don't pass env, accept"
+verbose "test $tid: don't pass env, accept"
+${SSH} -F $OBJ/ssh_proxy otherhost \
+	'[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment found"
+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 \
+	'[ "x$_XXX_TEST" = "xblah" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment not found"
+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 \
+	'[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]'
+r=$?
+if [ $r -ne 0 ]; then
+	fail "environment not found"
+fi
+
-- 
cgit v1.2.3


From 430c6a1552e25a1163e6fa1bade9a276791679a6 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 22 Jun 2004 13:38:56 +1000
Subject:    - markus@cvs.openbsd.org 2004/06/22 03:12:13     
 [regress/envpass.sh regress/multiplex.sh]      more portable env passing
 tests

---
 ChangeLog            |  5 ++++-
 regress/envpass.sh   | 19 +++++++++++++------
 regress/multiplex.sh |  9 +++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'regress/envpass.sh')

diff --git a/ChangeLog b/ChangeLog
index 00864980a..f5a1b14c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@
      [sftp.c]
      don't show .files by default in ls, add -a option to turn them back on;
      ok markus
+   - markus@cvs.openbsd.org 2004/06/22 03:12:13
+     [regress/envpass.sh regress/multiplex.sh]
+     more portable env passing tests
  - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket".
  - (dtucker) [defines.h] Define __dead if not already defined.
 
@@ -1362,4 +1365,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3430 2004/06/22 03:37:11 mouring Exp $
+$Id: ChangeLog,v 1.3431 2004/06/22 03:38:56 dtucker Exp $
diff --git a/regress/envpass.sh b/regress/envpass.sh
index 67044d421..a5bae06dd 100644
--- a/regress/envpass.sh
+++ b/regress/envpass.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $
+#	$OpenBSD: envpass.sh,v 1.2 2004/06/22 03:12:13 markus Exp $
 #	Placed in the Public Domain.
 
 tid="environment passing"
@@ -8,7 +8,9 @@ tid="environment passing"
 trace "pass env, don't accept"
 verbose "test $tid: pass env, don't accept"
 _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
-	'[ -z "$_TEST_ENV" ]'
+	sh << 'EOF'
+	test -z $_TEST_ENV
+EOF
 r=$?
 if [ $r -ne 0 ]; then
 	fail "environment found"
@@ -17,7 +19,9 @@ fi
 trace "don't pass env, accept"
 verbose "test $tid: don't pass env, accept"
 ${SSH} -F $OBJ/ssh_proxy otherhost \
-	'[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]'
+	sh << 'EOF'
+	test -z $_XXX_TEST_A && test -z $_XXX_TEST_B
+EOF
 r=$?
 if [ $r -ne 0 ]; then
 	fail "environment found"
@@ -26,7 +30,9 @@ 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 \
-	'[ "x$_XXX_TEST" = "xblah" ]'
+	sh << 'EOF'
+	test X"$_XXX_TEST" = X"blah"
+EOF
 r=$?
 if [ $r -ne 0 ]; then
 	fail "environment not found"
@@ -36,9 +42,10 @@ 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 \
-	'[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]'
+	sh << 'EOF'
+	test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2"
+EOF
 r=$?
 if [ $r -ne 0 ]; then
 	fail "environment not found"
 fi
-
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index c167b9632..dbf2025be 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.7 2004/06/18 06:15:51 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.8 2004/06/22 03:12:13 markus Exp $
 #	Placed in the Public Domain.
 
 CTL=$OBJ/ctl-sock
@@ -11,12 +11,13 @@ COPY=$OBJ/ls.copy
 start_sshd
 
 trace "start master, fork to background"
-${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST"  -f somehost \
-	sleep 120
+${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost sleep 120
 
 verbose "test $tid: envpass"
 trace "env passing over multiplexed connection"
-_XXX_TEST=blah ${SSH} -S$CTL otherhost '[ "x$_XXX_TEST" = "xblah" ]'
+_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -S$CTL otherhost sh << 'EOF'
+	test X"$_XXX_TEST" = X"blah"
+EOF
 if [ $? -ne 0 ]; then
 	fail "environment not found"
 fi
-- 
cgit v1.2.3


From 6eabe6430418fa9051500bed9ca4b1ffb377e3ec Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 23 Jun 2004 09:23:58 +1000
Subject:    - dtucker@cvs.openbsd.org 2004/06/22 22:42:02     
 [regress/envpass.sh]      Add quoting for test -z; ok markus@

---
 ChangeLog          | 6 +++++-
 regress/envpass.sh | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'regress/envpass.sh')

diff --git a/ChangeLog b/ChangeLog
index e8fe5b4ff..ae05fc84c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
    connections with empty passwords.  Patch from davidwu at nbttech.com,
    ok djm@
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2004/06/22 22:42:02
+     [regress/envpass.sh]
+     Add quoting for test -z; ok markus@
 
 20040622
  - (bal) [auth-passwd.c auth1.c] Clean up unused variables.
@@ -1374,4 +1378,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3433 2004/06/22 23:17:54 dtucker Exp $
+$Id: ChangeLog,v 1.3434 2004/06/22 23:23:58 dtucker Exp $
diff --git a/regress/envpass.sh b/regress/envpass.sh
index a5bae06dd..5a7e178d8 100644
--- a/regress/envpass.sh
+++ b/regress/envpass.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: envpass.sh,v 1.2 2004/06/22 03:12:13 markus Exp $
+#	$OpenBSD: envpass.sh,v 1.3 2004/06/22 22:42:02 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="environment passing"
@@ -9,7 +9,7 @@ trace "pass env, don't accept"
 verbose "test $tid: pass env, don't accept"
 _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \
 	sh << 'EOF'
-	test -z $_TEST_ENV
+	test -z "$_TEST_ENV"
 EOF
 r=$?
 if [ $r -ne 0 ]; then
@@ -20,7 +20,7 @@ trace "don't pass env, accept"
 verbose "test $tid: don't pass env, accept"
 ${SSH} -F $OBJ/ssh_proxy otherhost \
 	sh << 'EOF'
-	test -z $_XXX_TEST_A && test -z $_XXX_TEST_B
+	test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B"
 EOF
 r=$?
 if [ $r -ne 0 ]; then
-- 
cgit v1.2.3