RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2006/11/06 09:27:43 

[regress/cfgmatch.sh]
     fix quoting for non-(c)sh login shells.
This commit is contained in:
Damien Miller 2007-10-26 14:44:34 +10:00
parent fa66aa739f
commit 99ad35352a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -59,6 +59,9 @@
- djm@cvs.openbsd.org 2006/08/29 09:44:00 - djm@cvs.openbsd.org 2006/08/29 09:44:00
[regress/sftp-cmds.sh] [regress/sftp-cmds.sh]
clean up our mess clean up our mess
- markus@cvs.openbsd.org 2006/11/06 09:27:43
[regress/cfgmatch.sh]
fix quoting for non-(c)sh login shells.
20070927 20070927
- (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if
@ -3330,4 +3333,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4772 2007/10/26 04:43:50 djm Exp $ $Id: ChangeLog,v 1.4773 2007/10/26 04:44:34 djm Exp $

12
regress/cfgmatch.sh
View File

@ -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. # Placed in the Public Domain.
tid="sshd_config match" tid="sshd_config match"
@ -35,7 +35,7 @@ for p in 1 2; do
rm -f $pidfile rm -f $pidfile
trace "match permitopen localhost proto $p" trace "match permitopen localhost proto $p"
${SSH} -$p $fwd -F $OBJ/ssh_config -f somehost \ ${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" fail "match permitopen proto $p sshd failed"
sleep 1; sleep 1;
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \ ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \
@ -48,7 +48,7 @@ for p in 1 2; do
rm -f $pidfile rm -f $pidfile
trace "match permitopen proxy proto $p" trace "match permitopen proxy proto $p"
${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ ${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" fail "match permitopen proxy proto $p sshd failed"
sleep 1; sleep 1;
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \
@ -65,7 +65,7 @@ for p in 1 2; do
rm -f $pidfile rm -f $pidfile
trace "match permitopen proxy w/key opts proto $p" trace "match permitopen proxy w/key opts proto $p"
${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ ${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" fail "match permitopen w/key opt proto $p sshd failed"
sleep 1; sleep 1;
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \
@ -79,7 +79,7 @@ for p in 1 2; do
rm -f $pidfile rm -f $pidfile
trace "match permitopen localhost proto $p" trace "match permitopen localhost proto $p"
${SSH} -$p $fwd -F $OBJ/ssh_config -f somehost \ ${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" fail "match permitopen proto $p sshd failed"
sleep 1; sleep 1;
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \ ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true || \
@ -97,7 +97,7 @@ for p in 1 2; do
rm -f $pidfile rm -f $pidfile
trace "match permitopen proxy w/key opts proto $p" trace "match permitopen proxy w/key opts proto $p"
${SSH} -q -$p $fwd -F $OBJ/ssh_proxy -f somehost \ ${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" fail "match override permitopen proto $p sshd failed"
sleep 1; sleep 1;
${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \ ${SSH} -q -$p -p $fwdport -F $OBJ/ssh_config somehost true && \