BugFix: change 4.43/35 introduced a bug that caused file counts to be

incorrectly computed when quota_filecount was set in an appendfile transport.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index adeaba70dc6e834c2bfc85d7041503acd613c55d..ef68f01af57fd9af510487a5ffc9d35b4e9180ba 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.1 2004/10/07 15:04:35 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.2 2004/10/11 09:49:43 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -7,7 +7,10 @@ Change log file for Exim from version 4.21
 Exim version 4.44
 -----------------
 
 Exim version 4.44
 -----------------
 

-1.  Minor wording change to the doc/README.SIEVE file.
+ 1. Minor wording change to the doc/README.SIEVE file.
+
+ 2. Change 4.43/35 introduced a bug: if quota_filecount was set, the 
+    computation of the current number of files was incorrect.

 
 
 Exim version 4.43
 
 
 Exim version 4.43

diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index f7cb912ae11d267068fbaef46a5f17797a6e4b21..bdda9047de15518755f67a961eb5de3a979092df 100644 (file)
--- a/src/src/transports/appendfile.c
+++ b/src/src/transports/appendfile.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transports/appendfile.c,v 1.1 2004/10/07 13:10:02 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/appendfile.c,v 1.2 2004/10/11 09:49:43 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -2294,7 +2294,8 @@ else
   if ((mailbox_size < 0 || mailbox_filecount < 0) &&
       (ob->quota_value > 0 || THRESHOLD_CHECK))
     {
   if ((mailbox_size < 0 || mailbox_filecount < 0) &&
       (ob->quota_value > 0 || THRESHOLD_CHECK))
     {

-    int size, filecount;
+    int size;
+    int filecount = 0;

     DEBUG(D_transport)
       debug_printf("quota checks on directory %s\n", check_path);
     size = check_dir_size(check_path, &filecount, regex);
     DEBUG(D_transport)
       debug_printf("quota checks on directory %s\n", check_path);
     size = check_dir_size(check_path, &filecount, regex);