- djm@cvs.openbsd.org 2005/05/20 23:14:15

     [regress/test-exec.sh]
     force addressfamily=inet for tests, unbreaking dynamic-forward regress for
     recently committed nc SOCKS5 changes

diff --git a/ChangeLog b/ChangeLog
index aa2ebd1e30f071c1ca187d5d491e6415a7685fa5..7903c97c72055af0f895c65def5729aa8e8c221e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,15 @@
    - dtucker@cvs.openbsd.org 2005/03/10 10:20:39
      [regress/forwarding.sh]
      Regress test for ClearAllForwardings (bz #994); ok markus@
+   - 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
+   - djm@cvs.openbsd.org 2005/05/20 23:14:15
+     [regress/test-exec.sh]
+     force addressfamily=inet for tests, unbreaking dynamic-forward regress for
+     recently committed nc SOCKS5 changes
 
 20060129
  - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index de643154e1546365a2d8c754cf45181f4f030e82..bfbb305b4ed01087b6a2251c24aa07ef0ccc7770 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.27 2005/02/27 11:33:30 dtucker Exp $
+#      $OpenBSD: test-exec.sh,v 1.28 2005/05/20 23:14:15 djm Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -194,6 +194,7 @@ trap fatal 3 2
 cat << EOF > $OBJ/sshd_config
        StrictModes             no
        Port                    $PORT
+       AddressFamily           inet
        ListenAddress           127.0.0.1
        #ListenAddress          ::1
        PidFile                 $PIDFILE