summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2017-01-06 09:27:53 +0000
committerDamien Miller <djm@cvs.openbsd.org>2017-01-06 09:27:53 +0000
commit3c196a58f70eae1b559b4efe151246cd2140eb56 (patch)
tree4cdc20431613ad1481a81aecfa4df825a56f9092 /usr.bin
parentdc477d074f99877492789984af5e667614385e04 (diff)
fix previous
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/readconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index 5f7b1332c71..fe4566714b2 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/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
@@ -1487,7 +1487,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));