summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sshd.c b/sshd.c
index eb48e791d..75e267793 100644
--- a/sshd.c
+++ b/sshd.c
@@ -422,7 +422,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
422 minor = PROTOCOL_MINOR_1; 422 minor = PROTOCOL_MINOR_1;
423 } 423 }
424 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, 424 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor,
425 SSH_VERSION, newline); 425 options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
426 newline);
426 server_version_string = xstrdup(buf); 427 server_version_string = xstrdup(buf);
427 428
428 /* Send our protocol version identification. */ 429 /* Send our protocol version identification. */
@@ -1564,6 +1565,11 @@ main(int ac, char **av)
1564 sensitive_data.host_keys[i] = NULL; 1565 sensitive_data.host_keys[i] = NULL;
1565 continue; 1566 continue;
1566 } 1567 }
1568 if (auth_key_is_revoked(key, 1)) {
1569 key_free(key);
1570 sensitive_data.host_keys[i] = NULL;
1571 continue;
1572 }
1567 switch (key->type) { 1573 switch (key->type) {
1568 case KEY_RSA1: 1574 case KEY_RSA1:
1569 sensitive_data.ssh1_host_key = key; 1575 sensitive_data.ssh1_host_key = key;