[openssh-commits] [openssh] 01/02: upstream: fix test: -F is the argument to specify a non-default

git+noreply at mindrot.org git+noreply at mindrot.org
Wed Aug 28 22:10:02 AEST 2024


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 16eaf9d401e70996f89f3f417738a8db421aa959
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Wed Aug 28 12:08:26 2024 +0000

    upstream: fix test: -F is the argument to specify a non-default
    
    ssh_config, not -f (this is sadly not a new bug)
    
    OpenBSD-Regress-ID: 45a7bda4cf33f2cea218507d8b6a55cddbcfb322
---
 regress/rekey.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/regress/rekey.sh b/regress/rekey.sh
index 1f68a101..3f5e1d55 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: rekey.sh,v 1.29 2024/08/22 10:21:02 dtucker Exp $
+#	$OpenBSD: rekey.sh,v 1.30 2024/08/28 12:08:26 djm Exp $
 #	Placed in the Public Domain.
 
 tid="rekey"
@@ -184,7 +184,7 @@ for size in 16 1k 1K 1m 1M 1g 1G 4G 8G; do
 		4g|4G)	bytes=4294967296 ;;
 		8g|8G)	bytes=8589934592 ;;
 	esac
-	b=`${SSH} -G -o "rekeylimit $size" -f $OBJ/ssh_proxy host | \
+	b=`${SSH} -G -o "rekeylimit $size" -F $OBJ/ssh_proxy host | \
 	    awk '/rekeylimit/{print $2}'`
 	if [ "$bytes" != "$b" ]; then
 		fatal "rekeylimit size: expected $bytes bytes got $b"
@@ -200,7 +200,7 @@ for time in 1 1m 1M 1h 1H 1d 1D 1w 1W; do
 		1d|1D)	seconds=86400 ;;
 		1w|1W)	seconds=604800 ;;
 	esac
-	s=`${SSH} -G -o "rekeylimit default $time" -f $OBJ/ssh_proxy host | \
+	s=`${SSH} -G -o "rekeylimit default $time" -F $OBJ/ssh_proxy host | \
 	    awk '/rekeylimit/{print $3}'`
 	if [ "$seconds" != "$s" ]; then
 		fatal "rekeylimit time: expected $time seconds got $s"

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list