upstream commit

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

diff --git a/authfile.c b/authfile.c
index a6473c8295440e012118e2064da6c3d0b29aedef..f955536da434fbb897af5b8c27b744e002ddeb66 100644 (file)
--- 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 */