The scheduler did not recognize dnssd: or ipps: URIs as CUPS shared queues

(STR #4158)

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

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index c2e7e5d8ceed3318c8a160f08a9bad4b4cd068a0..303a07f9aef92f6688edb76141cfbd25131d46b3 100644 (file)
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -3,6 +3,9 @@ CHANGES-1.6.txt
 
 CHANGES IN CUPS V1.6.2
 
+       - The scheduler did not recognize dnssd: or ipps: URIs as CUPS shared
+         queues (STR #4158)
+       - The cupsd.conf file included obsolete browsing directives (STR #4157)
        - Fixed a USB backend compatibility issue on systems using libusb
          (STR #4155)
        - Some Bonjour features were not available on systems with Avahi

diff --git a/scheduler/printers.c b/scheduler/printers.c
index aac2c98de8abade7dd34e457a7852409add42804..327c50505a01980ea5e212af4322f3b60d21d82f 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -4829,13 +4829,13 @@ load_ppd(cupsd_printer_t *p)            /* I - Printer */
                   "printer-make-and-model", NULL,
                   "Local System V Printer");
     }
-    else if (!strncmp(p->device_uri, "ipp://", 6) &&
-            (strstr(p->device_uri, "/printers/") != NULL ||
-             strstr(p->device_uri, "/classes/") != NULL ||
-             ((strstr(p->device_uri, "._ipp.") != NULL ||
-               strstr(p->device_uri, "._ipps.") != NULL) &&
-              !strcmp(p->device_uri + strlen(p->device_uri) - 5,
-                      "/cups"))))
+    else if (((!strncmp(p->device_uri, "ipp://", 6) ||
+               !strncmp(p->device_uri, "ipps://", 7)) &&
+             (strstr(p->device_uri, "/printers/") != NULL ||
+              strstr(p->device_uri, "/classes/") != NULL)) ||
+            ((strstr(p->device_uri, "._ipp.") != NULL ||
+              strstr(p->device_uri, "._ipps.") != NULL) &&
+             !strcmp(p->device_uri + strlen(p->device_uri) - 5, "/cups")))
     {
      /*
       * Tell the client this is really a hard-wired remote printer.