diff options
| author | des <des@FreeBSD.org> | 2013-03-18 10:50:50 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-03-18 10:50:50 +0000 |
| commit | 153ad47126cbadda6dba7eb27a7fbae81d7d120e (patch) | |
| tree | 2d54445843f37db0006932f73397b639a5e75cbc /crypto/openssh | |
| parent | 7479840eb88c237a735d25cf9f01cc3a07cef955 (diff) | |
| download | FreeBSD-src-153ad47126cbadda6dba7eb27a7fbae81d7d120e.zip FreeBSD-src-153ad47126cbadda6dba7eb27a7fbae81d7d120e.tar.gz | |
Keep the default AuthorizedKeysFile setting. Although authorized_keys2
has been deprecated for a while, some people still use it and were
unpleasantly surprised by this change.
I may revert this commit at a later date if I can come up with a way
to give users who still have authorized_keys2 files sufficient advance
warning.
MFC after: ASAP
Diffstat (limited to 'crypto/openssh')
| -rw-r--r-- | crypto/openssh/sshd_config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 48345f5..437424d 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -50,8 +50,7 @@ #PubkeyAuthentication yes # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys +#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 #AuthorizedPrincipalsFile none |
