Jiří Popelka edc04b
diff -up cups-1.4.3/cups/tempfile.c.str3382 cups-1.4.3/cups/tempfile.c
Jiří Popelka edc04b
--- cups-1.4.3/cups/tempfile.c.str3382	2010-01-18 19:47:12.000000000 +0100
Jiří Popelka edc04b
+++ cups-1.4.3/cups/tempfile.c	2010-03-31 13:26:52.000000000 +0200
Jiří Popelka e9876b
@@ -35,6 +35,7 @@
Jiří Popelka e9876b
 #  include <io.h>
Jiří Popelka e9876b
 #else
Jiří Popelka e9876b
 #  include <unistd.h>
Jiří Popelka e9876b
+#  include <sys/types.h>
Jiří Popelka e9876b
 #endif /* WIN32 || __EMX__ */
Jiří Popelka e9876b
 
Jiří Popelka e9876b
 
Jiří Popelka e9876b
@@ -56,7 +57,7 @@ cupsTempFd(char *filename,		/* I - Point
Jiří Popelka e9876b
   char		tmppath[1024];		/* Windows temporary directory */
Jiří Popelka e9876b
   DWORD		curtime;		/* Current time */
Jiří Popelka e9876b
 #else
Jiří Popelka e9876b
-  struct timeval curtime;		/* Current time */
Jiří Popelka e9876b
+  mode_t	old_umask;		/* Old umask before using mkstemp() */
Jiří Popelka e9876b
 #endif /* WIN32 */
Jiří Popelka e9876b
 
Jiří Popelka e9876b
 
Jiří Popelka e9876b
@@ -107,33 +108,25 @@ cupsTempFd(char *filename,		/* I - Point
Jiří Popelka e9876b
 
Jiří Popelka e9876b
     snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir,
Jiří Popelka e9876b
              GetCurrentProcessId(), curtime);
Jiří Popelka e9876b
-#else
Jiří Popelka e9876b
-   /*
Jiří Popelka e9876b
-    * Get the current time of day...
Jiří Popelka e9876b
-    */
Jiří Popelka e9876b
-
Jiří Popelka e9876b
-    gettimeofday(&curtime, NULL);
Jiří Popelka e9876b
-
Jiří Popelka e9876b
-   /*
Jiří Popelka e9876b
-    * Format a string using the hex time values...
Jiří Popelka e9876b
-    */
Jiří Popelka e9876b
-
Jiří Popelka edc04b
-    snprintf(filename, len - 1, "%s/%05x%08x", tmpdir, (unsigned)getpid(),
Jiří Popelka edc04b
-             (unsigned)(curtime.tv_sec + curtime.tv_usec + tries));
Jiří Popelka e9876b
-#endif /* WIN32 */
Jiří Popelka e9876b
 
Jiří Popelka e9876b
    /*
Jiří Popelka e9876b
     * Open the file in "exclusive" mode, making sure that we don't
Jiří Popelka e9876b
     * stomp on an existing file or someone's symlink crack...
Jiří Popelka e9876b
     */
Jiří Popelka e9876b
 
Jiří Popelka e9876b
-#ifdef WIN32
Jiří Popelka e9876b
     fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY,
Jiří Popelka e9876b
               _S_IREAD | _S_IWRITE);
Jiří Popelka e9876b
-#elif defined(O_NOFOLLOW)
Jiří Popelka e9876b
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
Jiří Popelka e9876b
 #else
Jiří Popelka e9876b
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
Jiří Popelka e9876b
+
Jiří Popelka e9876b
+   /*
Jiří Popelka e9876b
+    * Use the standard mkstemp() call to make a temporary filename
Jiří Popelka e9876b
+    * securely.  -- andrew.wood@jdplc.com
Jiří Popelka e9876b
+    */
Jiří Popelka e9876b
+    snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir);
Jiří Popelka e9876b
+
Jiří Popelka e9876b
+    old_umask = umask(0077);
Jiří Popelka e9876b
+    fd = mkstemp(filename);
Jiří Popelka e9876b
+    umask(old_umask);
Jiří Popelka e9876b
 #endif /* WIN32 */
Jiří Popelka e9876b
 
Jiří Popelka e9876b
     if (fd < 0 && errno != EEXIST)