diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -425,7 +425,8 @@ sshd_exchange_identification(int sock_in, int sock_out) | |||
425 | } | 425 | } |
426 | 426 | ||
427 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", | 427 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", |
428 | major, minor, SSH_VERSION, | 428 | major, minor, |
429 | options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM, | ||
429 | *options.version_addendum == '\0' ? "" : " ", | 430 | *options.version_addendum == '\0' ? "" : " ", |
430 | options.version_addendum, newline); | 431 | options.version_addendum, newline); |
431 | 432 | ||
@@ -736,7 +737,7 @@ privsep_postauth(Authctxt *authctxt) | |||
736 | RAND_seed(rnd, sizeof(rnd)); | 737 | RAND_seed(rnd, sizeof(rnd)); |
737 | 738 | ||
738 | /* Drop privileges */ | 739 | /* Drop privileges */ |
739 | do_setusercontext(authctxt->pw); | 740 | do_setusercontext(authctxt->pw, authctxt->role); |
740 | 741 | ||
741 | skip: | 742 | skip: |
742 | /* It is safe now to apply the key state */ | 743 | /* It is safe now to apply the key state */ |
@@ -1593,6 +1594,11 @@ main(int ac, char **av) | |||
1593 | sensitive_data.host_keys[i] = NULL; | 1594 | sensitive_data.host_keys[i] = NULL; |
1594 | continue; | 1595 | continue; |
1595 | } | 1596 | } |
1597 | if (auth_key_is_revoked(key, 1)) { | ||
1598 | key_free(key); | ||
1599 | sensitive_data.host_keys[i] = NULL; | ||
1600 | continue; | ||
1601 | } | ||
1596 | switch (key->type) { | 1602 | switch (key->type) { |
1597 | case KEY_RSA1: | 1603 | case KEY_RSA1: |
1598 | sensitive_data.ssh1_host_key = key; | 1604 | sensitive_data.ssh1_host_key = key; |