summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/readconf.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-01-06 03:53:58 +0000
committerdjm <djm@openbsd.org>2017-01-06 03:53:58 +0000
commit4e7b398dc822d81e02f56c82530db3b96042e6d3 (patch)
tree527c39ca858826d2635e16ff70810140e3dde65e /usr.bin/ssh/readconf.c
parentDelete a cross reference to the non-existent manual page BIO_set_flags(3), (diff)
downloadwireguard-openbsd-4e7b398dc822d81e02f56c82530db3b96042e6d3.tar.xz
wireguard-openbsd-4e7b398dc822d81e02f56c82530db3b96042e6d3.zip
show a useful error message when included config files can't be
opened; bz#2653, ok dtucker@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
-rw-r--r--usr.bin/ssh/readconf.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index fd4bc3bcbf4..5f7b1332c71 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.262 2016/10/25 04:08:13 jsg Exp $ */
+/* $OpenBSD: readconf.c,v 1.263 2017/01/06 03:53:58 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1487,6 +1487,11 @@ parse_keytypes:
flags | SSHCONF_CHECKPERM |
(oactive ? 0 : SSHCONF_NEVERMATCH),
activep, depth + 1);
+ if (errno != ENOENT) {
+ fatal("Can't open user config file "
+ "%.100s: %.100s", gl.gl_pathv[i],
+ strerror(errno));
+ }
/*
* don't let Match in includes clobber the
* containing file's Match state.