upstream commit

fix previous

Upstream-ID: c107d6a69bc22325d79fbf78a2a62e04bcac6895

diff --git a/readconf.c b/readconf.c
index 3588ee9064c481f98013bd6e76b471d726c21282..7194b0cccc4b62e7c63849925b0dfd0d9c83122d 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.263 2017/01/06 03:53:58 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.264 2017/01/06 09:27:52 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1502,7 +1502,7 @@ parse_keytypes:
                                    flags | SSHCONF_CHECKPERM |
                                    (oactive ? 0 : SSHCONF_NEVERMATCH),
                                    activep, depth + 1);
-                               if (errno != ENOENT) {
+                               if (r != 1 && errno != ENOENT) {
                                        fatal("Can't open user config file "
                                            "%.100s: %.100s", gl.gl_pathv[i],
                                            strerror(errno));