diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-09-28 15:46:30 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-09-28 15:46:30 +0000 |
| commit | d1b50c60b173675702e80bebb333c39f38bed546 (patch) | |
| tree | d1f3982df3d68d9cf0381ae53ad9a72152af38b2 /usr.bin/ssh/ssh.c | |
| parent | a2718c72e80485fe52419e98084cce2fb6ac74aa (diff) | |
bug: read user config first; report kaukasoi@elektroni.ee.tut.fi
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index f9b44ce3387..cef0d5f0243 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.144 2001/09/24 03:38:58 stevesk Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.145 2001/09/28 15:46:29 markus Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -613,10 +613,10 @@ again: } else { snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE); + (void)read_config_file(buf, host, &options); - /* Read systemwide configuration file. */ + /* Read systemwide configuration file after use config. */ (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); - (void)read_config_file(buf, host, &options); } /* Fill configuration defaults. */ |