From 2a0cf2046843864be5480664a19b0d0104fbc24a Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mon, 2 Oct 2017 11:44:15 +0200
Subject: [PATCH] 1484916 - Can not get destinations from CUPS server

---
 cups-no-dest.patch | 19 +++++++++++++++++++
 cups.spec          |  8 +++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 cups-no-dest.patch

diff --git a/cups-no-dest.patch b/cups-no-dest.patch
new file mode 100644
index 0000000..2960a8f
--- /dev/null
+++ b/cups-no-dest.patch
@@ -0,0 +1,19 @@
+diff -up cups-2.2.4/cups/dest.c.no-dest cups-2.2.4/cups/dest.c
+--- cups-2.2.4/cups/dest.c.no-dest	2017-10-02 10:39:19.615395062 +0200
++++ cups-2.2.4/cups/dest.c	2017-10-02 10:39:54.361104943 +0200
+@@ -2059,15 +2059,6 @@ cupsGetDests2(http_t      *http,	/* I -
+ 
+   cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_get_cb, &data);
+ 
+-  if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
+-  {
+-    cupsFreeDests(data.num_dests, data.dests);
+-
+-    *dests = (cups_dest_t *)0;
+-
+-    return (0);
+-  }
+-
+  /*
+   * Make a copy of the "real" queues for a later sanity check...
+   */
diff --git a/cups.spec b/cups.spec
index 7aedeec..e56bf9a 100644
--- a/cups.spec
+++ b/cups.spec
@@ -15,7 +15,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -63,6 +63,7 @@ Patch36: cups-web-devices-timeout.patch
 Patch37: cups-synconclose.patch
 Patch38: cups-resolv_reload.patch
 Patch39: cups-ypbind.patch
+Patch40: cups-no-dest.patch
 
 Patch100: cups-lspp.patch
 
@@ -258,6 +259,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch38 -p1 -b .resolv_reload
 # CUPS may fail to start if NIS groups are used (bug #1494558)
 %patch39 -p1 -b .ypbind
+# Can not get destinations from CUPS server (bug #1484916)
+%patch40 -p1 -b .no-dest
 
 %if %{lspp}
 # LSPP support.
@@ -623,6 +626,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Mon Oct 02 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.4-5
+- 1484916 - Can not get destinations from CUPS server
+
 * Fri Sep 22 2017 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.4-4
 - 1494558 - CUPS may fail to start if NIS groups are used