diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-01-06 09:27:52 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-01-30 11:05:18 +1100 |
commit | b64077f9767634715402014f509e58decf1e140d (patch) | |
tree | 6a96e0c74f12c106b4e39a67510532f4ce3d4405 | |
parent | 5e820e9ea2e949aeb93071fe31c80b0c42f2b2de (diff) |
upstream commit
fix previous
Upstream-ID: c107d6a69bc22325d79fbf78a2a62e04bcac6895
-rw-r--r-- | readconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index 3588ee906..7194b0ccc 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.263 2017/01/06 03:53:58 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.264 2017/01/06 09:27:52 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1502,7 +1502,7 @@ parse_keytypes: | |||
1502 | flags | SSHCONF_CHECKPERM | | 1502 | flags | SSHCONF_CHECKPERM | |
1503 | (oactive ? 0 : SSHCONF_NEVERMATCH), | 1503 | (oactive ? 0 : SSHCONF_NEVERMATCH), |
1504 | activep, depth + 1); | 1504 | activep, depth + 1); |
1505 | if (errno != ENOENT) { | 1505 | if (r != 1 && errno != ENOENT) { |
1506 | fatal("Can't open user config file " | 1506 | fatal("Can't open user config file " |
1507 | "%.100s: %.100s", gl.gl_pathv[i], | 1507 | "%.100s: %.100s", gl.gl_pathv[i], |
1508 | strerror(errno)); | 1508 | strerror(errno)); |