internal improvements and cleanups

- get rid of the whole penalty thing for failed envelopes in the mta and scheduler.
- do not disable routes on smtp errors
- try to schedule all types of envelopes on each scheduler frame.

1 files changed, 7 insertions, 7 deletions

diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index 7aaae726f0d..ee5f8c96551 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mda.c,v 1.100 2013/12/26 17:25:32 eric Exp $	*/
+/*	$OpenBSD: mda.c,v 1.101 2014/02/04 14:56:03 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -204,7 +204,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
 
 			if (imsg->fd == -1) {
 				log_debug("debug: mda: cannot get message fd");
-				queue_tempfail(e->id, 0, "Cannot get message fd");
+				queue_tempfail(e->id, "Cannot get message fd");
 				mda_log(e, "TempFail", "Cannot get message fd");
 				mda_done(s);
 				return;
@@ -217,7 +217,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
 			if ((s->datafp = fdopen(imsg->fd, "r")) == NULL) {
 				log_warn("warn: mda: fdopen");
 				close(imsg->fd);
-				queue_tempfail(e->id, 0, "fdopen failed");
+				queue_tempfail(e->id, "fdopen failed");
 				mda_log(e, "TempFail", "fdopen failed");
 				mda_done(s);
 				return;
@@ -245,7 +245,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
 			if (n == -1) {
 				log_warn("warn: mda: "
 				    "fail to write delivery info");
-				queue_tempfail(e->id, 0, "Out of memory");
+				queue_tempfail(e->id, "Out of memory");
 				mda_log(e, "TempFail", "Out of memory");
 				mda_done(s);
 				return;
@@ -336,7 +336,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
 			e = s->evp;
 			if (imsg->fd == -1) {
 				log_warn("warn: mda: fail to retrieve mda fd");
-				queue_tempfail(e->id, 0, "Cannot get mda fd");
+				queue_tempfail(e->id, "Cannot get mda fd");
 				mda_log(e, "TempFail", "Cannot get mda fd");
 				mda_done(s);
 				return;
@@ -379,7 +379,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
 
 			/* update queue entry */
 			if (error) {
-				queue_tempfail(e->id, 0, error);
+				queue_tempfail(e->id, error);
 				snprintf(buf, sizeof buf, "Error (%s)", error);
 				mda_log(e, "TempFail", buf);
 			}
@@ -674,7 +674,7 @@ mda_fail(struct mda_user *user, int permfail, const char *error)
 		}
 		else {
 			mda_log(e, "TempFail", error);
-			queue_tempfail(e->id, 0, error);
+			queue_tempfail(e->id, error);
 		}
 		mda_envelope_free(e);
 	}