From 232b76f9f8b883db9ff7e7a3a9942ad7a28119e0 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 6 May 2006 17:41:51 +1000 Subject: - dtucker@cvs.openbsd.org 2006/04/25 08:02:27 [authfile.c authfile.h sshconnect2.c ssh.c sshconnect1.c] Prevent ssh from trying to open private keys with bad permissions more than once or prompting for their passphrases (which it subsequently ignores anyway), similar to a previous change in ssh-add. bz #1186, ok djm@ --- authfile.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'authfile.h') diff --git a/authfile.h b/authfile.h index 967f582d4..a6c74934d 100644 --- a/authfile.h +++ b/authfile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.h,v 1.12 2006/03/25 22:22:42 djm Exp $ */ +/* $OpenBSD: authfile.h,v 1.13 2006/04/25 08:02:27 dtucker Exp $ */ /* * Author: Tatu Ylonen @@ -19,7 +19,7 @@ int key_save_private(Key *, const char *, const char *, const char *); Key *key_load_public(const char *, char **); Key *key_load_public_type(int, const char *, char **); Key *key_load_private(const char *, const char *, char **); -Key *key_load_private_type(int, const char *, const char *, char **); +Key *key_load_private_type(int, const char *, const char *, char **, int *); Key *key_load_private_pem(int, int, const char *, char **); int key_perm_ok(int, const char *); -- cgit v1.2.3