Commit d5e7f50e authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Revert "sshserver: remove use of AuthorizedKeysFile2" 

It seems we may have some autobuild problems after this commit went
in. Trying to see if a revert helps to get them back.

This reverts commit 2716350d.
parent 1d7df9ed

tests/sshserver.pl

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -409,6 +409,7 @@ if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') { 
#  AllowTcpForwarding               : OpenSSH 2.3.0 and later

#  AllowUsers                       : OpenSSH 1.2.1 and later

#  AuthorizedKeysFile               : OpenSSH 2.9.9 and later

#  AuthorizedKeysFile2              : OpenSSH 2.9.9 and later

#  Banner                           : OpenSSH 2.5.0 and later

#  ChallengeResponseAuthentication  : OpenSSH 2.5.0 and later

#  Ciphers                          : OpenSSH 2.1.0 and later [3]
@@ -497,6 +498,7 @@ push @cfgarr, 'DenyGroups'; 
push @cfgarr, 'AllowGroups';

push @cfgarr, '#';

push @cfgarr, "AuthorizedKeysFile $clipubkeyf_config";

push @cfgarr, "AuthorizedKeysFile2 $clipubkeyf_config";

push @cfgarr, "HostKey $hstprvkeyf_config";

push @cfgarr, "PidFile $pidfile_config";

push @cfgarr, '#';