summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.bin/ssh/progressmeter.c4
-rw-r--r--usr.bin/ssh/sshd.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/ssh/progressmeter.c b/usr.bin/ssh/progressmeter.c
index 3f09978e632..05827e0ee0b 100644
--- a/usr.bin/ssh/progressmeter.c
+++ b/usr.bin/ssh/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.
*
@@ -231,7 +231,6 @@ refresh_progress_meter(int force_update)
static void
sig_alarm(int ignore)
{
- signal(SIGALRM, sig_alarm);
alarm_fired = 1;
alarm(UPDATE_INTERVAL);
}
@@ -275,7 +274,6 @@ stop_progress_meter(void)
static void
sig_winch(int sig)
{
- signal(SIGWINCH, sig_winch);
win_resized = 1;
}
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 471ec0b6b14..3e42ce6b393 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/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
@@ -272,10 +272,7 @@ close_startup_pipes(void)
static void
sighup_handler(int sig)
{
- int save_errno = errno;
-
received_sighup = 1;
- errno = save_errno;
}
/*