diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-10-03 17:22:29 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-10-03 17:22:29 +0000 |
commit | 83f07d19544b3acc2fb4d3b2b8640c5e5c7ae9d4 (patch) | |
tree | 9cd9a07037c8984b6e73d6d47307056670c48662 | |
parent | 1af4d3bb709453b0b206106adaba7c94548fa6f2 (diff) |
- markus@cvs.openbsd.org 2001/09/28 15:46:29
[ssh.c]
bug: read user config first; report kaukasoi@elektroni.ee.tut.fi
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -17,6 +17,9 @@ | |||
17 | - djm@cvs.openbsd.org 2001/09/28 12:07:09 | 17 | - djm@cvs.openbsd.org 2001/09/28 12:07:09 |
18 | [ssh-keygen.c] | 18 | [ssh-keygen.c] |
19 | bzero private key after loading to smartcard; ok markus@ | 19 | bzero private key after loading to smartcard; ok markus@ |
20 | - markus@cvs.openbsd.org 2001/09/28 15:46:29 | ||
21 | [ssh.c] | ||
22 | bug: read user config first; report kaukasoi@elektroni.ee.tut.fi | ||
20 | 23 | ||
21 | 20011001 | 24 | 20011001 |
22 | - (stevesk) loginrec.c: fix type conversion problems exposed when using | 25 | - (stevesk) loginrec.c: fix type conversion problems exposed when using |
@@ -6609,4 +6612,4 @@ | |||
6609 | - Wrote replacements for strlcpy and mkdtemp | 6612 | - Wrote replacements for strlcpy and mkdtemp |
6610 | - Released 1.0pre1 | 6613 | - Released 1.0pre1 |
6611 | 6614 | ||
6612 | $Id: ChangeLog,v 1.1574 2001/10/03 17:18:37 mouring Exp $ | 6615 | $Id: ChangeLog,v 1.1575 2001/10/03 17:22:29 mouring Exp $ |
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.144 2001/09/24 03:38:58 stevesk Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.145 2001/09/28 15:46:29 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -626,10 +626,10 @@ again: | |||
626 | } else { | 626 | } else { |
627 | snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, | 627 | snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, |
628 | _PATH_SSH_USER_CONFFILE); | 628 | _PATH_SSH_USER_CONFFILE); |
629 | (void)read_config_file(buf, host, &options); | ||
629 | 630 | ||
630 | /* Read systemwide configuration file. */ | 631 | /* Read systemwide configuration file after use config. */ |
631 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); | 632 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); |
632 | (void)read_config_file(buf, host, &options); | ||
633 | } | 633 | } |
634 | 634 | ||
635 | /* Fill configuration defaults. */ | 635 | /* Fill configuration defaults. */ |