Merge changes from CUPS 1.6svn-r10127.

[thirdparty/cups.git] / scheduler / conf.c

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 85dce903501df772844a9fd654fd3205b9e975f6..e6f9e974145967d296bf08b58a00a52803813044 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -945,7 +945,12 @@ cupsdReadConfiguration(void)
 
   if (!TempDir)
   {
+#ifdef __APPLE__
+    if ((tmpdir = getenv("TMPDIR")) != NULL &&
+        strncmp(tmpdir, "/private/tmp", 12))
+#else
     if ((tmpdir = getenv("TMPDIR")) != NULL)
+#endif /* __APPLE__ */
     {
      /*
       * TMPDIR is defined, see if it is OK for us to use...