diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-19 19:40:37 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-19 19:40:37 +0000 |
| commit | b97944b16581b2cb53999326ab0e9e88eb704ad9 (patch) | |
| tree | d66fedbdaeccfdfd77a3eb112ab600df7667b616 /usr.sbin | |
| parent | c1da5d44a3bca9c24f0beb58768f8d69f9244442 (diff) | |
Set envelope expirancy in lka before sending the envelope to mfa.
The goal is to eventually have only the lka see the rules.
ok gilles@ chl@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mfa.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index 31f0f70d4d0..f444933d6f4 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.138 2012/09/19 11:57:35 eric Exp $ */ +/* $OpenBSD: lka.c,v 1.139 2012/09/19 19:40:36 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -88,6 +88,7 @@ lka_imsg(struct imsgev *iev, struct imsg *imsg) if (rule) { ss->code = 250; ss->envelope.rule = *rule; + ss->envelope.expire = rule->r_qexpire; if (rule->r_action == A_RELAY || rule->r_action == A_RELAYVIA) ss->envelope.type = D_MTA; diff --git a/usr.sbin/smtpd/mfa.c b/usr.sbin/smtpd/mfa.c index 993f7790d4a..667e333a119 100644 --- a/usr.sbin/smtpd/mfa.c +++ b/usr.sbin/smtpd/mfa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfa.c,v 1.68 2012/09/16 16:43:28 chl Exp $ */ +/* $OpenBSD: mfa.c,v 1.69 2012/09/19 19:40:36 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -331,7 +331,6 @@ mfa_test_rcpt_resume(struct submit_status *ss) } ss->envelope.dest = ss->u.maddr; - ss->envelope.expire = ss->envelope.rule.r_qexpire; imsg_compose_event(env->sc_ievs[PROC_LKA], IMSG_LKA_RCPT, 0, 0, -1, ss, sizeof(*ss)); } |