diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-29 21:39:36 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-29 21:39:36 +1000 |
commit | d8478b6a9b32760d47c2419279c4a73f5f88fdb6 (patch) | |
tree | b62b256606749fbb784ab7c2c7baa610c2a7dd71 /sshd.8 | |
parent | acacced70b3fd520ee3f12d3f477f9fd7c2f687a (diff) |
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@
Diffstat (limited to 'sshd.8')
-rw-r--r-- | sshd.8 | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd.8,v 1.260 2010/10/28 18:33:28 jmc Exp $ | 36 | .\" $OpenBSD: sshd.8,v 1.261 2011/05/23 03:30:07 djm Exp $ |
37 | .Dd $Mdocdate: October 28 2010 $ | 37 | .Dd $Mdocdate: May 23 2011 $ |
38 | .Dt SSHD 8 | 38 | .Dt SSHD 8 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -462,10 +462,12 @@ is run, and if that | |||
462 | does not exist either, xauth is used to add the cookie. | 462 | does not exist either, xauth is used to add the cookie. |
463 | .Sh AUTHORIZED_KEYS FILE FORMAT | 463 | .Sh AUTHORIZED_KEYS FILE FORMAT |
464 | .Cm AuthorizedKeysFile | 464 | .Cm AuthorizedKeysFile |
465 | specifies the file containing public keys for | 465 | specifies the file or files containing public keys for |
466 | public key authentication; | 466 | public key authentication; |
467 | if none is specified, the default is | 467 | if none is specified, the default is both |
468 | .Pa ~/.ssh/authorized_keys . | 468 | .Pa ~/.ssh/authorized_keys |
469 | and | ||
470 | .Pa ~/.ssh/authorized_keys2 . | ||
469 | Each line of the file contains one | 471 | Each line of the file contains one |
470 | key (empty lines and lines starting with a | 472 | key (empty lines and lines starting with a |
471 | .Ql # | 473 | .Ql # |