svn commit: r226046 - in head: crypto/openssh crypto/openssh/openbsd-compat secure/usr.sbin/sshd

[Bjoern A. Zeeb]

On 5. Oct 2011, at 22:08 , Dag-Erling Smorgrav wrote:

> Author: des
> Date: Wed Oct  5 22:08:17 2011
> New Revision: 226046
> URL: http://svn.freebsd.org/changeset/base/226046
> 
> Log:
>  Upgrade to OpenSSH 5.9p1.
> 
>  MFC after:	3 months

Mergemaster brought up this change:

+# 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


This will break setups that have authorized_keys2 files (only) and needs to
be reverted I think?

-- 
Bjoern A. Zeeb                                 You have to have visions!
         Stop bit received. Insert coin for new address family.