- (djm) Sync regress tests to OpenBSD:

[openssh.git] / regress / test-exec.sh

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index bd0c025ba2b11ef716b565484728e2f9445cb304..de643154e1546365a2d8c754cf45181f4f030e82 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -96,9 +96,10 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then
 fi
 
 # Path to sshd must be absolute for rexec
-if [ ! -x /$SSHD ]; then
-       SSHD=`which sshd`
-fi
+case "$SSHD" in
+/*) ;;
+*) SSHD=`which sshd` ;;
+esac
 
 if [ "x$TEST_SSH_LOGFILE" = "x" ]; then
        TEST_SSH_LOGFILE=/dev/null
@@ -243,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