From: Timo Sirainen <tss@iki.fi>
Date: Thu, 4 Mar 2010 18:58:31 +0000 (+0200)
Subject: anvil: Recent changes broke penalty timeout handling.
X-Git-Tag: 2.0.beta4~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37508ba28df9f6cdd4031624fcae658b40a6c795;p=thirdparty%2Fdovecot%2Fcore.git

anvil: Recent changes broke penalty timeout handling.

--HG--
branch : HEAD
---

diff --git a/src/anvil/penalty.c b/src/anvil/penalty.c
index 4c0d31288c..8750b78c51 100644
--- a/src/anvil/penalty.c
+++ b/src/anvil/penalty.c
@@ -163,6 +163,8 @@ static void penalty_timeout(struct penalty *penalty)
 	time_t rec_last_update, expire_time;
 	unsigned int diff;
 
+	timeout_remove(&penalty->to);
+
 	expire_time = ioloop_time - penalty->expire_secs;
 	while (penalty->oldest != NULL) {
 		rec = penalty->oldest;
@@ -177,7 +179,6 @@ static void penalty_timeout(struct penalty *penalty)
 		hash_table_remove(penalty->hash, rec->ident);
 		penalty_rec_free(penalty, rec);
 	}
-	timeout_remove(&penalty->to);
 }
 
 void penalty_inc(struct penalty *penalty, const char *ident,