1 files changed, 6 insertions, 12 deletions

diff --git a/sshd.c b/sshd.c
index c069505a0..d2d1877d4 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.549 2020/01/31 23:13:04 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.552 2020/03/13 04:01:57 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -328,7 +328,6 @@ sighup_restart(void)
         platform_pre_restart();
         close_listen_socks();
         close_startup_pipes();
-        alarm(0);  /* alarm timer persists across exec */
         ssh_signal(SIGHUP, SIG_IGN); /* will be restored after exec */
         execv(saved_argv[0], saved_argv);
         logit("RESTART FAILED: av[0]='%.100s', error: %.100s.", saved_argv[0],
@@ -1121,7 +1120,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
         for (i = 0; i < num_listen_socks; i++)
                 if (listen_socks[i] > maxfd)
                         maxfd = listen_socks[i];
-        /* pipes connected to unauthenticated childs */
+        /* pipes connected to unauthenticated child sshd processes */
         startup_pipes = xcalloc(options.max_startups, sizeof(int));
         startup_flags = xcalloc(options.max_startups, sizeof(int));
         for (i = 0; i < options.max_startups; i++)
@@ -2102,12 +2101,7 @@ main(int ac, char **av)
         fcntl(sock_out, F_SETFD, FD_CLOEXEC);
         fcntl(sock_in, F_SETFD, FD_CLOEXEC);
 
-        /*
-         * Disable the key regeneration alarm.  We will not regenerate the
-         * key since we are no longer in a position to give it to anyone. We
-         * will not restart on SIGHUP since it no longer makes sense.
-         */
-        alarm(0);
+        /* We will not restart on SIGHUP since it no longer makes sense. */
         ssh_signal(SIGALRM, SIG_DFL);
         ssh_signal(SIGHUP, SIG_DFL);
         ssh_signal(SIGTERM, SIG_DFL);
@@ -2196,9 +2190,9 @@ main(int ac, char **av)
         if (!debug_flag)
                 alarm(options.login_grace_time);
 
-        if (kex_exchange_identification(ssh, -1, options.debian_banner,
-            options.version_addendum) != 0)
-                cleanup_exit(255); /* error already logged */
+        if ((r = kex_exchange_identification(ssh, -1, options.debian_banner,
+            options.version_addendum)) != 0)
+                sshpkt_fatal(ssh, r, "banner exchange");
 
         ssh_packet_set_nonblocking(ssh);