2 files changed, 2 insertions, 7 deletions

diff --git a/progressmeter.c b/progressmeter.c
index 0e58eddec..72f40f8f9 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: progressmeter.c,v 1.48 2019/05/03 06:06:30 dtucker Exp $ */
+/* $OpenBSD: progressmeter.c,v 1.49 2019/10/29 07:47:27 dtucker Exp $ */
 /*
  * Copyright (c) 2003 Nils Nordman.  All rights reserved.
  *
@@ -233,7 +233,6 @@ refresh_progress_meter(int force_update)
 static void
 sig_alarm(int ignore)
 {
-        signal(SIGALRM, sig_alarm);
         alarm_fired = 1;
         alarm(UPDATE_INTERVAL);
 }
@@ -277,7 +276,6 @@ stop_progress_meter(void)
 static void
 sig_winch(int sig)
 {
-        signal(SIGWINCH, sig_winch);
         win_resized = 1;
 }
 
diff --git a/sshd.c b/sshd.c
index 11571c010..cf7af1c61 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.537 2019/06/28 13:35:04 deraadt Exp $ */
+/* $OpenBSD: sshd.c,v 1.538 2019/10/29 07:47:27 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -295,10 +295,7 @@ close_startup_pipes(void)
 static void
 sighup_handler(int sig)
 {
-        int save_errno = errno;
-
         received_sighup = 1;
-        errno = save_errno;
 }
 
 /*