dovecot-2.0: quota-maildir: Avoid leaving maildirsize deleted wh...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/353d73775b69
changeset: 11927:353d73775b69
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Aug 04 16:02:54 2010 +0100
description:
quota-maildir: Avoid leaving maildirsize deleted when quota recalculation is wanted.

diffstat:

 src/plugins/quota/quota-maildir.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 10c4c9d5fb5b -r 353d73775b69 src/plugins/quota/quota-maildir.c
--- a/src/plugins/quota/quota-maildir.c	Wed Aug 04 15:06:05 2010 +0100
+++ b/src/plugins/quota/quota-maildir.c	Wed Aug 04 16:02:54 2010 +0100
@@ -851,9 +851,13 @@
 	if (recalculated) {
 		/* quota was just recalculated and it already contains the changes
 		   we wanted to do. */
-	} else if (root->fd == -1 || ctx->recalculate)
-		maildirsize_rebuild_later(root);
-	else if (maildirsize_update(root, ctx->count_used, ctx->bytes_used) < 0)
+	} else if (root->fd == -1)
+		(void)maildirsize_recalculate(root);
+	else if (ctx->recalculate) {
+		(void)close(root->fd);
+		root->fd = -1;
+		(void)maildirsize_recalculate(root);
+	} else if (maildirsize_update(root, ctx->count_used, ctx->bytes_used) < 0)
 		maildirsize_rebuild_later(root);
 
 	return 0;