[openssh-commits] [openssh] 06/17: upstream commit

git+noreply at mindrot.org git+noreply at mindrot.org
Mon Jan 30 12:04:23 AEDT 2017


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

djm pushed a commit to branch master
in repository openssh.

commit b64077f9767634715402014f509e58decf1e140d
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Jan 6 09:27:52 2017 +0000

    upstream commit
    
    fix previous
    
    Upstream-ID: c107d6a69bc22325d79fbf78a2a62e04bcac6895
---
 readconf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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));

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


More information about the openssh-commits mailing list