- 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 4d01451e215b6ae9159b6b86cdc8b5f958791db0..13dede848d8519810fce2f9048e04777c2e37fb7 100644 (file)
--- 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

diff --git a/ssh.c b/ssh.c
index 1130c8a0ec5766444832672d7e6291ef387604f8..47b581018c88d7e25e01732e113d80fd0bd52dd8 100644 (file)
--- 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 @@ 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. */