diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-04-20 15:05:15 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-04-20 15:05:15 +0000 |
| commit | d87df92cd9117c3bee1db7741090a974f3463848 (patch) | |
| tree | 525221dfcb622f754696e2293041f46df7132ad6 | |
| parent | f7fd3850601c141d3a8d5b9cc6e6403f623923ae (diff) | |
Correct logging bug for failures to get hints database read lock.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/dbfn.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 8fb90d750..28044a279 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.344 2006/04/20 14:11:29 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.345 2006/04/20 15:05:15 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -33,6 +33,9 @@ PH/05 Batch deliveries by appendfile and pipe transports did not work when the File deliveries just didn't batch; pipe deliveries might have suffered odd errors. +PH/06 A failure to get a lock for a hints database would erroneously always say + "Failed to get write lock", even when it was really a read lock. + Exim version 4.61 ----------------- diff --git a/src/src/dbfn.c b/src/src/dbfn.c index 938400ccb..cefa0b323 100644 --- a/src/src/dbfn.c +++ b/src/src/dbfn.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/dbfn.c,v 1.8 2006/02/07 11:19:00 ph10 Exp $ */ +/* $Cambridge: exim/src/src/dbfn.c,v 1.9 2006/04/20 15:05:15 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -143,7 +143,7 @@ if (sigalrm_seen) errno = ETIMEDOUT; if (rc < 0) { log_write(0, LOG_MAIN, "Failed to get %s lock for %s: %s", - ((flags & O_RDONLY) != 0)? "read" : "write", buffer, + read_only? "read" : "write", buffer, (errno == ETIMEDOUT)? "timed out" : strerror(errno)); (void)close(dbblock->lockfd); errno = 0; /* Indicates locking failure */ |