| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | |
| 3 | diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c |
| 4 | --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200 |
| 5 | +++ tcp_wrappers_7.6/rfc931.c 2004-08-29 18:41:04.000000000 +0200 |
| 6 | @@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1. |
| 7 | |
| 8 | int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */ |
| 9 | |
| 10 | -static jmp_buf timebuf; |
| 11 | +static sigjmp_buf timebuf; |
| 12 | |
| 13 | /* fsocket - open stdio stream on top of socket */ |
| 14 | |
| 15 | @@ -62,7 +62,7 @@ int protocol; |
| 16 | static void timeout(sig) |
| 17 | int sig; |
| 18 | { |
| 19 | - longjmp(timebuf, sig); |
| 20 | + siglongjmp(timebuf, sig); |
| 21 | } |
| 22 | |
| 23 | /* rfc931 - return remote user name, given socket structures */ |
| 24 | @@ -135,7 +135,7 @@ char *dest; |
| 25 | * Set up a timer so we won't get stuck while waiting for the server. |
| 26 | */ |
| 27 | |
| 28 | - if (setjmp(timebuf) == 0) { |
| 29 | + if (sigsetjmp(timebuf, 0) == 0) { |
| 30 | /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */ |
| 31 | saved_timeout = alarm(0); |
| 32 | nact.sa_handler = timeout; |