Import openssh_8.2p1.orig.tar.gz

1 files changed, 3 insertions, 5 deletions

diff --git a/progressmeter.c b/progressmeter.c
index 0e58eddec..8baf798f1 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.50 2020/01/23 07:10:22 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);
 }
@@ -253,8 +252,8 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr)
         setscreensize();
         refresh_progress_meter(1);
 
-        signal(SIGALRM, sig_alarm);
-        signal(SIGWINCH, sig_winch);
+        ssh_signal(SIGALRM, sig_alarm);
+        ssh_signal(SIGWINCH, sig_winch);
         alarm(UPDATE_INTERVAL);
 }
 
@@ -277,7 +276,6 @@ stop_progress_meter(void)
 static void
 sig_winch(int sig)
 {
-        signal(SIGWINCH, sig_winch);
         win_resized = 1;
 }