diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -424,7 +424,8 @@ sshd_exchange_identification(int sock_in, int sock_out) | |||
424 | minor = PROTOCOL_MINOR_1; | 424 | minor = PROTOCOL_MINOR_1; |
425 | } | 425 | } |
426 | snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, | 426 | snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, |
427 | SSH_VERSION, newline); | 427 | options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM, |
428 | newline); | ||
428 | server_version_string = xstrdup(buf); | 429 | server_version_string = xstrdup(buf); |
429 | 430 | ||
430 | /* Send our protocol version identification. */ | 431 | /* Send our protocol version identification. */ |
@@ -734,7 +735,7 @@ privsep_postauth(Authctxt *authctxt) | |||
734 | RAND_seed(rnd, sizeof(rnd)); | 735 | RAND_seed(rnd, sizeof(rnd)); |
735 | 736 | ||
736 | /* Drop privileges */ | 737 | /* Drop privileges */ |
737 | do_setusercontext(authctxt->pw); | 738 | do_setusercontext(authctxt->pw, authctxt->role); |
738 | 739 | ||
739 | skip: | 740 | skip: |
740 | /* It is safe now to apply the key state */ | 741 | /* It is safe now to apply the key state */ |
@@ -1602,6 +1603,11 @@ main(int ac, char **av) | |||
1602 | sensitive_data.host_keys[i] = NULL; | 1603 | sensitive_data.host_keys[i] = NULL; |
1603 | continue; | 1604 | continue; |
1604 | } | 1605 | } |
1606 | if (auth_key_is_revoked(key, 1)) { | ||
1607 | key_free(key); | ||
1608 | sensitive_data.host_keys[i] = NULL; | ||
1609 | continue; | ||
1610 | } | ||
1605 | switch (key->type) { | 1611 | switch (key->type) { |
1606 | case KEY_RSA1: | 1612 | case KEY_RSA1: |
1607 | sensitive_data.ssh1_host_key = key; | 1613 | sensitive_data.ssh1_host_key = key; |