ph10 2004/10/11 10:49:43 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src/transports appendfile.c
Log:
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.
Revision Changes Path
1.2 +4 -1 exim/exim-doc/doc-txt/ChangeLog
1.2 +2 -1 exim/exim-src/src/transports/appendfile.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 7 Oct 2004 15:04:35 -0000 1.1
+++ ChangeLog 11 Oct 2004 09:49:43 -0000 1.2
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.1 2004/10/07 15:04:35 ph10 Exp $
+$Cambridge: exim/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 @@
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
Index: appendfile.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/appendfile.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- appendfile.c 7 Oct 2004 13:10:02 -0000 1.1
+++ appendfile.c 11 Oct 2004 09:49:43 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/appendfile.c,v 1.1 2004/10/07 13:10:02 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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);
