From 83f07d19544b3acc2fb4d3b2b8640c5e5c7ae9d4 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Wed, 3 Oct 2001 17:22:29 +0000 Subject: - markus@cvs.openbsd.org 2001/09/28 15:46:29 [ssh.c] bug: read user config first; report kaukasoi@elektroni.ee.tut.fi --- ChangeLog | 5 ++++- ssh.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c459b82c6..8985539ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,9 @@ - djm@cvs.openbsd.org 2001/09/28 12:07:09 [ssh-keygen.c] bzero private key after loading to smartcard; ok markus@ + - markus@cvs.openbsd.org 2001/09/28 15:46:29 + [ssh.c] + bug: read user config first; report kaukasoi@elektroni.ee.tut.fi 20011001 - (stevesk) loginrec.c: fix type conversion problems exposed when using @@ -6609,4 +6612,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1574 2001/10/03 17:18:37 mouring Exp $ +$Id: ChangeLog,v 1.1575 2001/10/03 17:22:29 mouring Exp $ diff --git a/ssh.c b/ssh.c index 1130c8a0e..47b581018 100644 --- a/ssh.c +++ b/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 #include @@ -626,10 +626,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. */ -- cgit v1.2.3