diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-11-03 19:13:35 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-11-03 19:13:35 +0000 |
| commit | b880b2e87435f2810857d787e3800aff820ff7d4 (patch) | |
| tree | 9bccf9e8dbdcbbbf1d66504b5192fb08345665fc /usr.sbin/smtpd/smtpd.h | |
| parent | 1be69534a57983111366280bd293dfe8ac266190 (diff) | |
- remove a useless member of struct cond
- have virtual related functions take a map id instead of a map
- shrink a tiny bit ruleset matching
- add missing lka_resolve_path() call in aliases resolution leading to
issues spotted by nicm@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 90d517e9122..a6c2194e9a5 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.149 2009/10/19 20:48:13 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.150 2009/11/03 19:13:34 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -293,7 +293,6 @@ struct cond { TAILQ_ENTRY(cond) c_entry; objid_t c_map; enum cond_type c_type; - struct map *c_match; }; enum opt_type { @@ -775,9 +774,9 @@ struct mta_session { /* aliases.c */ int aliases_exist(struct smtpd *, char *); int aliases_get(struct smtpd *, struct aliaseslist *, char *); -int aliases_vdomain_exists(struct smtpd *, struct map *, char *); -int aliases_virtual_exist(struct smtpd *, struct map *, struct path *); -int aliases_virtual_get(struct smtpd *, struct map *, struct aliaseslist *, struct path *); +int aliases_vdomain_exists(struct smtpd *, objid_t, char *); +int aliases_virtual_exist(struct smtpd *, objid_t, struct path *); +int aliases_virtual_get(struct smtpd *, objid_t, struct aliaseslist *, struct path *); int alias_parse(struct alias *, char *); /* authenticate.c */ |