upstream commit

fd leak for !ssh1 case; found by unittests; ok markus@
This commit is contained in:
djm@openbsd.org 2015-03-31 22:55:50 +00:00 committed by Damien Miller
parent c9a0805a62
commit 9a47ab8003

View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.112 2015/03/18 01:44:21 djm Exp $ */ /* $OpenBSD: authfile.c,v 1.113 2015/03/31 22:55:50 djm Exp $ */
/* /*
* Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
* *
@ -359,6 +359,8 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp)
case 0: case 0:
return r; return r;
} }
#else /* WITH_SSH1 */
close(fd);
#endif /* WITH_SSH1 */ #endif /* WITH_SSH1 */
/* try ssh2 public key */ /* try ssh2 public key */