Ensure we log the error message when unlink() fails.

See also commit ID 0761d44e

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index dc8e0437d1d1a02c222c0257515f8a893f087726..8ca5d85af54ef9d2b6b583daad387a5a87819e4a 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -14,6 +14,10 @@ TF/01 HP/UX build fix: avoid arithmetic on a void pointer.
 TK/01 DKIM Verification: Fix relaxed canon for empty headers w/o
       whitespace trailer
 
 TK/01 DKIM Verification: Fix relaxed canon for empty headers w/o
       whitespace trailer
 

+TF/02 Fix a couple more cases where we did not log the error message
+      when unlink() failed. See also change 4.74-TF/03.
+
+

 Exim version 4.76
 -----------------
 
 Exim version 4.76
 -----------------
 

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 41e4a66f3b896ed3cc816f22fa4d5161c119fa66..6cb34857fdf0cf2cd12d10d6483a060818b44bb9 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6575,10 +6575,12 @@ if (addr_defer == NULL)
 
   sprintf(CS spoolname, "%s/input/%s/%s-D", spool_directory, message_subdir, id);
   if (Uunlink(spoolname) < 0)
 
   sprintf(CS spoolname, "%s/input/%s/%s-D", spool_directory, message_subdir, id);
   if (Uunlink(spoolname) < 0)

-    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to unlink %s", spoolname);
+    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to unlink %s: %s",
+      spoolname, strerror(errno));

   sprintf(CS spoolname, "%s/input/%s/%s-H", spool_directory, message_subdir, id);
   if (Uunlink(spoolname) < 0)
   sprintf(CS spoolname, "%s/input/%s/%s-H", spool_directory, message_subdir, id);
   if (Uunlink(spoolname) < 0)

-    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to unlink %s", spoolname);
+    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to unlink %s: %s",
+      spoolname, strerror(errno));

 
   /* Log the end of this message, with queue time if requested. */
 
 
   /* Log the end of this message, with queue time if requested. */