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 /auth.c | |
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 'auth.c')
-rw-r--r-- | auth.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.92 2011/05/11 04:47:06 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.93 2011/05/23 03:30:07 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -331,7 +331,7 @@ auth_root_allowed(char *method) | |||
331 | * | 331 | * |
332 | * This returns a buffer allocated by xmalloc. | 332 | * This returns a buffer allocated by xmalloc. |
333 | */ | 333 | */ |
334 | static char * | 334 | char * |
335 | expand_authorized_keys(const char *filename, struct passwd *pw) | 335 | expand_authorized_keys(const char *filename, struct passwd *pw) |
336 | { | 336 | { |
337 | char *file, ret[MAXPATHLEN]; | 337 | char *file, ret[MAXPATHLEN]; |
@@ -355,12 +355,6 @@ expand_authorized_keys(const char *filename, struct passwd *pw) | |||
355 | } | 355 | } |
356 | 356 | ||
357 | char * | 357 | char * |
358 | authorized_keys_file(struct passwd *pw) | ||
359 | { | ||
360 | return expand_authorized_keys(options.authorized_keys_file, pw); | ||
361 | } | ||
362 | |||
363 | char * | ||
364 | authorized_principals_file(struct passwd *pw) | 358 | authorized_principals_file(struct passwd *pw) |
365 | { | 359 | { |
366 | if (options.authorized_principals_file == NULL) | 360 | if (options.authorized_principals_file == NULL) |