diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-09-03 20:58:34 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-09-03 20:58:34 +0000 |
| commit | fc922c9690dfeacb1cb9a33f451361bad456d167 (patch) | |
| tree | 13a0a1049490dbbed4d448f7e3169fd48b82196a /usr.bin/ssh/ssh.c | |
| parent | c6753a59d1f2a463a81c695302127f864037aa39 (diff) | |
fatal() for nonexistent -Fssh_config. ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 127d3be5e10..4951576b0f8 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.141 2001/08/29 23:27:23 stevesk Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.142 2001/09/03 20:58:33 stevesk Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -605,14 +605,16 @@ again: * file if the user specifies a config file on the command line. */ if (config != NULL) { - read_config_file(config, host, &options); + if (!read_config_file(config, host, &options)) + fatal("Can't open user config file %.100s: " + "%.100s", config, strerror(errno)); } else { snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE); /* Read systemwide configuration file. */ - read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); - read_config_file(buf, host, &options); + (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); + (void)read_config_file(buf, host, &options); } /* Fill configuration defaults. */ |