summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-07-23 10:04:02 +1000
committerDarren Tucker <dtucker@zip.com.au>2014-07-23 10:04:02 +1000
commitcea099a7c4eaecb01b001e5453bb4e5c25006c22 (patch)
tree7de2670c16b668683683158d585bbe2b5584550f
parent31eb78078d349b32ea41952ecc944b3ad6cb0d45 (diff)
- 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 3e4bb9d92..db6e1d999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,11 @@
15 Convert from <sys/endian.h> to the shiney new <endian.h> 15 Convert from <sys/endian.h> to the shiney new <endian.h>
16 ok dtucker@, who also confirmed that -portable handles this already 16 ok dtucker@, who also confirmed that -portable handles this already
17 (ID sync only, includes.h pulls in endian.h if available.) 17 (ID sync only, includes.h pulls in endian.h if available.)
18 - djm@cvs.openbsd.org 2014/07/22 01:32:12
19 [regress/multiplex.sh]
20 change the test for still-open Unix domain sockets to be robust against
21 nc implementations that produce error messages. from -portable
22 (Id sync only)
18 23
1920140721 2420140721
20 - OpenBSD CVS Sync 25 - OpenBSD CVS Sync
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 16bb5042f..fc32d13e3 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.24 2014/07/15 15:54:15 millert Exp $ 1# $OpenBSD: multiplex.sh,v 1.25 2014/07/22 01:32:12 djm 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.$$