summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2014-07-23 00:04:02 +0000
committerdtucker <dtucker>2014-07-23 00:04:02 +0000
commit8a19336af3f1fc44a6fe59a11d0eb31788565dc4 (patch)
treea905b78e37bb056582368b35114af0197e620247
parent3f97be0e9e7b648f4d8eef518ae47e86d6c1b684 (diff)
downloadopenssh-8a19336af3f1fc44a6fe59a11d0eb31788565dc4.tar.gz
- djm@cvs.openbsd.org 2014/07/22 01:32:12
[regress/multiplex.sh] change the test for still-open Unix domain sockets to be robust against nc implementations that produce error messages. from -portable (Id sync only)
-rw-r--r--ChangeLog5
-rw-r--r--regress/multiplex.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e4bb9d9..db6e1d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,11 @@
Convert from <sys/endian.h> to the shiney new <endian.h>
ok dtucker@, who also confirmed that -portable handles this already
(ID sync only, includes.h pulls in endian.h if available.)
+ - djm@cvs.openbsd.org 2014/07/22 01:32:12
+ [regress/multiplex.sh]
+ change the test for still-open Unix domain sockets to be robust against
+ nc implementations that produce error messages. from -portable
+ (Id sync only)
20140721
- OpenBSD CVS Sync
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 16bb5042..fc32d13e 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: multiplex.sh,v 1.24 2014/07/15 15:54:15 millert Exp $
+# $OpenBSD: multiplex.sh,v 1.25 2014/07/22 01:32:12 djm Exp $
# Placed in the Public Domain.
CTL=/tmp/openssh.regress.ctl-sock.$$