summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2004-10-11 09:49:43 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2004-10-11 09:49:43 +0000
commit5fe762f68d697d0958c02da6ba18a2256eaf134d (patch)
tree9bbbfb21ef6e6f2df3fd6ebf5b1509abda3dbd5e
parente0f3765aeecd3116bb4171bd0c5f9b609e7c0588 (diff)
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.
-rw-r--r--doc/doc-txt/ChangeLog7
-rw-r--r--src/src/transports/appendfile.c5
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index adeaba70d..ef68f01af 100644
--- 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
-------------------------------------------
@@ -7,7 +7,10 @@ Change log file for Exim from version 4.21
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
diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index f7cb912ae..bdda9047d 100644
--- 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 *
@@ -2294,7 +2294,8 @@ else
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);