From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Fri, 14 Dec 2012 18:54:04 +0000 (+0000)
Subject: Don't log permission issues for other printers' class drivers.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=127e4f131976a98a05aef57c9a43335a7de6e2b3;p=thirdparty%2Fcups.git

Don't log permission issues for other printers' class drivers.


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

diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 880e5148a4..fe8daeb2e7 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -151,9 +151,9 @@ struct crashreporter_annotations_t {
 	uint64_t dialog_mode;		// unsigned int
 };
 
-CRASH_REPORTER_CLIENT_HIDDEN 
-struct crashreporter_annotations_t gCRAnnotations 
-	__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) 
+CRASH_REPORTER_CLIENT_HIDDEN
+struct crashreporter_annotations_t gCRAnnotations
+	__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION)))
 	= { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0 };
 
 /*
@@ -280,6 +280,7 @@ typedef struct globals_s
  */
 
 globals_t g = { 0 };			/* Globals */
+int Iterating = 0;			/* Are we iterating the bus? */
 
 
 /*
@@ -1106,6 +1107,8 @@ sidechannel_thread(void *reference)
 static void iterate_printers(iterator_callback_t callBack,
 			     void *userdata)
 {
+  Iterating = 1;
+
   mach_port_t	masterPort = 0x0;
   kern_return_t kr = IOMasterPort (bootstrap_port, &masterPort);
 
@@ -1143,6 +1146,8 @@ static void iterate_printers(iterator_callback_t callBack,
     }
     mach_port_deallocate(mach_task_self(), masterPort);
   }
+
+  Iterating = 0;
 }
 
 
@@ -1431,7 +1436,7 @@ static kern_return_t load_classdriver(CFStringRef	    driverPath,
 
   _cups_fc_result_t result = _cupsFileCheck(bundlestr,
                                             _CUPS_FILE_CHECK_DIRECTORY, 1,
-                                            _cupsFileCheckFilter, NULL);
+                                            Iterating ? NULL : _cupsFileCheckFilter, NULL);
 
   if (result && driverPath)
     return (load_classdriver(NULL, interface, printerDriver));