From 0ca0cf52fa9c635984937a3cc813d38fcdacd7ab Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Tue, 7 Jun 2011 16:48:44 +0100 Subject: [PATCH] Ensure we log the error message when unlink() fails. See also commit ID 0761d44e --- doc/doc-txt/ChangeLog | 4 ++++ src/src/deliver.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index dc8e0437d..8ca5d85af 100644 --- 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 +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 ----------------- diff --git a/src/src/deliver.c b/src/src/deliver.c index 41e4a66f3..6cb34857f 100644 --- 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) - 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) - 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. */ -- 2.30.2