From 37e038819ebf8fdbe55c260bbebc22f2c611494c Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sun, 29 Jan 2012 17:43:29 +0100 Subject: [PATCH] SMTP-Client: Fix handling of retry-time. --- citadel/modules/smtp/serv_smtpqueue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c index 72b73bf1a..f56ad9a9a 100644 --- a/citadel/modules/smtp/serv_smtpqueue.c +++ b/citadel/modules/smtp/serv_smtpqueue.c @@ -661,7 +661,8 @@ void smtp_do_procmsg(long msgnum, void *userdata) { /* * Postpone delivery if we've already tried recently. */ - if (((time(NULL) - MyQItem->ReattemptWhen) > 0) && + if ((MyQItem->ReattemptWhen != 0) && + (time(NULL) < MyQItem->ReattemptWhen) && (run_queue_now == 0)) { syslog(LOG_DEBUG, "SMTP client: Retry time not yet reached.\n"); -- 2.30.2