- markus@cvs.openbsd.org 2001/09/28 15:46:29
[ssh.c]
bug: read user config first; report kaukasoi@elektroni.ee.tut.fi
diff --git a/ChangeLog b/ChangeLog
index c459b82..8985539 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 1130c8a..47b5810 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 <openssl/evp.h>
#include <openssl/err.h>
@@ -626,10 +626,10 @@
} else {
snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir,
_PATH_SSH_USER_CONFFILE);
-
- /* Read systemwide configuration file. */
- (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
(void)read_config_file(buf, host, &options);
+
+ /* Read systemwide configuration file after use config. */
+ (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
}
/* Fill configuration defaults. */