summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--readconf.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c
index fa3fab8f0..3588ee906 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.262 2016/10/25 04:08:13 jsg Exp $ */ 1/* $OpenBSD: readconf.c,v 1.263 2017/01/06 03:53:58 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,6 +1502,11 @@ 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) {
1506 fatal("Can't open user config file "
1507 "%.100s: %.100s", gl.gl_pathv[i],
1508 strerror(errno));
1509 }
1505 /* 1510 /*
1506 * don't let Match in includes clobber the 1511 * don't let Match in includes clobber the
1507 * containing file's Match state. 1512 * containing file's Match state.