From 8342f0d21ece6cbd84cec0b9a27c9ae9ed8da74b Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 31 Mar 2010 16:08:33 +0000
Subject: [PATCH] - Another BrowsePoll fix: handle EAI_NODATA as well (bug
 #567353).

---
 cups-EAI_AGAIN.patch | 2 +-
 cups-res_init.patch  | 2 +-
 cups.spec            | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cups-EAI_AGAIN.patch b/cups-EAI_AGAIN.patch
index 878315a..033e7f8 100644
--- a/cups-EAI_AGAIN.patch
+++ b/cups-EAI_AGAIN.patch
@@ -6,7 +6,7 @@ diff -up cups-1.4.2/cups/http-addr.c.EAI_AGAIN cups-1.4.2/cups/http-addr.c
      if (error)
      {
 -      if (error == EAI_FAIL)
-+      if (error == EAI_FAIL || error == EAI_AGAIN)
++      if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA)
          cg->need_res_init = 1;
  
        return (httpAddrString(addr, name, namelen));
diff --git a/cups-res_init.patch b/cups-res_init.patch
index 1660f07..22c75ba 100644
--- a/cups-res_init.patch
+++ b/cups-res_init.patch
@@ -6,7 +6,7 @@ diff -up cups-1.4b2-svn8404/cups/http-addrlist.c.res_init cups-1.4b2-svn8404/cup
        freeaddrinfo(results);
      }
 -    else if (error == EAI_FAIL)
-+    else if (error == EAI_FAIL || error == EAI_AGAIN)
++    else if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA)
        cg->need_res_init = 1;
  
  #else
diff --git a/cups.spec b/cups.spec
index 469c8eb..d822f37 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -521,6 +521,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Mar 31 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.3-2
+- Another BrowsePoll fix: handle EAI_NODATA as well (bug #567353).
+
 * Wed Mar 31 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.3-1
 - 1.4.3.
 - No longer need CVE-2009-3553, str3381, str3390, str3391,