From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 31 Mar 2015 22:55:50 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a47ab80030a31f2d122b8fd95bd48c408b9fcd9;p=thirdparty%2Fopenssh-portable.git

upstream commit

fd leak for !ssh1 case; found by unittests; ok markus@
---

diff --git a/authfile.c b/authfile.c
index a6473c829..f955536da 100644
--- a/authfile.c
+++ b/authfile.c
@@ -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.
  *
@@ -359,6 +359,8 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp)
 	case 0:
 		return r;
 	}
+#else /* WITH_SSH1 */
+	close(fd);
 #endif /* WITH_SSH1 */
 
 	/* try ssh2 public key */