summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/runner.c
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2011-09-18 21:37:54 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2011-09-18 21:37:54 +0000
commit866d070e6bdcf275203c7b33074b889d2704d2be (patch)
tree7130e0e332d317a7b4a58d08511426726f7c3192 /usr.sbin/smtpd/runner.c
parent67a47e03f2da5d57159f1ac958775eccf643f640 (diff)
a single ramqueue message may be shared by many ramqueue envelopes to be
delivered to many ramqueue hosts, therefore storing the rq_host pointer in the rq_msg envelope is wrong and causes baaaaad behavior. this commit fixes reliability issues in runner process, experienced and reported by many
Diffstat (limited to 'usr.sbin/smtpd/runner.c')
-rw-r--r--usr.sbin/smtpd/runner.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c
index 58d6e5e374a..2a559bf0522 100644
--- a/usr.sbin/smtpd/runner.c
+++ b/usr.sbin/smtpd/runner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: runner.c,v 1.117 2011/09/01 19:56:49 eric Exp $ */
+/* $OpenBSD: runner.c,v 1.118 2011/09/18 21:37:53 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -418,7 +418,7 @@ runner_process_batch(struct ramqueue_envelope *rq_evp, time_t curtm)
rq_msg = rq_evp->rq_msg;
rq_batch = rq_evp->rq_batch;
- rq_host = rq_msg->rq_host;
+ rq_host = rq_evp->rq_host;
switch (rq_batch->type) {
case D_BOUNCE: