From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Thu, 18 Apr 2013 14:26:43 +0000 (+0000)
Subject: Make sure we still register a profile slot on OS X, even if the profile itself
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ae79677a7c8a04d274f4b80b82018c32406ed1f;p=thirdparty%2Fcups.git

Make sure we still register a profile slot on OS X, even if the profile itself
can't be registered for security/access reasons.


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

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 03dcd16715..e5d08e7fea 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -5,6 +5,8 @@ CHANGES IN CUPS V1.6.3
 
 	- The configure script now prefers Clang over GCC.
 	- Fixed a compile problem on AIX (STR #4307)
+	- Insecure ICC profiles prevented installation of user profiles for a
+	  printer on OS X.
 	- Added more USB quirks for the libusb-based backend (STR #4311)
 	- The Russian web interface templates were broken (STR #4310)
 	- The scheduler no longer tries to do Kerberos authentication over the
diff --git a/scheduler/colorman.c b/scheduler/colorman.c
index a5838503d6..8aa5913f99 100644
--- a/scheduler/colorman.c
+++ b/scheduler/colorman.c
@@ -40,6 +40,25 @@
  *
  * Contents:
  *
+ *   cupsdRegisterColor()	   - Register vendor color profiles in a PPD
+ *				     file.
+ *   cupsdStartColor()		   - Initialize color management.
+ *   cupsdStopColor()		   - Shutdown color management.
+ *   cupsdUnregisterColor()	   - Unregister vendor color profiles in a PPD
+ *				     file.
+ *   apple_init_profile()	   - Initialize a color profile.
+ *   apple_register_profiles()	   - Register color profiles for a printer.
+ *   apple_unregister_profiles()   - Remove color profiles for the specified
+ *				     printer.
+ *   colord_create_device()	   - Create a device and register profiles.
+ *   colord_create_profile()	   - Create a color profile for a printer.
+ *   colord_delete_device()	   - Delete a device
+ *   colord_device_add_profile()   - Assign a profile to a device.
+ *   colord_dict_add_strings()	   - Add two strings to a dictionary.
+ *   colord_find_device()	   - Finds a device
+ *   colord_get_qualifier_format() - Get the qualifier format.
+ *   colord_register_printer()	   - Register profiles for a printer.
+ *   colord_unregister_printer()   - Unregister profiles for a printer.
  */
 
 /*
@@ -307,7 +326,7 @@ apple_init_profile(
   * Fill in the profile data...
   */
 
- if (iccfile)
+ if (iccfile && *iccfile)
  {
     url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,
 						  (const UInt8 *)iccfile,
@@ -497,7 +516,7 @@ apple_register_profiles(
 
         if (_cupsFileCheck(iccfile, _CUPS_FILE_CHECK_FILE, !RunUser,
 	                   cupsdLogFCMessage, p))
-	  continue;
+	  iccfile[0] = '\0';
 
 	cupsArraySave(ppd->sorted_attrs);