dovecot-1.1: Expire plugin wasn't working unless expire_altmove ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/e1fe3d080314
changeset: 7460:e1fe3d080314
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Apr 25 00:52:56 2008 +0300
description:
Expire plugin wasn't working unless expire_altmove was also defined.

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
src/plugins/expire/expire-env.c |    2 +-

diffs (12 lines):

diff -r 63cd8ec2007a -r e1fe3d080314 src/plugins/expire/expire-env.c
--- a/src/plugins/expire/expire-env.c	Thu Apr 24 17:24:32 2008 +0300
+++ b/src/plugins/expire/expire-env.c	Fri Apr 25 00:52:56 2008 +0300
@@ -111,7 +111,7 @@ unsigned int expire_box_find_min_secs(st
 	unsigned int secs1, secs2;
 
 	(void)expire_box_find(env, name, &secs1, &secs2);
-	if (secs1 < secs2 && secs1 != 0) {
+	if (secs1 != 0 && (secs1 < secs2 || secs2 == 0)) {
 		*altmove_r = FALSE;
 		return secs1;
 	} else {