- (dtucker) [regress/multiplex.sh] Put control socket in /tmp so running

   "make tests" works even if you'r building on a filesystem that doesn't
   support sockets.  From deengert at anl.gov, ok djm@

diff --git a/ChangeLog b/ChangeLog
index 3e6c90f5637d8ed66928813c922e6eb4063d9b3a..e70e717ec98a28648ab052b22d2e28a6bafde9bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
    ncsa.uiuc.edu; ok tim@
  - (dtucker) [regress/multiplex.sh] Remove cleanup call since test-exec.sh
    will clean up anyway.  From tim@
+ - (dtucker) [regress/multiplex.sh] Put control socket in /tmp so running
+   "make tests" works even if you'r building on a filesystem that doesn't
+   support sockets.  From deengert at anl.gov, ok djm@
 
 20050424
  - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or

diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index b346b096ef60d9c064a39748827debef54d379b6..a172e579052d03fa5bd4e658d10019f920a13e5f 100644 (file)
--- a/regress/multiplex.sh
+++ b/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"