Print the value of TMPDIR in the test notifier (used for "make check" to

verify that cupsd is passing the TMPDIR environment variable...)

Don't try to register/unregister profiles on Mac OS X when we are not
running as root.

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

diff --git a/notifier/testnotify.c b/notifier/testnotify.c
index 96e9dd1426b0f8858563671fe38fcd1b5f2ac90e..eaa3e7391f3943115991677ac5268b5244bd2841 100644 (file)
--- a/notifier/testnotify.c
+++ b/notifier/testnotify.c
@@ -52,6 +52,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   fprintf(stderr, "DEBUG: argc=%d\n", argc);
   for (i = 0; i < argc; i ++)
     fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);
+  fprintf(stderr, "DEBUG: TMPDIR=\"%s\"\n", getenv("TMPDIR"));
 
   for (;;)
   {

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 191b36bc4795238d201a3467572ce00cfd1cd71e..5df7628847f08626faa1dfea28eb43736d098fef 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -2758,8 +2758,11 @@ add_printer(cupsd_client_t  *con,        /* I - Client connection */
         * (Re)register color profiles...
        */
 
-        apple_unregister_profiles(printer);
-       apple_register_profiles(printer);
+        if (!RunUser)
+       {
+         apple_unregister_profiles(printer);
+         apple_register_profiles(printer);
+        }
 #endif /* __APPLE__ */
       }
       else
@@ -2820,8 +2823,11 @@ add_printer(cupsd_client_t  *con,        /* I - Client connection */
       * (Re)register color profiles...
       */
 
-      apple_unregister_profiles(printer);
-      apple_register_profiles(printer);
+      if (!RunUser)
+      {
+       apple_unregister_profiles(printer);
+       apple_register_profiles(printer);
+      }
 #endif /* __APPLE__ */
     }
   }