summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSevan Janiyan <venture37@geeklan.co.uk>2023-04-16 23:21:21 +0100
committerDan Fandrich <dan@coneharvesters.com>2023-04-18 12:50:12 -0700
commit25dcbbcf7df04697886f58769f75fa9e16bdf7e4 (patch)
treea3104ec99ccaad0057cce242495ec31aea0a793d
parentdb82878afd5abf8d185c27e95f571dc217368ded (diff)
downloadcurl-25dcbbcf7df04697886f58769f75fa9e16bdf7e4.tar.gz
tests/sshserver.pl: Define AddressFamily earlier
As the comment states "Address family must be specified before ListenAddress", otherwise the tests fail to run `"failed starting SSH server" 52 times (582, 583, 600, 601, 602, 603, 604, 605, 606 and 43 more)` Closes #10983
-rwxr-xr-xtests/sshserver.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index 0b4ce20dc..2a6956189 100755
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -577,6 +577,7 @@ push @cfgarr, "AuthorizedKeysFile2 $clipubkeyf_config";
push @cfgarr, "HostKey $hstprvkeyf_config";
if ($sshdid !~ /OpenSSH-Windows/) {
push @cfgarr, "PidFile $pidfile_config";
+ push @cfgarr, '#';
}
if(($sshdid =~ /OpenSSH/) && ($sshdvernum >= 880)) {
push @cfgarr, 'HostKeyAlgorithms +ssh-rsa';
@@ -725,7 +726,7 @@ push @cfgarr, '#';
#
if(sshd_supports_opt('AddressFamily','any')) {
# Address family must be specified before ListenAddress
- splice @cfgarr, 14, 0, 'AddressFamily any';
+ splice @cfgarr, 11, 0, 'AddressFamily any';
}
if(sshd_supports_opt('Compression','no')) {
push @cfgarr, 'Compression no';