summaryrefslogtreecommitdiff
path: root/authfile.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-02-23 16:55:51 +0000
committerDamien Miller <djm@mindrot.org>2015-02-24 03:59:09 +1100
commit5248429b5ec524d0a65507cff0cdd6e0cb99effd (patch)
tree2d26d76adee29811f0ecc70bfa869c2c35b910a2 /authfile.c
parente94e4b07ef2eaead38b085a60535df9981cdbcdb (diff)
upstream commit
add an XXX to remind me to improve sshkey_load_public
Diffstat (limited to 'authfile.c')
-rw-r--r--authfile.c5
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 @@
1/* $OpenBSD: authfile.c,v 1.110 2015/01/20 23:14:00 deraadt Exp $ */ 1/* $OpenBSD: authfile.c,v 1.111 2015/02/23 16:55:51 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
4 * 4 *
@@ -343,6 +343,8 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp)
343 if (commentp != NULL) 343 if (commentp != NULL)
344 *commentp = NULL; 344 *commentp = NULL;
345 345
346 /* XXX should load file once and attempt to parse each format */
347
346 if ((fd = open(filename, O_RDONLY)) < 0) 348 if ((fd = open(filename, O_RDONLY)) < 0)
347 goto skip; 349 goto skip;
348#ifdef WITH_SSH1 350#ifdef WITH_SSH1
@@ -394,6 +396,7 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp)
394 return 0; 396 return 0;
395 } 397 }
396 sshkey_free(pub); 398 sshkey_free(pub);
399
397 return r; 400 return r;
398} 401}
399 402