diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -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. */ |
@@ -1370,7 +1371,12 @@ main(int ac, char **av) | |||
1370 | /* ignored */ | 1371 | /* ignored */ |
1371 | break; | 1372 | break; |
1372 | case 'q': | 1373 | case 'q': |
1373 | options.log_level = SYSLOG_LEVEL_QUIET; | 1374 | if (options.log_level == SYSLOG_LEVEL_QUIET) { |
1375 | options.log_level = SYSLOG_LEVEL_SILENT; | ||
1376 | } | ||
1377 | else if (options.log_level != SYSLOG_LEVEL_SILENT) { | ||
1378 | options.log_level = SYSLOG_LEVEL_QUIET; | ||
1379 | } | ||
1374 | break; | 1380 | break; |
1375 | case 'b': | 1381 | case 'b': |
1376 | options.server_key_bits = (int)strtonum(optarg, 256, | 1382 | options.server_key_bits = (int)strtonum(optarg, 256, |
@@ -1564,6 +1570,11 @@ main(int ac, char **av) | |||
1564 | sensitive_data.host_keys[i] = NULL; | 1570 | sensitive_data.host_keys[i] = NULL; |
1565 | continue; | 1571 | continue; |
1566 | } | 1572 | } |
1573 | if (auth_key_is_revoked(key, 1)) { | ||
1574 | key_free(key); | ||
1575 | sensitive_data.host_keys[i] = NULL; | ||
1576 | continue; | ||
1577 | } | ||
1567 | switch (key->type) { | 1578 | switch (key->type) { |
1568 | case KEY_RSA1: | 1579 | case KEY_RSA1: |
1569 | sensitive_data.ssh1_host_key = key; | 1580 | sensitive_data.ssh1_host_key = key; |