summaryrefslogtreecommitdiff
path: root/tests/sshserver.pl
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-03-22 10:43:55 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-03-22 10:43:55 +0100
commitd5e7f50e6394cf92e5d9d133ec0b6dabdc4561f8 (patch)
treedfcf6636df3096502e41fd74356b1af9b0508aee /tests/sshserver.pl
parent1d7df9ed7a30b2de92cd3fcc4addd2b650c48de9 (diff)
downloadcurl-d5e7f50e6394cf92e5d9d133ec0b6dabdc4561f8.tar.gz
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 2716350d1f3edc8e929f6ceeee05051090f6d642.
Diffstat (limited to 'tests/sshserver.pl')
-rwxr-xr-xtests/sshserver.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index 6471406d7..b0c0229b6 100755
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -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, '#';