1 files changed, 8 insertions, 2 deletions

diff --git a/sshd.c b/sshd.c
index 9d21b30f3..e032c1720 100644
--- a/sshd.c
+++ b/sshd.c
@@ -424,7 +424,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
                 minor = PROTOCOL_MINOR_1;
         }
         snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor,
-            SSH_VERSION, newline);
+            options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
+            newline);
         server_version_string = xstrdup(buf);
 
         /* Send our protocol version identification. */
@@ -734,7 +735,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 */
@@ -1602,6 +1603,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;