diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-19 11:57:36 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-19 11:57:36 +0000 |
| commit | da98b82556393439683e47a3f51aa544f42da1b0 (patch) | |
| tree | c73c82e344c5b366e31cf2aa47fd6bad9da19ec4 /usr.sbin/smtpd | |
| parent | 77a2f7f5fbb26fa4ac3c62390285c1436233c0e0 (diff) | |
remove IS_RELAY and IS_MAILBOX macros.
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 5 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index 270d4a0dbe5..31f0f70d4d0 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.137 2012/09/18 13:42:39 eric Exp $ */ +/* $OpenBSD: lka.c,v 1.138 2012/09/19 11:57:35 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -88,7 +88,8 @@ lka_imsg(struct imsgev *iev, struct imsg *imsg) if (rule) { ss->code = 250; ss->envelope.rule = *rule; - if (IS_RELAY(*rule)) + if (rule->r_action == A_RELAY || + rule->r_action == A_RELAYVIA) ss->envelope.type = D_MTA; else ss->envelope.type = D_MDA; diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index c6657d5e5b7..654308741f7 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.358 2012/09/19 10:10:30 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.359 2012/09/19 11:57:35 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -302,9 +302,6 @@ enum action_type { A_MDA }; -#define IS_MAILBOX(x) ((x).r_action == A_MAILDIR || (x).r_action == A_MBOX || (x).r_action == A_FILENAME) -#define IS_RELAY(x) ((x).r_action == A_RELAY || (x).r_action == A_RELAYVIA) - struct rule { TAILQ_ENTRY(rule) r_entry; char r_tag[MAX_TAG_SIZE]; |