From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 11 Dec 2011 18:52:35 +0000 (+0100)
Subject: re-enable waiting between mail resending attempts
X-Git-Tag: v8.11~299
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=757efd1e6a7b79474e97c475a386bc843431be9c

re-enable waiting between mail resending attempts
---

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index ce2d739bb..3057ae6ca 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -665,7 +665,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 
 	/*
 	 * Postpone delivery if we've already tried recently.
-	 * /
+	 */
 	if (((time(NULL) - MyQItem->LastAttempt.when) < MyQItem->LastAttempt.retry) && (run_queue_now == 0)) {
 		syslog(LOG_DEBUG, "SMTP client: Retry time not yet reached.\n");
 
@@ -679,7 +679,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 		////FreeQueItem(&MyQItem); TODO: DeleteEntryFromHash frees this?
 		DeleteHashPos(&It);
 		return;
-	}// TODO: reenable me.*/
+	}
 
 	/*
 	 * Bail out if there's no actual message associated with this