diff options
author | Darren Tucker <dtucker@dtucker.net> | 2018-02-15 21:43:01 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-02-15 22:06:26 +1100 |
commit | 389125b25d1a1d7f22e907463b7e8eca74af79ea (patch) | |
tree | a00f09745fba24bb711031148b2276eef1d1e48f | |
parent | 265d88d4e61e352de6791733c8b29fa3d7d0c26d (diff) |
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.
-rw-r--r-- | entropy.c | 4 | ||||
-rw-r--r-- | serverloop.c | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -108,7 +108,7 @@ get_random_bytes_prngd(unsigned char *buf, int len, | |||
108 | strlen(socket_path) + 1; | 108 | strlen(socket_path) + 1; |
109 | } | 109 | } |
110 | 110 | ||
111 | old_sigpipe = mysignal(SIGPIPE, SIG_IGN); | 111 | old_sigpipe = signal(SIGPIPE, SIG_IGN); |
112 | 112 | ||
113 | errors = 0; | 113 | errors = 0; |
114 | rval = -1; | 114 | rval = -1; |
@@ -158,7 +158,7 @@ reopen: | |||
158 | 158 | ||
159 | rval = 0; | 159 | rval = 0; |
160 | done: | 160 | done: |
161 | mysignal(SIGPIPE, old_sigpipe); | 161 | signal(SIGPIPE, old_sigpipe); |
162 | if (fd != -1) | 162 | if (fd != -1) |
163 | close(fd); | 163 | close(fd); |
164 | return rval; | 164 | 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) | |||
373 | 373 | ||
374 | debug("Entering interactive session for SSH2."); | 374 | debug("Entering interactive session for SSH2."); |
375 | 375 | ||
376 | mysignal(SIGCHLD, sigchld_handler); | 376 | signal(SIGCHLD, sigchld_handler); |
377 | child_terminated = 0; | 377 | child_terminated = 0; |
378 | connection_in = packet_get_connection_in(); | 378 | connection_in = packet_get_connection_in(); |
379 | connection_out = packet_get_connection_out(); | 379 | connection_out = packet_get_connection_out(); |