diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /auth.h | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.66 2010/05/07 11:30:29 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.69 2011/05/23 03:30:07 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -168,8 +168,7 @@ char *get_challenge(Authctxt *); | |||
168 | int verify_response(Authctxt *, const char *); | 168 | int verify_response(Authctxt *, const char *); |
169 | void abandon_challenge_response(Authctxt *); | 169 | void abandon_challenge_response(Authctxt *); |
170 | 170 | ||
171 | char *authorized_keys_file(struct passwd *); | 171 | char *expand_authorized_keys(const char *, struct passwd *pw); |
172 | char *authorized_keys_file2(struct passwd *); | ||
173 | char *authorized_principals_file(struct passwd *); | 172 | char *authorized_principals_file(struct passwd *); |
174 | 173 | ||
175 | FILE *auth_openkeyfile(const char *, struct passwd *, int); | 174 | FILE *auth_openkeyfile(const char *, struct passwd *, int); |