From e880446b4964ced5bdc695f32c616808562751d9 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 16 Nov 2012 14:58:48 +0000 Subject: Patch from Fedora: tcp_wrappers-7.6-restore_sigalarm.patch --- rfc931.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/rfc931.c b/rfc931.c index bca1ce9..bfdfe6e 100644 --- a/rfc931.c +++ b/rfc931.c @@ -92,6 +92,8 @@ char *dest; char *cp; char *result = unknown; FILE *fp; + unsigned saved_timeout; + struct sigaction nact, oact; #ifdef INET6 /* address family must be the same */ @@ -134,7 +136,12 @@ char *dest; */ if (setjmp(timebuf) == 0) { - signal(SIGALRM, timeout); + /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */ + saved_timeout = alarm(0); + nact.sa_handler = timeout; + nact.sa_flags = 0; + (void) sigemptyset(&nact.sa_mask); + (void) sigaction(SIGALRM, &nact, &oact); alarm(rfc931_timeout); /* @@ -223,6 +230,10 @@ char *dest; } alarm(0); } + /* Restore SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */ + (void) sigaction(SIGALRM, &oact, NULL); + if (saved_timeout > 0) + alarm(saved_timeout); fclose(fp); } STRN_CPY(dest, result, STRING_LENGTH); -- cgit v1.2.1