diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
commit | 78799892cb1858927be02be9737c594052e3f910 (patch) | |
tree | ac3dc2e848ab9dc62fe4252e01e52c3d456f628f /sshd.c | |
parent | 3875951bb76a9ec62634ae4026c9cc885d933477 (diff) | |
parent | 31e30b835fd9695d3b6647cab4867001b092e28f (diff) |
* New upstream release (http://www.openssh.com/txt/release-5.6):
- Added a ControlPersist option to ssh_config(5) that automatically
starts a background ssh(1) multiplex master when connecting. This
connection can stay alive indefinitely, or can be set to automatically
close after a user-specified duration of inactivity (closes: #335697,
#350898, #454787, #500573, #550262).
- Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
Match blocks (closes: #549858).
- sftp(1): fix ls in working directories that contain globbing
characters in their pathnames (LP: #530714).
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.374 2010/03/07 11:57:13 dtucker Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.375 2010/04/16 01:47:26 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -749,6 +749,8 @@ list_hostkey_types(void) | |||
749 | if (key == NULL) | 749 | if (key == NULL) |
750 | continue; | 750 | continue; |
751 | switch (key->type) { | 751 | switch (key->type) { |
752 | case KEY_RSA_CERT_V00: | ||
753 | case KEY_DSA_CERT_V00: | ||
752 | case KEY_RSA_CERT: | 754 | case KEY_RSA_CERT: |
753 | case KEY_DSA_CERT: | 755 | case KEY_DSA_CERT: |
754 | if (buffer_len(&b) > 0) | 756 | if (buffer_len(&b) > 0) |
@@ -772,10 +774,17 @@ get_hostkey_by_type(int type, int need_private) | |||
772 | Key *key; | 774 | Key *key; |
773 | 775 | ||
774 | for (i = 0; i < options.num_host_key_files; i++) { | 776 | for (i = 0; i < options.num_host_key_files; i++) { |
775 | if (type == KEY_RSA_CERT || type == KEY_DSA_CERT) | 777 | switch (type) { |
778 | case KEY_RSA_CERT_V00: | ||
779 | case KEY_DSA_CERT_V00: | ||
780 | case KEY_RSA_CERT: | ||
781 | case KEY_DSA_CERT: | ||
776 | key = sensitive_data.host_certificates[i]; | 782 | key = sensitive_data.host_certificates[i]; |
777 | else | 783 | break; |
784 | default: | ||
778 | key = sensitive_data.host_keys[i]; | 785 | key = sensitive_data.host_keys[i]; |
786 | break; | ||
787 | } | ||
779 | if (key != NULL && key->type == type) | 788 | if (key != NULL && key->type == type) |
780 | return need_private ? | 789 | return need_private ? |
781 | sensitive_data.host_keys[i] : key; | 790 | sensitive_data.host_keys[i] : key; |