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