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
Make transport name available in verify-callouts. Add verify_mode variable
[exim.git]
/
src
/
src
/
dbfn.c
diff --git
a/src/src/dbfn.c
b/src/src/dbfn.c
index 938400ccbf3decc5381d5e0880b1b976e0fa0227..4a1c20fe629d150bc831a2668d5b3232a3ad1815 100644
(file)
--- a/
src/src/dbfn.c
+++ b/
src/src/dbfn.c
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/dbfn.c,v 1.8 2006/02/07 11:19:00 ph10 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
6
*/
+/* 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
+140,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 */
@@
-210,7
+208,8
@@
if (created && geteuid() == root_uid)
if (Ustat(buffer, &statbuf) >= 0 && statbuf.st_uid != exim_uid)
{
DEBUG(D_hints_lookup) debug_printf("ensuring %s is owned by exim\n", buffer);
if (Ustat(buffer, &statbuf) >= 0 && statbuf.st_uid != exim_uid)
{
DEBUG(D_hints_lookup) debug_printf("ensuring %s is owned by exim\n", buffer);
- (void)Uchown(buffer, exim_uid, exim_gid);
+ if (Uchown(buffer, exim_uid, exim_gid))
+ DEBUG(D_hints_lookup) debug_printf("failed setting %s to owned by exim\n", buffer);
}
}
}
}
}
}