$Log$
+ Revision 580.42 2001/09/16 05:44:51 ajc
+ * serv_smtp.c: instead of doubling delivery retry times unbounded, set a
+ maximum retry time of SMTP_RETRY_MAX (currently set to 12 hours)
+
Revision 580.41 2001/09/09 16:19:29 error
* Updated PAM configuration file citadel.pam for Red Hat 7.x.
Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
* Initial CVS import
+
if (!strcasecmp(key, "retry")) {
/* double the retry interval after each attempt */
retry = extract_long(buf, 1) * 2L;
+ if (retry > SMTP_RETRY_MAX) {
+ retry = SMTP_RETRY_MAX;
+ }
remove_token(instr, i, '\n');
}
if (!strcasecmp(key, "attempted")) {
#define SIZ 4096
/*
- * SMTP delivery retry and give-up times
+ * SMTP delivery retry rules (all values are in seconds)
+ *
+ * If delivery of a message via SMTP is unsuccessful, Citadel will try again
+ * after SMTP_RETRY_INTERVAL seconds. This interval will double after each
+ * unsuccessful delivery, up to a maximum of SMTP_RETRY_MAX seconds. If no
+ * successful delivery has been accomplished after SMTP_GIVE_UP seconds, the
+ * message will be returned to its sender.
*/
-#define SMTP_RETRY_INTERVAL 900 /* retry sends every 15 minutes */
-#define SMTP_GIVE_UP 432000 /* give up after 5 days */
+#define SMTP_RETRY_INTERVAL 900 /* 15 minutes */
+#define SMTP_RETRY_MAX 43200 /* 12 hours */
+#define SMTP_GIVE_UP 432000 /* 5 days */
/*
* How often to run the networker