rpms/jwhois/F-8 jwhois-4.0-connect.patch, NONE, 1.1 jwhois.spec, 1.37, 1.38

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/jwhois/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9388

Modified Files:
	jwhois.spec 
Added Files:
	jwhois-4.0-connect.patch 
Log Message:
Fix connections to IPv4 servers

jwhois-4.0-connect.patch:

--- NEW FILE jwhois-4.0-connect.patch ---
This fixes somewhat reversed logic of trying to connect to WHOIS server.
Tue Nov 20 2007, Lubomir Kundrak <lkundrak at 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/extras/rpms/jwhois/F-8/jwhois.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jwhois.spec	9 Oct 2007 08:59:05 -0000	1.37
+++ jwhois.spec	22 Nov 2007 11:46:04 -0000	1.38
@@ -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 @@
 
 %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,11 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Thu Nov 22 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-4
+- Fix connections to IPv4 servers (patch by Lubomir Kundrak
+  <lkundrak at redhat.com>)
+  Resolves: #394251
+
 * Tue Oct  9 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-3
 - Fix localized man pages not marked with %lang (patch by Ville
   Skyttä <ville.skytta at iki.fi>)