The dnssd backend now prefers IPPS over IPP.

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

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index f97e843e33f57272c44d22dbc114f79a1958018b..3dbbf1e5dd17f9ab908f37562fa02b8163bb315a 100644 (file)
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -3,6 +3,7 @@ CHANGES-1.5.txt
 
 CHANGES IN CUPS V1.5.3
 
+       - The dnssd backend now prefers IPPS over IPP.
        - The USB backend now uses and requires LIBUSB 1.0 or later (STR #3477)
        - The LIBUSB-based USB backend now supports the back-channel (STR #2890)
        - Changed how timeouts are implemented in the LPD backend (STR #4013)

diff --git a/backend/dnssd.c b/backend/dnssd.c
index fd86e08148e4ccab28e8497e84161ed1b2c88b63..12571b15c4d1205ea413c1e11ddfd725fa422351 100644 (file)
--- a/backend/dnssd.c
+++ b/backend/dnssd.c
@@ -3,7 +3,7 @@
  *
  *   DNS-SD discovery backend for CUPS.
  *
- *   Copyright 2008-2011 by Apple Inc.
+ *   Copyright 2008-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -43,8 +43,8 @@
 typedef enum
 {
   CUPS_DEVICE_PRINTER = 0,             /* lpd://... */
-  CUPS_DEVICE_IPP,                     /* ipp://... */
   CUPS_DEVICE_IPPS,                    /* ipps://... */
+  CUPS_DEVICE_IPP,                     /* ipp://... */
   CUPS_DEVICE_FAX_IPP,                 /* ipp://... */
   CUPS_DEVICE_PDL_DATASTREAM,          /* socket://... */
   CUPS_DEVICE_RIOUSBPRINT              /* riousbprint://... */