Attachment 38399 Details for Bug 29994 – Patch

[patch] Patch

xauth.patch (text/plain), 1.79 KB, created by Andreas Schwab on 2010-09-03 04:53:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schwab

Created: 2010-09-03 04:53:33 UTC

Size: 1.79 KB

patch

obsolete

>From 3f96cfff057da0ac21057d64682185ed565d63cf Mon Sep 17 00:00:00 2001
>From: Andreas Schwab <schwab@linux-m68k.org>
>Date: Fri, 3 Sep 2010 13:45:49 +0200
>Subject: [PATCH] Remove alarm handler in get_hostname
>
>gethostbyaddr is not (required to be) async-signal-safe.
>---
> gethost.c |   39 ---------------------------------------
> 1 files changed, 0 insertions(+), 39 deletions(-)
>
>diff --git a/gethost.c b/gethost.c
>index 6612bc0..dc4aa7c 100644
>--- a/gethost.c
>+++ b/gethost.c
>@@ -78,29 +78,6 @@ in this Software without prior written authorization from The Open Group.
> #include <arpa/inet.h>
> #endif
> 
>-#ifdef SIGALRM
>-static volatile Bool nameserver_timedout = False;
>-
>-
>-/*
>- * get_hostname - Given an internet address, return a name (CHARON.MIT.EDU)
>- * or a string representing the address (18.58.0.13) if the name cannot
>- * be found.  Stolen from xhost.
>- */
>-
>-static jmp_buf env;
>-static RETSIGTYPE
>-nameserver_lost(int sig)
>-{
>-  nameserver_timedout = True;
>-  longjmp (env, -1);
>-  /* NOTREACHED */
>-#ifdef SIGNALRETURNSINT
>-  return -1;				/* for picky compilers */
>-#endif
>-}
>-#endif
>-
> char *
> get_hostname (Xauth *auth)
> {
>@@ -128,23 +105,7 @@ get_hostname (Xauth *auth)
> #endif
> 	    af = AF_INET;
> 	if (no_name_lookups == False) {
>-#ifdef SIGALRM
>-	/* gethostbyaddr can take a LONG time if the host does not exist.
>-	   Assume that if it does not respond in NAMESERVER_TIMEOUT seconds
>-	   that something is wrong and do not make the user wait.
>-	   gethostbyaddr will continue after a signal, so we have to
>-	   jump out of it. 
>-	   */
>-	nameserver_timedout = False;
>-	signal (SIGALRM, nameserver_lost);
>-	alarm (4);
>-	if (setjmp(env) == 0) {
>-#endif
> 	    hp = gethostbyaddr (auth->address, auth->address_length, af);
>-#ifdef SIGALRM
>-	}
>-	alarm (0);
>-#endif
> 	}
> 	if (hp)
> 	  return (hp->h_name);
>-- 
>1.7.2.2
>

Actions: View | Splinter Review

Attachments on bug 29994: 38399

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.