diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2011-05-23 03:30:08 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2011-05-23 03:30:08 +0000 |
| commit | 85ac1baaa89d5c17e5d9c22d76753223d8c5eee8 (patch) | |
| tree | e17fbeeb53cf93b670e707ae7159fc843ee5b44b /usr.bin/ssh/auth.h | |
| parent | adf15b3a2edc0fe7b3a09211ebfafe0131e32525 (diff) | |
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 'usr.bin/ssh/auth.h')
| -rw-r--r-- | usr.bin/ssh/auth.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth.h b/usr.bin/ssh/auth.h index d551097b8ff..5d63c575d31 100644 --- a/usr.bin/ssh/auth.h +++ b/usr.bin/ssh/auth.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.68 2011/05/11 04:47:06 djm Exp $ */ +/* $OpenBSD: auth.h,v 1.69 2011/05/23 03:30:07 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -145,7 +145,7 @@ struct passwd * getpwnamallow(const char *user); char *get_challenge(Authctxt *); int verify_response(Authctxt *, const char *); -char *authorized_keys_file(struct passwd *); +char *expand_authorized_keys(const char *, struct passwd *pw); char *authorized_principals_file(struct passwd *); FILE *auth_openkeyfile(const char *, struct passwd *, int); |