diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-29 10:35:02 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-29 10:35:02 +0000 |
| commit | 6bde84180d254953697a5968a64897be7a5b9489 (patch) | |
| tree | c4fe7426427c354a2989d77a65c9fb5da56be77d /usr.sbin/smtpd/lka.c | |
| parent | 91fe15e08e22b91c8065eaa8e504ce74be8e62f1 (diff) | |
finally remove rule member from struct envelope.
"wow!" gilles@
Diffstat (limited to 'usr.sbin/smtpd/lka.c')
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index e7aad3db9a0..7f855d88e77 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.141 2012/09/28 14:03:00 chl Exp $ */ +/* $OpenBSD: lka.c,v 1.142 2012/09/29 10:35:00 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -84,16 +84,8 @@ lka_imsg(struct imsgev *iev, struct imsg *imsg) ss = imsg->data; ss->code = 530; rule = ruleset_match(&ss->envelope); - if (rule) { + 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; - else - ss->envelope.type = D_MDA; - } imsg_compose_event(iev, IMSG_LKA_RULEMATCH, 0, 0, -1, ss, sizeof *ss); return; |