From: Nigel Metheringham <nigel@exim.org>
Date: Mon, 19 Oct 2009 12:42:13 +0000 (+0000)
Subject: Use transport mode as default mode for maildirsize file. Fixes: #727
X-Git-Tag: exim-4_70_RC3~22
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/dc988b7ebdcb6229e1c9c5a4682851327bb1ba23

Use transport mode as default mode for maildirsize file. Fixes: #727
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 295e91723..cc1aa711f 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.575 2009/10/19 11:47:43 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.576 2009/10/19 12:42:13 nm4 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -123,6 +123,8 @@ NM/23 Bugzilla 687: Fix misparses in eximstats
 NM/24 Bugzilla 688: Fix exiwhat to handle log_selector = +pid
       Patch provided by Heiko Schlittermann
 
+NM/24 Bugzilla 727: Use transport mode as default mode for maildirsize file
+
 
 Exim version 4.69
 -----------------
diff --git a/src/src/transports/tf_maildir.c b/src/src/transports/tf_maildir.c
index 26c999b0c..98862cc90 100644
--- 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.11 2008/05/16 12:02:19 nm4 Exp $ */
+/* $Cambridge: exim/src/src/transports/tf_maildir.c,v 1.12 2009/10/19 12:42:13 nm4 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -392,7 +392,7 @@ the same thing. */
 filename = string_sprintf("%s/maildirsize", path);
 
 DEBUG(D_transport) debug_printf("looking for maildirsize in %s\n", path);
-fd = Uopen(filename, O_RDWR|O_APPEND, 0600);
+fd = Uopen(filename, O_RDWR|O_APPEND, ob->mode ? ob->mode : 0600);
 if (fd < 0)
   {
   if (errno != ENOENT) return -1;