commit b64077f9767634715402014f509e58decf1e140d
author djm@openbsd.org <djm@openbsd.org> Fri Jan 06 09:27:52 2017 +0000
committer Damien Miller <djm@mindrot.org> Mon Jan 30 11:05:18 2017 +1100
tree 6a96e0c74f12c106b4e39a67510532f4ce3d4405
parent 5e820e9ea2e949aeb93071fe31c80b0c42f2b2de

upstream commit

fix previous

Upstream-ID: c107d6a69bc22325d79fbf78a2a62e04bcac6895

readconf.c

diff --git a/readconf.c b/readconf.c
index 3588ee9..7194b0c 100644
--- 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 @@
 				    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));