diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2006-11-06 09:27:44 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2006-11-06 09:27:44 +0000 |
| commit | 3d6bcc8818ed6bd71be7d2bc4b517a82f0ce7bfe (patch) | |
| tree | df220704b4374c5015ca23f7b2c6754be42a8ef4 | |
| parent | ea61e1e1d8b72390f435916c1ff64ce9094d3d48 (diff) | |
fix quoting for non-(c)sh login shells.
| -rw-r--r-- | regress/usr.bin/ssh/cfgmatch.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/regress/usr.bin/ssh/cfgmatch.sh b/regress/usr.bin/ssh/cfgmatch.sh index 3a789faab67..e6840f877bc 100644 --- a/regress/usr.bin/ssh/cfgmatch.sh +++ b/regress/usr.bin/ssh/cfgmatch.sh @@ -1,4 +1,4 @@ -# $OpenBSD: cfgmatch.sh,v 1.2 2006/07/22 01:50:00 dtucker Exp $ +# $OpenBSD: cfgmatch.sh,v 1.3 2006/11/06 09:27:43 markus Exp $ # Placed in the Public Domain. tid="sshd_config match" @@ -34,7 +34,7 @@ for p in 1 2; do rm -f $pidfile trace "match permitopen localhost proto $p" ${SSH} -$p $fwd -F $OBJ/ssh_config -f somehost \ - "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ + exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\ fail "match permitopen proto $p sshd failed" sleep 1; ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \ @@ -47,7 +47,7 @@ for p in 1 2; do rm -f $pidfile trace "match permitopen proxy proto $p" ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ - "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ + exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\ fail "match permitopen proxy proto $p sshd failed" sleep 1; ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ @@ -64,7 +64,7 @@ for p in 1 2; do rm -f $pidfile trace "match permitopen proxy w/key opts proto $p" ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ - "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ + exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\ fail "match permitopen w/key opt proto $p sshd failed" sleep 1; ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ @@ -78,7 +78,7 @@ for p in 1 2; do rm -f $pidfile trace "match permitopen localhost proto $p" ${SSH} -$p $fwd -F $OBJ/ssh_config -f somehost \ - "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ + exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\ fail "match permitopen proto $p sshd failed" sleep 1; ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \ @@ -96,7 +96,7 @@ for p in 1 2; do rm -f $pidfile trace "match permitopen proxy w/key opts proto $p" ${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ - "echo \$\$ > $pidfile; exec sleep 100" >>$TEST_SSH_LOGFILE 2>&1 ||\ + exec sh -c \'"echo \$\$ > $pidfile; exec sleep 100"\' >>$TEST_SSH_LOGFILE 2>&1 ||\ fail "match override permitopen proto $p sshd failed" sleep 1; ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ |