Use message_id for tempfile creation Closes 2390

Make tempfile names unique across Exim instances running in a cluster on
a shared $spool_directory. (They need to set localhost_number to have
cluster-unique message_exim_ids.)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 07ab3f038f7f52e62bed025b8a1b4db316b7d738..01ee17960c51660bdad82697bdfa082532abcaa2 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -64,6 +64,12 @@ JH/14 Bug 1891: Close the log file if receiving a non-smtp message, without
       (a previous attempt to fix addressed lack, for a long time, of initial
       input).
 
       (a previous attempt to fix addressed lack, for a long time, of initial
       input).
 

+HS/01 Bug 2390: Use message_id for tempfile creation to avoid races in a
+      shared (NFS) environment. The length of the tempfile name is now
+      4 + 16 ("hdr.$message_exim_id") which might break on file
+      systems which restrict the file name length to lower values.
+      (It was "hdr.$pid".)
+

 
 Exim version 4.92
 -----------------
 
 Exim version 4.92
 -----------------

diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index 3970206cb8be5fb5e64b3fb0fa845f1cab93856b..a4a734a1ad196a5ba9661713d90279682ab2168a 100644 (file)
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -134,8 +134,7 @@ struct stat statbuf;
 uschar * tname;
 uschar * fname;
 
 uschar * tname;
 uschar * fname;
 

-tname = spool_fname(US"input", message_subdir,
-                   string_sprintf("hdr.%d", (int)getpid()), US"");
+tname = spool_fname(US"input", message_subdir, US"hdr.", message_id);

 
 if ((fd = spool_open_temp(tname)) < 0)
   return spool_write_error(where, errmsg, US"open", NULL, NULL);
 
 if ((fd = spool_open_temp(tname)) < 0)
   return spool_write_error(where, errmsg, US"open", NULL, NULL);