diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
commit | 4e1e258d1f5745f3dc05ead3cb834c445e6e8818 (patch) | |
tree | bfbc91107d6bfe7b2a68d8701562e59856116a6a /regress | |
parent | 4a20a0b23bd0e1db5e69f27c65aaa11a5a2eacd0 (diff) | |
parent | a55bd782aa819b7f5ae716de000f19f4f531850e (diff) |
Merge 4.1p1 to the trunk.
Diffstat (limited to 'regress')
-rw-r--r-- | regress/multiplex.sh | 6 | ||||
-rw-r--r-- | regress/test-exec.sh | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index e8cc1ac53..a172e5790 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,7 +1,7 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | CTL=$OBJ/ctl-sock | 4 | CTL=/tmp/openssh.regress.ctl-sock.$$ |
5 | 5 | ||
6 | tid="connection multiplexing" | 6 | tid="connection multiplexing" |
7 | 7 | ||
@@ -89,6 +89,4 @@ ${SSH} -S $CTL -Oexit otherhost || fail "send exit command failed" | |||
89 | # Wait for master to exit | 89 | # Wait for master to exit |
90 | sleep 2 | 90 | sleep 2 |
91 | 91 | ||
92 | ps -p $MASTER_PID >/dev/null && fail "exit command failed" | 92 | kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed" |
93 | |||
94 | cleanup | ||
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 4e53449be..bd0c025ba 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -197,7 +197,7 @@ cat << EOF > $OBJ/sshd_config | |||
197 | #ListenAddress ::1 | 197 | #ListenAddress ::1 |
198 | PidFile $PIDFILE | 198 | PidFile $PIDFILE |
199 | AuthorizedKeysFile $OBJ/authorized_keys_%u | 199 | AuthorizedKeysFile $OBJ/authorized_keys_%u |
200 | LogLevel DEBUG | 200 | LogLevel VERBOSE |
201 | AcceptEnv _XXX_TEST_* | 201 | AcceptEnv _XXX_TEST_* |
202 | AcceptEnv _XXX_TEST | 202 | AcceptEnv _XXX_TEST |
203 | Subsystem sftp $SFTPSERVER | 203 | Subsystem sftp $SFTPSERVER |