From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 27 Mar 2021 17:00:13 +0000 (+0000)
Subject: GnuTLS: use a less bogus-looking temporary filename for DH-parameters
X-Git-Tag: exim-4.95-RC0~94
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/059e42a76436f2639142a0fda905c14b1873d0e3

GnuTLS: use a less bogus-looking temporary filename for DH-parameters
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 89c45425d..3995eb05d 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -226,6 +226,10 @@ JH/46 Use an exponentially-increasing block size when malloc'ing store.  Do it
 JH/47 Use explicit alloc/free for DNS lookup workspace.  This permits using the
       same space repeatedly, and a smaller process footprint.
 
+JH/48 Use a less bogus-looking filename for a temporary used for DH-parameters
+      for GnuTLS.  Previously the name started "%s" which, while not a bug,
+      looked as if if might be one.
+
 
 
 
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 89e3ef2f6..954fd76b1 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -851,7 +851,7 @@ if (rc < 0)
     return tls_error(US"Filename too long to generate replacement",
         filename, NULL, errstr);
 
-  temp_fn = string_copy(US"%s.XXXXXXX");
+  temp_fn = string_copy(US"exim-dh.XXXXXXX");
   if ((fd = mkstemp(CS temp_fn)) < 0)	/* modifies temp_fn */
     return tls_error_sys(US"Unable to open temp file", errno, NULL, errstr);
   (void)exim_chown(temp_fn, exim_uid, exim_gid);   /* Probably not necessary */