Commit 23e08ac8 authored by Till Kamppeter's avatar Till Kamppeter

Updated the patch to patch loading the PPDs for IPP print queues to the…

Updated the patch to patch loading the PPDs for IPP print queues to the corrected upstream fix (CUPS STR #4725).
parent 891b874f
Description: Applications were not able to load the PPD file from the CUPS
queues for IPP network printers as they were confused with remote CUPS queues
Author: Till Kamppeter <till.kamppeter@gmail.com>
Author: Michael Sweet <msweet@apple.com>
Bug-Upstream: https://www.cups.org/str.php?L4725
Last-Update: 2015-10-03
Last-Update: 2015-10-08
--- a/cups/util.c
+++ b/cups/util.c
@@ -1528,8 +1528,10 @@
@@ -1528,10 +1528,9 @@
}
if (device_uri &&
- (!strncmp(device_uri, "ipp://", 6) ||
- !strncmp(device_uri, "ipps://", 7) ||
+ (((!strncmp(device_uri, "ipp://", 6) ||
+ !strncmp(device_uri, "ipps://", 7)) &&
+ !strcmp(device_uri + strlen(device_uri) - strlen(resource),
+ resource)) ||
((strstr(device_uri, "._ipp.") != NULL ||
strstr(device_uri, "._ipps.") != NULL) &&
- ((strstr(device_uri, "._ipp.") != NULL ||
- strstr(device_uri, "._ipps.") != NULL) &&
+ (((!strncmp(device_uri, "ipp://", 6) || !strncmp(device_uri, "ipps://", 7)) &&
+ (strstr(device_uri, "/printers/") != NULL || strstr(device_uri, "/classes/") != NULL)) ||
+ ((strstr(device_uri, "._ipp.") != NULL || strstr(device_uri, "._ipps.") != NULL) &&
!strcmp(device_uri + strlen(device_uri) - 5, "/cups"))))
{
/*
# patches accepted and committed upstream
usb-backend-fix-infinite-loop-when-usblp-module-attached.patch
usb-backend-delayed-closing-for-old-laserjets.patch
fix-ppd-file-load-for-ipp-printers.patch
# patches sent upstream
fix-ppd-file-load-for-ipp-printers.patch
pwg-raster-attributes.patch
manpage-hyphen-minus.patch
rootbackends-worldreadable.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment