diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 06:05:35 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 06:05:35 +0000 |
commit | 4b00c8b40bfa22a8d7f68089b5b7542d23facdf0 (patch) | |
tree | 7bd70c3030c1b78f2bcd4400ad069312e3c4228e | |
parent | b00d4fb1426fa6ac3c1e2ca78ee40e5f0e1d5d15 (diff) |
- deraadt@cvs.openbsd.org 2001/02/24 10:37:26
[sshd_config]
ssh2 rsa key before dsa key
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd_config | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -49,6 +49,9 @@ | |||
49 | - deraadt@cvs.openbsd.org 2001/02/24 10:37:55 | 49 | - deraadt@cvs.openbsd.org 2001/02/24 10:37:55 |
50 | [readconf.c] | 50 | [readconf.c] |
51 | look for id_rsa by default, before id_dsa | 51 | look for id_rsa by default, before id_dsa |
52 | - deraadt@cvs.openbsd.org 2001/02/24 10:37:26 | ||
53 | [sshd_config] | ||
54 | ssh2 rsa key before dsa key | ||
52 | 55 | ||
53 | 20010304 | 56 | 20010304 |
54 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. | 57 | - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. |
@@ -4241,4 +4244,4 @@ | |||
4241 | - Wrote replacements for strlcpy and mkdtemp | 4244 | - Wrote replacements for strlcpy and mkdtemp |
4242 | - Released 1.0pre1 | 4245 | - Released 1.0pre1 |
4243 | 4246 | ||
4244 | $Id: ChangeLog,v 1.865 2001/03/05 06:03:03 mouring Exp $ | 4247 | $Id: ChangeLog,v 1.866 2001/03/05 06:05:35 mouring Exp $ |
diff --git a/sshd_config b/sshd_config index 40522d75e..0e2970078 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sshd_config,v 1.33 2001/02/22 18:09:06 deraadt Exp $ | 1 | # $OpenBSD: sshd_config,v 1.34 2001/02/24 10:37:26 deraadt Exp $ |
2 | 2 | ||
3 | # This is the sshd server system-wide configuration file. See sshd(8) | 3 | # This is the sshd server system-wide configuration file. See sshd(8) |
4 | # for more information. | 4 | # for more information. |
@@ -8,8 +8,8 @@ Port 22 | |||
8 | #ListenAddress 0.0.0.0 | 8 | #ListenAddress 0.0.0.0 |
9 | #ListenAddress :: | 9 | #ListenAddress :: |
10 | HostKey /etc/ssh_host_key | 10 | HostKey /etc/ssh_host_key |
11 | HostKey /etc/ssh_host_dsa_key | ||
12 | HostKey /etc/ssh_host_rsa_key | 11 | HostKey /etc/ssh_host_rsa_key |
12 | HostKey /etc/ssh_host_dsa_key | ||
13 | ServerKeyBits 768 | 13 | ServerKeyBits 768 |
14 | LoginGraceTime 600 | 14 | LoginGraceTime 600 |
15 | KeyRegenerationInterval 3600 | 15 | KeyRegenerationInterval 3600 |