diff options
| author | des <des@FreeBSD.org> | 2005-06-05 15:41:57 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-05 15:41:57 +0000 |
| commit | c4dfc1ed3bdacd05d73791b2c8f8b580511a939f (patch) | |
| tree | 08ccf47ce923e292d8f5057f36d34f042b7a5e6d /crypto/openssh/regress | |
| parent | 11a09ab416e21c995885dc0e5847151627094217 (diff) | |
| download | FreeBSD-src-c4dfc1ed3bdacd05d73791b2c8f8b580511a939f.zip FreeBSD-src-c4dfc1ed3bdacd05d73791b2c8f8b580511a939f.tar.gz | |
Vendor import of OpenSSH 4.1p1.
Diffstat (limited to 'crypto/openssh/regress')
| -rw-r--r-- | crypto/openssh/regress/multiplex.sh | 6 | ||||
| -rw-r--r-- | crypto/openssh/regress/test-exec.sh | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/crypto/openssh/regress/multiplex.sh b/crypto/openssh/regress/multiplex.sh index e8cc1ac..a172e57 100644 --- a/crypto/openssh/regress/multiplex.sh +++ b/crypto/openssh/regress/multiplex.sh @@ -1,7 +1,7 @@ # $OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $ # Placed in the Public Domain. -CTL=$OBJ/ctl-sock +CTL=/tmp/openssh.regress.ctl-sock.$$ tid="connection multiplexing" @@ -89,6 +89,4 @@ ${SSH} -S $CTL -Oexit otherhost || fail "send exit command failed" # Wait for master to exit sleep 2 -ps -p $MASTER_PID >/dev/null && fail "exit command failed" - -cleanup +kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed" diff --git a/crypto/openssh/regress/test-exec.sh b/crypto/openssh/regress/test-exec.sh index 4e53449..bd0c025 100644 --- a/crypto/openssh/regress/test-exec.sh +++ b/crypto/openssh/regress/test-exec.sh @@ -197,7 +197,7 @@ cat << EOF > $OBJ/sshd_config #ListenAddress ::1 PidFile $PIDFILE AuthorizedKeysFile $OBJ/authorized_keys_%u - LogLevel DEBUG + LogLevel VERBOSE AcceptEnv _XXX_TEST_* AcceptEnv _XXX_TEST Subsystem sftp $SFTPSERVER |
