* 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).

1 files changed, 12 insertions, 3 deletions

diff --git a/sshd.c b/sshd.c
index 75e267793..b58dd8f37 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.374 2010/03/07 11:57:13 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.375 2010/04/16 01:47:26 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -749,6 +749,8 @@ list_hostkey_types(void)
                 if (key == NULL)
                         continue;
                 switch (key->type) {
+                case KEY_RSA_CERT_V00:
+                case KEY_DSA_CERT_V00:
                 case KEY_RSA_CERT:
                 case KEY_DSA_CERT:
                         if (buffer_len(&b) > 0)
@@ -772,10 +774,17 @@ get_hostkey_by_type(int type, int need_private)
         Key *key;
 
         for (i = 0; i < options.num_host_key_files; i++) {
-                if (type == KEY_RSA_CERT || type == KEY_DSA_CERT)
+                switch (type) {
+                case KEY_RSA_CERT_V00:
+                case KEY_DSA_CERT_V00:
+                case KEY_RSA_CERT:
+                case KEY_DSA_CERT:
                         key = sensitive_data.host_certificates[i];
-                else
+                        break;
+                default:
                         key = sensitive_data.host_keys[i];
+                        break;
+                }
                 if (key != NULL && key->type == type)
                         return need_private ?
                             sensitive_data.host_keys[i] : key;