From d8478b6a9b32760d47c2419279c4a73f5f88fdb6 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 29 May 2011 21:39:36 +1000
Subject: OpenBSD CVS Sync    - djm@cvs.openbsd.org 2011/05/23 03:30:07     
 [auth-rsa.c auth.c auth.h auth2-pubkey.c monitor.c monitor_wrap.c pathnames.h
 servconf.c servconf.h sshd.8 sshd_config sshd_config.5]      allow
 AuthorizedKeysFile to specify multiple files, separated by spaces.      Bring
 back authorized_keys2 as a default search path (to avoid breaking     
 existing users of this file), but override this in sshd_config so it will    
  be no longer used on fresh installs. Maybe in 2015 we can remove it     
 entierly :)

     feedback and ok markus@ dtucker@
---
 sshd.8 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'sshd.8')

diff --git a/sshd.8 b/sshd.8
index 5503b1331..8e007d100 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.260 2010/10/28 18:33:28 jmc Exp $
-.Dd $Mdocdate: October 28 2010 $
+.\" $OpenBSD: sshd.8,v 1.261 2011/05/23 03:30:07 djm Exp $
+.Dd $Mdocdate: May 23 2011 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -462,10 +462,12 @@ is run, and if that
 does not exist either, xauth is used to add the cookie.
 .Sh AUTHORIZED_KEYS FILE FORMAT
 .Cm AuthorizedKeysFile
-specifies the file containing public keys for
+specifies the file or files containing public keys for
 public key authentication;
-if none is specified, the default is
-.Pa ~/.ssh/authorized_keys .
+if none is specified, the default is both
+.Pa ~/.ssh/authorized_keys
+and
+.Pa ~/.ssh/authorized_keys2 .
 Each line of the file contains one
 key (empty lines and lines starting with a
 .Ql #
-- 
cgit v1.2.3