From 389125b25d1a1d7f22e907463b7e8eca74af79ea Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 15 Feb 2018 21:43:01 +1100 Subject: [PATCH] Replace remaining mysignal() with signal(). These seem to have been missed during the replacement of mysignal with #define signal in commit 5ade9ab. Both include the requisite headers to pick up the #define. --- entropy.c | 4 ++-- serverloop.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/entropy.c b/entropy.c index 9305f89ae..14b98f188 100644 --- a/entropy.c +++ b/entropy.c @@ -108,7 +108,7 @@ get_random_bytes_prngd(unsigned char *buf, int len, strlen(socket_path) + 1; } - old_sigpipe = mysignal(SIGPIPE, SIG_IGN); + old_sigpipe = signal(SIGPIPE, SIG_IGN); errors = 0; rval = -1; @@ -158,7 +158,7 @@ reopen: rval = 0; done: - mysignal(SIGPIPE, old_sigpipe); + signal(SIGPIPE, old_sigpipe); if (fd != -1) close(fd); return rval; diff --git a/serverloop.c b/serverloop.c index e9bd9b5e5..7e2abd52f 100644 --- a/serverloop.c +++ b/serverloop.c @@ -373,7 +373,7 @@ server_loop2(struct ssh *ssh, Authctxt *authctxt) debug("Entering interactive session for SSH2."); - mysignal(SIGCHLD, sigchld_handler); + signal(SIGCHLD, sigchld_handler); child_terminated = 0; connection_in = packet_get_connection_in(); connection_out = packet_get_connection_out();