summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-23 09:23:58 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-23 09:23:58 +1000
commit6eabe6430418fa9051500bed9ca4b1ffb377e3ec (patch)
tree420924c950f8040d7dd88ee32ea96ee93df2b243
parenta8c73d3b8c471aaeca90e8d82e28014608bf2707 (diff)
- dtucker@cvs.openbsd.org 2004/06/22 22:42:02
[regress/envpass.sh] Add quoting for test -z; ok markus@
-rw-r--r--ChangeLog6
-rw-r--r--regress/envpass.sh6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e8fe5b4f..ae05fc84 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 a5bae06d..5a7e178d 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