diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.209 2004/03/11 10:21:17 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.210 2004/04/18 23:10:26 djm Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -526,16 +526,17 @@ again: | |||
526 | * file if the user specifies a config file on the command line. | 526 | * file if the user specifies a config file on the command line. |
527 | */ | 527 | */ |
528 | if (config != NULL) { | 528 | if (config != NULL) { |
529 | if (!read_config_file(config, host, &options)) | 529 | if (!read_config_file(config, host, &options, 0), 0) |
530 | fatal("Can't open user config file %.100s: " | 530 | fatal("Can't open user config file %.100s: " |
531 | "%.100s", config, strerror(errno)); | 531 | "%.100s", config, strerror(errno)); |
532 | } else { | 532 | } else { |
533 | snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, | 533 | snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, |
534 | _PATH_SSH_USER_CONFFILE); | 534 | _PATH_SSH_USER_CONFFILE); |
535 | (void)read_config_file(buf, host, &options); | 535 | (void)read_config_file(buf, host, &options, 1); |
536 | 536 | ||
537 | /* Read systemwide configuration file after use config. */ | 537 | /* Read systemwide configuration file after use config. */ |
538 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); | 538 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, |
539 | &options, 0); | ||
539 | } | 540 | } |
540 | 541 | ||
541 | /* Fill configuration defaults. */ | 542 | /* Fill configuration defaults. */ |