From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Fri, 7 Jul 2017 18:23:21 +0000 (-0400)
Subject: The `cupsGetDests` function incorrectly returned an empty list of printers if there was
X-Git-Tag: v2.2.5~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2f85109da901eb652babdc4f2a846c1c28228ff;p=thirdparty%2Fcups.git

The `cupsGetDests` function incorrectly returned an empty list of printers if there was
no default printer (Issue #5046)
---

diff --git a/CHANGES.md b/CHANGES.md
index 5d2bedd5df..bb895d49fa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.5 - 2017-07-04
+CHANGES - 2.2.5 - 2017-07-07
 ============================
 
 CHANGES IN CUPS V2.2.5
@@ -6,6 +6,8 @@ CHANGES IN CUPS V2.2.5
 
 - Fixed a typo in the CUPS Programming Manual (Issue #5042)
 - Fixed RPM packaging issue (Issue #5043, Issue #5044)
+- The `cupsGetDests` function incorrectly returned an empty list of printers if
+  there was no default printer (Issue #5046)
 - Fixed an issue with Chinese localizations on macOS (rdar://32419311)
 
 
diff --git a/cups/dest.c b/cups/dest.c
index 9d7426ed35..09bb76b73f 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -2072,17 +2072,6 @@ cupsGetDests2(http_t      *http,	/* I - Connection to server or @code CUPS_HTTP_
 
   cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_get_cb, &data);
 
-  if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
-  {
-    DEBUG_printf(("1cupsGetDests2: cupsLastError() is %s, returning 0.", cupsLastErrorString()));
-
-    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...
   */