ph10 2006/04/25 11:06:30 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src/transports appendfile.c
Log:
Make lockfile_mode apply to MBX lock files.
Revision Changes Path
1.346 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.16 +2 -2 exim/exim-src/src/transports/appendfile.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- ChangeLog 20 Apr 2006 15:05:15 -0000 1.345
+++ ChangeLog 25 Apr 2006 10:06:30 -0000 1.346
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.345 2006/04/20 15:05:15 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.346 2006/04/25 10:06:30 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -35,6 +35,10 @@
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.
+
+PH/07 The appendfile transport was creating MBX lock files with a fixed mode
+ of 0600. This has been changed to use the value of the lockfile_mode
+ option (which defaults to 0600).
Exim version 4.61
Index: appendfile.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/appendfile.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- appendfile.c 20 Apr 2006 14:11:29 -0000 1.15
+++ appendfile.c 25 Apr 2006 10:06:30 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/appendfile.c,v 1.15 2006/04/20 14:11:29 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/appendfile.c,v 1.16 2006/04/25 10:06:30 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2019,7 +2019,7 @@
}
}
- mbx_lockfd = Uopen(mbx_lockname, O_RDWR | O_CREAT, 0600);
+ mbx_lockfd = Uopen(mbx_lockname, O_RDWR | O_CREAT, ob->lockfile_mode);
if (mbx_lockfd < 0)
{
addr->basic_errno = ERRNO_LOCKFAILED;
@@ -2028,7 +2028,7 @@
goto RETURN;
}
- (void)Uchmod(mbx_lockname, 0600);
+ (void)Uchmod(mbx_lockname, ob->lockfile_mode);
if (apply_lock(mbx_lockfd, F_WRLCK, ob->use_fcntl,
ob->lock_fcntl_timeout, ob->use_flock, ob->lock_flock_timeout) >= 0)
