ph10 2006/04/20 16:05:15 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src dbfn.c
Log:
Correct logging bug for failures to get hints database read lock.
Revision Changes Path
1.345 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.9 +1 -1 exim/exim-src/src/dbfn.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- ChangeLog 20 Apr 2006 14:11:29 -0000 1.344
+++ ChangeLog 20 Apr 2006 15:05:15 -0000 1.345
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.344 2006/04/20 14:11:29 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -32,6 +32,9 @@
addresses were routed directly to files or pipes from a redirect router.
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
Index: dbfn.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dbfn.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dbfn.c 7 Feb 2006 11:19:00 -0000 1.8
+++ dbfn.c 20 Apr 2006 15:05:15 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dbfn.c,v 1.8 2006/02/07 11:19:00 ph10 Exp $ */
+/* $Cambridge: exim/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 (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 */
