diff options
Diffstat (limited to 'usr.sbin/smtpd/ruleset.c')
| -rw-r--r-- | usr.sbin/smtpd/ruleset.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/ruleset.c b/usr.sbin/smtpd/ruleset.c index 259d021bfff..42399f93bb9 100644 --- a/usr.sbin/smtpd/ruleset.c +++ b/usr.sbin/smtpd/ruleset.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ruleset.c,v 1.25 2012/10/13 08:01:47 eric Exp $ */ +/* $OpenBSD: ruleset.c,v 1.26 2012/11/12 14:58:53 eric Exp $ */ /* * Copyright (c) 2009 Gilles Chehade <gilles@openbsd.org> @@ -78,8 +78,7 @@ ruleset_match(const struct envelope *evp) if (map->m_src == S_NONE) { TAILQ_FOREACH(me, &map->m_contents, me_entry) { - if (hostname_match(maddr->domain, - me->me_key.med_string)) + if (hostname_match(maddr->domain, me->me_key)) return r; } } @@ -143,12 +142,11 @@ ruleset_check_source(struct map *map, const struct sockaddr_storage *ss) if (map->m_src == S_NONE) { TAILQ_FOREACH(me, &map->m_contents, me_entry) { if (ss->ss_family == AF_LOCAL) { - if (!strcmp(me->me_key.med_string, "local")) + if (!strcmp(me->me_key, "local")) return 1; continue; } - if (ruleset_cmp_source(ss_to_text(ss), - me->me_key.med_string)) + if (ruleset_cmp_source(ss_to_text(ss), me->me_key)) return 1; } } |