Skip to content

Commit

Permalink
Keep the default AuthorizedKeysFile setting. Although authorized_keys2
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dag-erling committed Mar 18, 2013
1 parent 7479840 commit 153ad47
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions crypto/openssh/sshd_config
Expand Up @@ -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

Expand Down

0 comments on commit 153ad47

Please sign in to comment.