From 76be6b8765f88b72c354941b523efbefa14561fe Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 31 Jan 2006 21:59:01 +1100 Subject: - 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 --- ChangeLog | 11 ++++++++++- regress/test-exec.sh | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf9e53bcf..cb5a6fc48 100644 --- 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 @@ -3762,4 +3771,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4102 2006/01/31 10:58:23 djm Exp $ +$Id: ChangeLog,v 1.4104 2006/01/31 10:59:01 djm Exp $ diff --git a/regress/test-exec.sh b/regress/test-exec.sh index de643154e..bfbb305b4 100644 --- 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 -- cgit v1.2.3