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, 1 insertions, 2 deletions

diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c
index 809644eadea..ded25af80b2 100644
--- a/usr.sbin/smtpd/bounce.c
+++ b/usr.sbin/smtpd/bounce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bounce.c,v 1.60 2013/12/03 08:32:40 eric Exp $	*/
+/*	$OpenBSD: bounce.c,v 1.61 2014/02/04 14:56:03 eric Exp $	*/
 
 /*
  * Copyright (c) 2009 Gilles Chehade <gilles@poolp.org>
@@ -522,7 +522,6 @@ bounce_delivery(struct bounce_message *msg, int delivery, const char *status)
 			queue_envelope_update(&evp);
 			m_create(p_scheduler, delivery, 0, 0, -1);
 			m_add_envelope(p_scheduler, &evp);
-			m_add_u32(p_scheduler, 0);
 			m_close(p_scheduler);
 		} else {
 			m_create(p_scheduler, delivery, 0, 0, -1);