You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.6 KiB
47 lines
1.6 KiB
14 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../tcp_wrappers/0025-tcp_wrappers-7.6-siglongjmp.patch
|
||
|
|
# Copyright (C) 2011 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
|
||
|
|
--- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200
|
||
|
|
+++ tcp_wrappers_7.6/rfc931.c 2004-08-29 18:41:04.000000000 +0200
|
||
|
|
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
|
||
|
|
|
||
|
|
int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
|
||
|
|
|
||
|
|
-static jmp_buf timebuf;
|
||
|
|
+static sigjmp_buf timebuf;
|
||
|
|
|
||
|
|
/* fsocket - open stdio stream on top of socket */
|
||
|
|
|
||
|
|
@@ -62,7 +62,7 @@ int protocol;
|
||
|
|
static void timeout(sig)
|
||
|
|
int sig;
|
||
|
|
{
|
||
|
|
- longjmp(timebuf, sig);
|
||
|
|
+ siglongjmp(timebuf, sig);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* rfc931 - return remote user name, given socket structures */
|
||
|
|
@@ -135,7 +135,7 @@ char *dest;
|
||
|
|
* Set up a timer so we won't get stuck while waiting for the server.
|
||
|
|
*/
|
||
|
|
|
||
|
|
- if (setjmp(timebuf) == 0) {
|
||
|
|
+ if (sigsetjmp(timebuf, 1) == 0) {
|
||
|
|
/* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
|
||
|
|
saved_timeout = alarm(0);
|
||
|
|
nact.sa_handler = timeout;
|