cupsGetPPD did not work with statically-configured CUPS shared queues

(STR #4178)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10872 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 0b6d942b3da275f1d79bc9e7efe3bf4fb2ec39d1..c679ce737c8565bce95754fcaadeb0cc98df3a8d 100644 (file)
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -12,6 +12,8 @@ CHANGES IN CUPS V1.6.2
        - Added a French localization (STR #4247)
        - Added a Russian localization (STR #4228)
        - Updated the Catalan localization (STR #4202)
+       - cupsGetPPD did not work with statically-configured CUPS shared
+         queues (STR #4178)
        - The scheduler did not support long MIME media types (STR #4270)
        - The cupsfilter command did not set the CHARSET environment variable
          for the text filters (STR #4273)

diff --git a/cups/util.c b/cups/util.c
index a3e6427bdb752cc2b6180cec85ba0fedc6a0f7fe..b999129e2f5a599d7335c506af4fa1e793c52abf 100644 (file)
--- a/cups/util.c
+++ b/cups/util.c
@@ -1713,12 +1713,14 @@ cups_get_printer_uri(
       device_uri = attr->values[0].string.text;
 
     if (device_uri &&
-        ((strstr(device_uri, "._ipp.") != NULL ||
-          strstr(device_uri, "._ipps.") != NULL) &&
-         !strcmp(device_uri + strlen(device_uri) - 5, "/cups")))
+        (!strncmp(device_uri, "ipp://", 6) ||
+         !strncmp(device_uri, "ipps://", 7) ||
+         ((strstr(device_uri, "._ipp.") != NULL ||
+           strstr(device_uri, "._ipps.") != NULL) &&
+          !strcmp(device_uri + strlen(device_uri) - 5, "/cups"))))
     {
      /*
-      * Statically-configured Bonjour shared printer.
+      * Statically-configured shared printer.
       */
 
       httpSeparateURI(HTTP_URI_CODING_ALL,