[jwhois/f14/master] Fix jwhois does not handle multi-homed server

[vcrhonek]

commit aba0f2322bfaebfae4b56c26df9ffb7cdc36bd0d
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Wed Sep 29 16:30:01 2010 +0200

    Fix jwhois does not handle multi-homed server

 jwhois-4.0-multi-homed.patch |   15 +++++++++++++++
 jwhois.spec                  |    8 +++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/jwhois-4.0-multi-homed.patch b/jwhois-4.0-multi-homed.patch
new file mode 100644
index 0000000..05d6f46
--- /dev/null
+++ b/jwhois-4.0-multi-homed.patch
@@ -0,0 +1,15 @@
+diff -up jwhois-4.0/src/utils.c.orig jwhois-4.0/src/utils.c
+--- jwhois-4.0/src/utils.c.orig	2010-09-29 16:19:24.453608330 +0200
++++ jwhois-4.0/src/utils.c	2010-09-29 16:20:10.686608189 +0200
+@@ -292,7 +292,10 @@ make_connect(const char *host, int port)
+       if (error < 0 || retval)
+ 	{
+ 	  close (sockfd);
+-	  return -1;
++	  if (retval == ENETUNREACH)
++	    continue;
++	  else
++	    return -1;
+ 	}
+ 
+       break;
diff --git a/jwhois.spec b/jwhois.spec
index 8e19866..0a6fdcb 100644
--- a/jwhois.spec
+++ b/jwhois.spec
@@ -2,7 +2,7 @@
 
 Name: jwhois
 Version: 4.0
-Release: 21%{?dist}
+Release: 22%{?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
@@ -10,6 +10,7 @@ Patch1: jwhois-4.0-ipv6match.patch
 Patch2: jwhois-4.0-fclose.patch
 Patch3: jwhois-4.0-select.patch
 Patch4: jwhois-4.0-conf_update.patch
+Patch5: jwhois-4.0-multi-homed.patch
 License: GPLv3
 Group: Applications/Internet
 Summary: Internet whois/nicname client
@@ -31,6 +32,7 @@ A whois client that accepts both traditional and finger-style queries.
 %patch2 -p1 -b .fclose
 %patch3 -p1 -b .select
 %patch4 -p1 -b .conf_update
+%patch5 -p1 -b .multi-homed
 
 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
@@ -96,6 +98,10 @@ fi
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Sep 29 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-22
+- Fix jwhois does not handle multi-homed server
+  Resolves: #624608
+
 * Tue Jun 22 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.0-21
 - Update server options for whois.1api.net
   Resolves: #600096