diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-07-02 22:37:30 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-07-02 22:37:30 +1000 |
| commit | 33c787f23c0267c679ad3e3f8bc4679c6ced5ea3 (patch) | |
| tree | b444437050374e67966df54450358b5506b797ea /auth.h | |
| parent | 7499b0cca021f14c615cbfef170aba3e24cf8d4d (diff) | |
| download | openssh-git-33c787f23c0267c679ad3e3f8bc4679c6ced5ea3.tar.gz | |
- dtucker@cvs.openbsd.org 2008/07/02 12:03:51
[auth-rsa.c auth.c auth2-pubkey.c auth.h]
Merge duplicate host key file checks, based in part on a patch from Rob
Holland via bz #1348 . Also checks for non-regular files during protocol
1 RSA auth. ok djm@
Diffstat (limited to 'auth.h')
| -rw-r--r-- | auth.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.60 2007/09/21 08:15:29 djm Exp $ */ +/* $OpenBSD: auth.h,v 1.61 2008/07/02 12:03:51 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -166,8 +166,7 @@ void abandon_challenge_response(Authctxt *); char *authorized_keys_file(struct passwd *); char *authorized_keys_file2(struct passwd *); -int -secure_filename(FILE *, const char *, struct passwd *, char *, size_t); +FILE *auth_openkeyfile(const char *, struct passwd *, int); HostStatus check_key_in_hostfiles(struct passwd *, Key *, const char *, |