diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/multiplex.sh | 23 |
2 files changed, 22 insertions, 6 deletions
@@ -38,6 +38,9 @@ | |||
38 | - djm@cvs.openbsd.org 2004/10/29 23:59:22 | 38 | - djm@cvs.openbsd.org 2004/10/29 23:59:22 |
39 | [Makefile added brokenkeys.sh] | 39 | [Makefile added brokenkeys.sh] |
40 | regression test for handling of corrupt keys in authorized_keys file | 40 | regression test for handling of corrupt keys in authorized_keys file |
41 | - djm@cvs.openbsd.org 2004/11/07 00:32:41 | ||
42 | [multiplex.sh] | ||
43 | regression tests for new multiplex commands | ||
41 | 44 | ||
42 | 20041203 | 45 | 20041203 |
43 | - (dtucker) OpenBSD CVS Sync | 46 | - (dtucker) OpenBSD CVS Sync |
@@ -1911,4 +1914,4 @@ | |||
1911 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1914 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1912 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1915 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1913 | 1916 | ||
1914 | $Id: ChangeLog,v 1.3595 2004/12/06 12:07:37 dtucker Exp $ | 1917 | $Id: ChangeLog,v 1.3596 2004/12/06 12:12:15 dtucker Exp $ |
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index c0adf109f..15e518c86 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.8 2004/06/22 03:12:13 markus Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.9 2004/11/07 00:32:41 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | CTL=$OBJ/ctl-sock | 4 | CTL=$OBJ/ctl-sock |
@@ -17,7 +17,11 @@ COPY=$OBJ/ls.copy | |||
17 | start_sshd | 17 | start_sshd |
18 | 18 | ||
19 | trace "start master, fork to background" | 19 | trace "start master, fork to background" |
20 | ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost sleep 120 | 20 | ${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost & |
21 | MASTER_PID=$! | ||
22 | |||
23 | # Wait for master to start and authenticate | ||
24 | sleep 5 | ||
21 | 25 | ||
22 | verbose "test $tid: envpass" | 26 | verbose "test $tid: envpass" |
23 | trace "env passing over multiplexed connection" | 27 | trace "env passing over multiplexed connection" |
@@ -75,6 +79,15 @@ for s in 0 1 4 5 44; do | |||
75 | fi | 79 | fi |
76 | done | 80 | done |
77 | 81 | ||
78 | # kill master, remove control socket. ssh -MS will exit when sleep exits | 82 | trace "test check command" |
79 | $SUDO kill `cat $PIDFILE` | 83 | ${SSH} -S $CTL -Ocheck otherhost || fail "check command failed" |
80 | rm -f $CTL | 84 | |
85 | trace "test exit command" | ||
86 | ${SSH} -S $CTL -Oexit otherhost || fail "send exit command failed" | ||
87 | |||
88 | # Wait for master to exit | ||
89 | sleep 2 | ||
90 | |||
91 | ps -p $MASTER_PID >/dev/null && fail "exit command failed" | ||
92 | |||
93 | cleanup | ||