diff options
| author |   gilles <gilles@openbsd.org> | 2012-03-19 20:38:49 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2012-03-19 20:38:49 +0000 |
| commit | 87ee2481a1aad33713f2edd997fb6fed25e13a68 (patch) | |
| tree | 9f868131c12ad6df4f6825737421757be689cb0a | |
| parent | Use uncached addresses for all exception vectors, when copying our code (or (diff) | |
| download | wireguard-openbsd-87ee2481a1aad33713f2edd997fb6fed25e13a68.tar.xz wireguard-openbsd-87ee2481a1aad33713f2edd997fb6fed25e13a68.zip | |
when a mailer daemon loop is detected, do not insert new bounce in ramqueue
fixes an issue experienced by myself and Roman Kravchuck
ok eric@
| -rw-r--r-- | usr.sbin/smtpd/runner.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c index 007beb42b73..bf4b33cd56d 100644 --- a/usr.sbin/smtpd/runner.c +++ b/usr.sbin/smtpd/runner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: runner.c,v 1.136 2012/03/07 22:54:49 gilles Exp $ */ +/* $OpenBSD: runner.c,v 1.137 2012/03/19 20:38:49 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -385,8 +385,8 @@ runner_process_envelope(u_int64_t evpid) struct envelope bounce; envelope_set_errormsg(&envelope, "loop has been detected"); - bounce_record_message(&envelope, &bounce); - scheduler->insert(&bounce); + if (bounce_record_message(&envelope, &bounce)) + scheduler->insert(&bounce); scheduler->remove(evpid); queue_envelope_delete(Q_QUEUE, &envelope); |