From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Wed, 17 Apr 2019 06:38:19 +0000 (+0200)
Subject: Use message_id for tempfile creation Closes 2390
X-Git-Tag: exim-4.93-RC0~236^2~1
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/cb80814d149dcab2d967bbf1b24e50436bcf374b

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 07ab3f038..01ee17960 100644
--- 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).
 
+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
 -----------------
diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index 3970206cb..a4a734a1a 100644
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -134,8 +134,7 @@ struct stat statbuf;
 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);