summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/lka.c
diff options
context:
space:
mode:
authorEric Faurot <eric@cvs.openbsd.org>2013-11-20 09:22:43 +0000
committerEric Faurot <eric@cvs.openbsd.org>2013-11-20 09:22:43 +0000
commit8b99e878a37f7c221d3846f92a0392a8c1eccf7c (patch)
tree2b25c614e2116b49af93c48ed781f95ec7f027b0 /usr.sbin/smtpd/lka.c
parentaf572325dc2535179e84c6bd340fe689e35ce89f (diff)
Rework the mda and scheduler to use the holdq mechanism instead of
tempfail for limiting the number of pending deliveries to the same user. This allows to reach optimal delivery time even in case of burst, while keeping the number of inflight envelopes low.
Diffstat (limited to 'usr.sbin/smtpd/lka.c')
-rw-r--r--usr.sbin/smtpd/lka.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index 471220960a3..a4b9b953fb1 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lka.c,v 1.160 2013/11/18 12:24:26 eric Exp $ */
+/* $OpenBSD: lka.c,v 1.161 2013/11/20 09:22:42 eric Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -228,6 +228,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
switch (imsg->hdr.type) {
case IMSG_LKA_USERINFO:
m_msg(&m, imsg);
+ m_get_id(&m, &reqid);
m_get_string(&m, &tablename);
m_get_string(&m, &username);
m_end(&m);
@@ -235,8 +236,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
ret = lka_userinfo(tablename, username, &userinfo);
m_create(p, IMSG_LKA_USERINFO, 0, 0, -1);
- m_add_string(p, tablename);
- m_add_string(p, username);
+ m_add_id(p, reqid);
m_add_int(p, ret);
if (ret == LKA_OK)
m_add_data(p, &userinfo, sizeof(userinfo));