From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 15 Dec 2014 14:51:10 +0000 (+0000)
Subject: Don't try to talk to colord unless we are running as root.
X-Git-Tag: v2.2b1~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a891ff4cc9cb14e99bc99b2157036969fef9e269;p=thirdparty%2Fcups.git

Don't try to talk to colord unless we are running as root.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12368 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/scheduler/colorman.c b/scheduler/colorman.c
index 84437b207a..ec6507b6bf 100644
--- a/scheduler/colorman.c
+++ b/scheduler/colorman.c
@@ -151,8 +151,11 @@ cupsdRegisterColor(cupsd_printer_t *p)	/* I - Printer */
   }
 
 #elif defined(HAVE_DBUS)
-  colord_unregister_printer(p);
-  colord_register_printer(p);
+  if (!RunUser)
+  {
+    colord_unregister_printer(p);
+    colord_register_printer(p);
+  }
 #endif /* __APPLE__ */
 }
 
@@ -205,7 +208,8 @@ cupsdUnregisterColor(cupsd_printer_t *p)/* I - Printer */
     apple_unregister_profiles(p);
 
 #elif defined(HAVE_DBUS)
-  colord_unregister_printer(p);
+  if (!RunUser)
+    colord_unregister_printer(p);
 #endif /* __APPLE__ */
 }