X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fdbfn.c;h=4a1c20fe629d150bc831a2668d5b3232a3ad1815;hb=cb46fd2b91514ce49ad0e13788127d756ed35145;hp=8efdc2ed96e92b9b52d1a1e66f9c3e7e05ec10a3;hpb=eff37e472369435d294c297f2a4aabb8de151554;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/dbfn.c b/src/src/dbfn.c index 8efdc2ed9..4a1c20fe6 100644 --- a/src/src/dbfn.c +++ b/src/src/dbfn.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/dbfn.c,v 1.7 2005/12/15 11:18:21 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -142,8 +140,8 @@ alarm(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 */ @@ -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); - (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); } } }