summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Finch <dot@dotat.at>2011-01-14 14:12:23 +0000
committerTony Finch <dot@dotat.at>2011-01-14 14:12:23 +0000
commit8c07b69f0292fa7dbfbd2409b389ae1e4ab5e222 (patch)
treedbed54b61042b7c2fd25926886ccd5ff9b85bee0
parent293ae364882c5ecd5413cc889aa9e2b68c5d6d0b (diff)
src/dbfn.c: write lock aquisition failures to the panic log
-rw-r--r--doc/doc-txt/ChangeLog7
-rw-r--r--src/src/dbfn.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index cd0de35b7..0be0142b8 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -3,6 +3,13 @@ $Cambridge: exim/doc/doc-txt/ChangeLog,v 1.632 2010/06/12 15:21:25 jetmore Exp $
Change log file for Exim from version 4.21
-------------------------------------------
+Exim version 4.74
+-----------------
+
+TF/01 Failure to get a lock on a hints database can have serious
+ consequences so log it to the panic log.
+
+
Exim version 4.73
-----------------
diff --git a/src/src/dbfn.c b/src/src/dbfn.c
index c559a0b9b..751ca2e1a 100644
--- a/src/src/dbfn.c
+++ b/src/src/dbfn.c
@@ -142,7 +142,7 @@ alarm(0);
if (sigalrm_seen) errno = ETIMEDOUT;
if (rc < 0)
{
- log_write(0, LOG_MAIN, "Failed to get %s lock for %s: %s",
+ log_write(0, LOG_MAIN|LOG_PANIC, "Failed to get %s lock for %s: %s",
read_only? "read" : "write", buffer,
(errno == ETIMEDOUT)? "timed out" : strerror(errno));
(void)close(dbblock->lockfd);