diff options
| author |   djm <djm@openbsd.org> | 2015-02-23 16:55:51 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-02-23 16:55:51 +0000 |
| commit | d0c626f3e798a99351963d34ee6b5c822d01e7c4 (patch) | |
| tree | e43f0dd08b4a84bcbd988d60cefe524d487ebee3 | |
| parent | silence a spurious error message when listing fingerprints for (diff) | |
| download | wireguard-openbsd-d0c626f3e798a99351963d34ee6b5c822d01e7c4.tar.xz wireguard-openbsd-d0c626f3e798a99351963d34ee6b5c822d01e7c4.zip | |
add an XXX to remind me to improve sshkey_load_public
| -rw-r--r-- | usr.bin/ssh/authfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c index 0771c32c17a..daae4776b89 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/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. * @@ -338,6 +338,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 @@ -389,6 +391,7 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp) return 0; } sshkey_free(pub); + return r; } |