Attachment 265091 Details for Bug 392681 – Fix for the jwhois IPv4 connect issue

[patch] Fix for the jwhois IPv4 connect issue

jwhois-connect-fix.patch (text/plain), 2.87 KB, created by Lubomir Kundrak on 2007-11-20 16:41:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Kundrak

Created: 2007-11-20 16:41:48 UTC

Size: 2.87 KB

patch

obsolete

>Index: jwhois-4.0-connect.patch
>===================================================================
>RCS file: jwhois-4.0-connect.patch
>diff -N jwhois-4.0-connect.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ jwhois-4.0-connect.patch	20 Nov 2007 16:40:53 -0000
>@@ -0,0 +1,58 @@
>+This fixes somewhat reversed logic of trying to connect to WHOIS server.
>+Tue Nov 20 2007, Lubomir Kundrak <lkundrak@redhat.com>
>+
>+--- jwhois-4.0/src/utils.c.connect	2007-06-26 09:00:20.000000000 +0200
>++++ jwhois-4.0/src/utils.c	2007-11-20 17:05:33.000000000 +0100
>+@@ -247,7 +247,7 @@ make_connect(const char *host, int port)
>+     {
>+       return -1;
>+     }
>+-  while (res)
>++  for (; res; res = res->ai_next)
>+     {
>+       sa = res->ai_addr;
>+       sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
>+@@ -266,15 +266,15 @@ make_connect(const char *host, int port)
>+       flags = fcntl(sockfd, F_GETFL, 0);
>+       if (fcntl(sockfd, F_SETFL, flags|O_NONBLOCK) == -1)
>+ 	{
>++	  close (sockfd);
>+ 	  return -1;
>+ 	}
>+ 
>+-
>+       error = connect(sockfd, res->ai_addr, res->ai_addrlen);
>+-
>+       if (error < 0 && errno != EINPROGRESS)
>+ 	{
>+-	  break;
>++	  close (sockfd);
>++	  continue;
>+ 	}
>+ 
>+       FD_ZERO(&fdset);
>+@@ -283,18 +283,20 @@ make_connect(const char *host, int port)
>+       error = select(FD_SETSIZE, NULL, &fdset, NULL, &timeout);
>+       if (error == 0)
>+ 	{
>+-	  break;
>++	  close (sockfd);
>++	  return -1;
>+ 	}
>+ 
>+       retlen = sizeof(retval);
>+       error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen);
>+       if (error < 0 || retval)
>+ 	{
>+-	  break;
>++	  close (sockfd);
>++	  return -1;
>+ 	}
>+-      res = res->ai_next;
>++
>++      break;
>+     }
>+-  if (error < 0 || retval) return -1;
>+ #endif
>+ 
>+   return sockfd;
>Index: jwhois.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/jwhois/devel/jwhois.spec,v
>retrieving revision 1.37
>diff -u -p -r1.37 jwhois.spec
>--- jwhois.spec	9 Oct 2007 08:59:05 -0000	1.37
>+++ jwhois.spec	20 Nov 2007 16:40:53 -0000
>@@ -1,8 +1,9 @@
> Name: jwhois
> Version: 4.0
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> URL: http://www.gnu.org/software/jwhois/
> Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
>+Patch0: jwhois-4.0-connect.patch
> License: GPLv3
> Group: Applications/Internet
> Summary: Internet whois/nicname client
>@@ -17,6 +18,7 @@ A whois client that accepts both traditi
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .connect
> 
> iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
> mv doc/sv/jwhois.1_ doc/sv/jwhois.1
>@@ -56,6 +58,9 @@ fi
> [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
> 
> %changelog
>+* Tue Nov 20 2007 Lubomir Kundrak <lkundak@redhat.com> - 4.0-4
>+- Fix connections to IPv4 servers
>+
> * Tue Oct  9 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.0-3
> - Fix localized man pages not marked with %lang (patch by Ville
>   SkyttÃ¤ <ville.skytta@iki.fi>)

Actions: View | Diff

Attachments on bug 392681: 265091