From faec5ca73f27d4fe5a0d6c2075de8031160037b0 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 24 Nov 2005 23:18:54 +1100 Subject: - (dtucker) [regress/test-exec.sh] Use 1024 bit keys since we generate so many and use them only once. Speeds up testing on older/slower hardware. --- regress/test-exec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'regress/test-exec.sh') diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 4b3a70eb3..de643154e 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -244,7 +244,7 @@ trace "generate keys" for t in rsa rsa1; do # generate user key rm -f $OBJ/$t - ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ + ${SSHKEYGEN} -b 1024 -q -N '' -t $t -f $OBJ/$t ||\ fail "ssh-keygen for $t failed" # known hosts file for client -- cgit v1.2.3 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(-) (limited to 'regress/test-exec.sh') 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 From e682cb07803f71ec01e15394ac8445431cfda176 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 1 Feb 2006 11:21:01 +1100 Subject: - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to determine the user's login name - needed for regress tests on Solaris 10 and OpenSolaris --- ChangeLog | 7 ++++++- regress/test-exec.sh | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'regress/test-exec.sh') diff --git a/ChangeLog b/ChangeLog index 8d7e1ccc3..dfd6db809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +20060201 + - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to + determine the user's login name - needed for regress tests on Solaris + 10 and OpenSolaris + 20060131 - (djm) OpenBSD CVS Sync - jmc@cvs.openbsd.org 2006/01/20 11:21:45 @@ -3798,4 +3803,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.4112 2006/01/31 11:11:37 djm Exp $ +$Id: ChangeLog,v 1.4113 2006/02/01 00:21:01 djm Exp $ diff --git a/regress/test-exec.sh b/regress/test-exec.sh index bfbb305b4..59ae33c08 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -24,6 +24,8 @@ if [ -x /usr/ucb/whoami ]; then USER=`/usr/ucb/whoami` elif whoami >/dev/null 2>&1; then USER=`whoami` +elif logname >/dev/null 2>&1; then + USER=`logname` else USER=`id -un` fi -- cgit v1.2.3