RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

add an XXX to remind me to improve sshkey_load_public
This commit is contained in:
djm@openbsd.org 2015-02-23 16:55:51 +00:00 committed by Damien Miller
parent e94e4b07ef
commit 5248429b5e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
authfile.c
View File

@ -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. * 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) if (commentp != NULL)
*commentp = NULL; *commentp = NULL;
/* XXX should load file once and attempt to parse each format */
if ((fd = open(filename, O_RDONLY)) < 0) if ((fd = open(filename, O_RDONLY)) < 0)
goto skip; goto skip;
#ifdef WITH_SSH1 #ifdef WITH_SSH1
@ -394,6 +396,7 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp)
return 0; return 0;
} }
sshkey_free(pub); sshkey_free(pub);
return r; return r;
} }