diff options
| author | Damien Miller <djm@mindrot.org> | 2011-05-29 13:39:36 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-05-29 13:39:36 +0200 |
| commit | d8478b6a9b32760d47c2419279c4a73f5f88fdb6 (patch) | |
| tree | b62b256606749fbb784ab7c2c7baa610c2a7dd71 /pathnames.h | |
| parent | - dtucker@cvs.openbsd.org 2011/05/20 06:32:30 (diff) | |
| download | openssh-d8478b6a9b32760d47c2419279c4a73f5f88fdb6.tar.xz openssh-d8478b6a9b32760d47c2419279c4a73f5f88fdb6.zip | |
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 'pathnames.h')
| -rw-r--r-- | pathnames.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pathnames.h b/pathnames.h index 787bdb676..c3d9abff5 100644 --- a/pathnames.h +++ b/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.21 2011/05/11 04:47:06 djm Exp $ */ +/* $OpenBSD: pathnames.h,v 1.22 2011/05/23 03:30:07 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -96,6 +96,9 @@ */ #define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" +/* backward compat for protocol v2 */ +#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" + /* * Per-user and system-wide ssh "rc" files. These files are executed with * /bin/sh before starting the shell or command if they exist. They will be |