[src/trunk]: src/crypto/dist/ssh buffix from openbsd tree: users config shoul...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86e57bbdbe85
branches:  trunk
changeset: 515682:86e57bbdbe85
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Oct 02 00:39:14 2001 +0000

description:
buffix from openbsd tree: users config should overwrite system config.

diffstat:

 crypto/dist/ssh/ssh.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 4667365e0de1 -r 86e57bbdbe85 crypto/dist/ssh/ssh.c
--- a/crypto/dist/ssh/ssh.c     Tue Oct 02 00:26:07 2001 +0000
+++ b/crypto/dist/ssh/ssh.c     Tue Oct 02 00:39:14 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh.c,v 1.15 2001/09/27 03:24:06 itojun Exp $  */
+/*     $NetBSD: ssh.c,v 1.16 2001/10/02 00:39:14 itojun Exp $  */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -40,7 +40,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>
@@ -614,10 +614,10 @@
        } 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. */