summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 112a5f96f..9b32cb458 100644
--- a/sshd.c
+++ b/sshd.c
@@ -423,7 +423,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
423 minor = PROTOCOL_MINOR_1; 423 minor = PROTOCOL_MINOR_1;
424 } 424 }
425 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, 425 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor,
426 SSH_VERSION, newline); 426 options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
427 newline);
427 server_version_string = xstrdup(buf); 428 server_version_string = xstrdup(buf);
428 429
429 /* Send our protocol version identification. */ 430 /* Send our protocol version identification. */
@@ -730,7 +731,7 @@ privsep_postauth(Authctxt *authctxt)
730 RAND_seed(rnd, sizeof(rnd)); 731 RAND_seed(rnd, sizeof(rnd));
731 732
732 /* Drop privileges */ 733 /* Drop privileges */
733 do_setusercontext(authctxt->pw); 734 do_setusercontext(authctxt->pw, authctxt->role);
734 735
735 skip: 736 skip:
736 /* It is safe now to apply the key state */ 737 /* It is safe now to apply the key state */
@@ -1598,6 +1599,11 @@ main(int ac, char **av)
1598 sensitive_data.host_keys[i] = NULL; 1599 sensitive_data.host_keys[i] = NULL;
1599 continue; 1600 continue;
1600 } 1601 }
1602 if (auth_key_is_revoked(key, 1)) {
1603 key_free(key);
1604 sensitive_data.host_keys[i] = NULL;
1605 continue;
1606 }
1601 switch (key->type) { 1607 switch (key->type) {
1602 case KEY_RSA1: 1608 case KEY_RSA1:
1603 sensitive_data.ssh1_host_key = key; 1609 sensitive_data.ssh1_host_key = key;