1 files changed, 8 insertions, 2 deletions

diff --git a/sshd.c b/sshd.c
index d8faaebd5..64c564236 100644
--- a/sshd.c
+++ b/sshd.c
@@ -434,7 +434,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
         }
 
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
-            major, minor, SSH_VERSION,
+            major, minor,
+            options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
             *options.version_addendum == '\0' ? "" : " ",
             options.version_addendum, newline);
 
@@ -745,7 +746,7 @@ privsep_postauth(Authctxt *authctxt)
         RAND_seed(rnd, sizeof(rnd));
 
         /* Drop privileges */
-        do_setusercontext(authctxt->pw);
+        do_setusercontext(authctxt->pw, authctxt->role);
 
  skip:
         /* It is safe now to apply the key state */
@@ -1631,6 +1632,11 @@ main(int ac, char **av)
                         sensitive_data.host_keys[i] = NULL;
                         continue;
                 }
+                if (auth_key_is_revoked(key, 1)) {
+                        key_free(key);
+                        sensitive_data.host_keys[i] = NULL;
+                        continue;
+                }
                 switch (key->type) {
                 case KEY_RSA1:
                         sensitive_data.ssh1_host_key = key;