From 25dcbbcf7df04697886f58769f75fa9e16bdf7e4 Mon Sep 17 00:00:00 2001 From: Sevan Janiyan Date: Sun, 16 Apr 2023 23:21:21 +0100 Subject: [PATCH] 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 --- tests/sshserver.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 0b4ce20dca..2a69561892 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'; -- 2.47.3