diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-02-23 17:55:51 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-02-23 17:59:09 +0100 |
| commit | 5248429b5ec524d0a65507cff0cdd6e0cb99effd (patch) | |
| tree | 2d26d76adee29811f0ecc70bfa869c2c35b910a2 /authfile.c | |
| parent | upstream commit (diff) | |
| download | openssh-5248429b5ec524d0a65507cff0cdd6e0cb99effd.tar.xz openssh-5248429b5ec524d0a65507cff0cdd6e0cb99effd.zip | |
upstream commit
add an XXX to remind me to improve sshkey_load_public
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/authfile.c b/authfile.c index 7d7f45ead..3a81786c7 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.110 2015/01/20 23:14:00 deraadt Exp $ */ +/* $OpenBSD: authfile.c,v 1.111 2015/02/23 16:55:51 djm Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -343,6 +343,8 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp) if (commentp != NULL) *commentp = NULL; + /* XXX should load file once and attempt to parse each format */ + if ((fd = open(filename, O_RDONLY)) < 0) goto skip; #ifdef WITH_SSH1 @@ -394,6 +396,7 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp) return 0; } sshkey_free(pub); + return r; } |