SOURCES: tcp_wrappers-alarm.patch - merge hunks from tcp_wrappers-...
baggins
baggins at pld-linux.org
Sat Jul 7 02:50:24 CEST 2007
Author: baggins Date: Sat Jul 7 00:50:24 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merge hunks from tcp_wrappers-fix.patch
---- Files affected:
SOURCES:
tcp_wrappers-alarm.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/tcp_wrappers-alarm.patch
diff -u SOURCES/tcp_wrappers-alarm.patch:1.3 SOURCES/tcp_wrappers-alarm.patch:1.4
--- SOURCES/tcp_wrappers-alarm.patch:1.3 Tue May 1 23:14:58 2001
+++ SOURCES/tcp_wrappers-alarm.patch Sat Jul 7 02:50:19 2007
@@ -13,7 +13,7 @@
int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
--static sigjmp_buf timebuf;
+-static jmp_buf timebuf;
+struct sigaction oldact;
+int restored = 0;
@@ -27,7 +27,7 @@
-int sig;
+static void timeout(int signum)
{
-- siglongjmp(timebuf, sig);
+- longjmp(timebuf, sig);
+ sigaction(SIGALRM,&oldact,NULL);
+ restored = 1;
}
@@ -46,7 +46,7 @@
* Set up a timer so we won't get stuck while waiting for the server.
*/
-- if (sigsetjmp(timebuf,1) == 0) {
+- if (setjmp(timebuf) == 0) {
- signal(SIGALRM, timeout);
- alarm(rfc931_timeout);
+ act.sa_handler = timeout;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/tcp_wrappers-alarm.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list