[openssh-commits] [openssh] 04/08: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 9a47ab80030a31f2d122b8fd95bd48c408b9fcd9
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Mar 31 22:55:50 2015 +0000

    upstream commit
    
    fd leak for !ssh1 case; found by unittests; ok markus@
---
 authfile.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/authfile.c b/authfile.c
index a6473c8..f955536 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 */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.