git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugzilla #1106: Don't pass DKIM compound log line as format string
[exim.git]
/
src
/
src
/
dbfn.c
diff --git
a/src/src/dbfn.c
b/src/src/dbfn.c
index 8efdc2ed96e92b9b52d1a1e66f9c3e7e05ec10a3..751ca2e1aafa91570bdddf5ae8e3ddae3d18a43e 100644
(file)
--- a/
src/src/dbfn.c
+++ b/
src/src/dbfn.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/dbfn.c,v 1.
7 2005/12/15 11:18:21 ph10
Exp $ */
+/* $Cambridge: exim/src/src/dbfn.c,v 1.
11 2009/11/16 19:50:36 nm4
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
5
*/
+/* Copyright (c) University of Cambridge 1995 - 200
9
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-142,8
+142,8
@@
alarm(0);
if (sigalrm_seen) errno = ETIMEDOUT;
if (rc < 0)
{
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,
+ 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);
errno = 0; /* Indicates locking failure */
(errno == ETIMEDOUT)? "timed out" : strerror(errno));
(void)close(dbblock->lockfd);
errno = 0; /* Indicates locking failure */