summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-03-31 22:55:50 +0000
committerDamien Miller <djm@mindrot.org>2015-04-01 10:00:46 +1100
commit9a47ab80030a31f2d122b8fd95bd48c408b9fcd9 (patch)
tree2c511e3822abd321531493eec2043d937b401191
parentc9a0805a6280681901c270755a7cd630d7c5280e (diff)
upstream commit
fd leak for !ssh1 case; found by unittests; ok markus@
-rw-r--r--authfile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/authfile.c b/authfile.c
index a6473c829..f955536da 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.c,v 1.112 2015/03/18 01:44:21 djm Exp $ */ 1/* $OpenBSD: authfile.c,v 1.113 2015/03/31 22:55:50 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 *
@@ -359,6 +359,8 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp)
359 case 0: 359 case 0:
360 return r; 360 return r;
361 } 361 }
362#else /* WITH_SSH1 */
363 close(fd);
362#endif /* WITH_SSH1 */ 364#endif /* WITH_SSH1 */
363 365
364 /* try ssh2 public key */ 366 /* try ssh2 public key */