Further fix to maildirsize. Fixes: #727

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 9611cfd467c8f50658d3207d771eb5124134b214..42a5926e45ad31a9ce6a505a4c3eaf983b1e927c 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.583 2009/10/26 13:22:13 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.584 2009/10/30 15:08:25 nm4 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -124,6 +124,7 @@ NM/24 Bugzilla 688: Fix exiwhat to handle log_selector = +pid
       Patch provided by Heiko Schlittermann
 
 NM/25 Bugzilla 727: Use transport mode as default mode for maildirsize file
+      plus update to original patch.
 
 NM/26 Bugzilla 799: Documentation correction for ratelimit
 

diff --git a/src/src/transports/tf_maildir.c b/src/src/transports/tf_maildir.c
index 98862cc907e541d6d48e1a33b238b37a57f24615..06b27ff4aab2a26d1dc8f8650daa28e539d58f64 100644 (file)
--- a/src/src/transports/tf_maildir.c
+++ b/src/src/transports/tf_maildir.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transports/tf_maildir.c,v 1.12 2009/10/19 12:42:13 nm4 Exp $ */
+/* $Cambridge: exim/src/src/transports/tf_maildir.c,v 1.13 2009/10/30 15:08:25 nm4 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -559,7 +559,7 @@ else
   tempname = string_sprintf("%s/tmp/%lu.H%luP%lu.%s", path, tv.tv_sec,
     tv.tv_usec, getpid(), primary_hostname);
 
-  fd = Uopen(tempname, O_RDWR|O_CREAT|O_EXCL, 0600);
+  fd = Uopen(tempname, O_RDWR|O_CREAT|O_EXCL, ob->mode ? ob->mode : 0600);
   if (fd >= 0)
     {
     (void)sprintf(CS buffer, OFF_T_FMT "S,%dC\n" OFF_T_FMT " %d\n",