summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-31 21:57:27 +1100
committerDamien Miller <djm@mindrot.org>2006-01-31 21:57:27 +1100
commitc34940c1f522b09ffe7086dea0253ebe5c104417 (patch)
treebd97d26c09beefccbb5e63470703059cd9f50f97
parentedaeff5b9dbb47d24597c1e65d250b7e98b0a20e (diff)
- dtucker@cvs.openbsd.org 2005/04/25 09:54:09
[regress/multiplex.sh] Don't call cleanup in multiplex as test-exec will cleanup anyway found by tim@, ok djm@ NB. ID sync only, we already had this
-rw-r--r--ChangeLog11
-rw-r--r--regress/multiplex.sh2
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b98fc9115..d58050a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,15 @@
33 fix local arbitrary command execution vulnerability on local/local and 33 fix local arbitrary command execution vulnerability on local/local and
34 remote/remote copies (CVE-2006-0225, bz #1094), patch by 34 remote/remote copies (CVE-2006-0225, bz #1094), patch by
35 t8m AT centrum.cz, polished by dtucker@ and myself; ok markus@ 35 t8m AT centrum.cz, polished by dtucker@ and myself; ok markus@
36 - (djm) Sync regress tests to OpenBSD:
37 - dtucker@cvs.openbsd.org 2005/03/10 10:20:39
38 [regress/forwarding.sh]
39 Regress test for ClearAllForwardings (bz #994); ok markus@
40 - dtucker@cvs.openbsd.org 2005/04/25 09:54:09
41 [regress/multiplex.sh]
42 Don't call cleanup in multiplex as test-exec will cleanup anyway
43 found by tim@, ok djm@
44 NB. ID sync only, we already had this
36 45
3720060129 4620060129
38 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the 47 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
@@ -3758,4 +3767,4 @@
3758 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3767 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3759 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3768 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3760 3769
3761$Id: ChangeLog,v 1.4101 2006/01/31 10:49:27 djm Exp $ 3770$Id: ChangeLog,v 1.4103 2006/01/31 10:58:38 djm Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index a172e5790..4fba7b5ac 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $ 1# $OpenBSD: multiplex.sh,v 1.11 2005/04/25 09:54:09 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4CTL=/tmp/openssh.regress.ctl-sock.$$ 4CTL=/tmp/openssh.regress.ctl-sock.$$