diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2015-12-12 12:38:37 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2015-12-12 12:38:37 +0000 |
| commit | 3c715cc1cdafa181e206df9071f7b04dbb6d7c03 (patch) | |
| tree | 0465a983becb781b513ff95512f994f207a9b2f8 /usr.sbin/smtpd/parse.y | |
| parent | 13dc197810b1b7ba2cd01e2f9685c57a187456e5 (diff) | |
prepare bits to enable masquerade in parse.y
Diffstat (limited to 'usr.sbin/smtpd/parse.y')
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 3c016d3456d..13e371e70b9 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.171 2015/12/12 12:34:51 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.172 2015/12/12 12:38:36 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -116,6 +116,7 @@ enum listen_options { LO_NODSN = 0x000400, LO_SENDERS = 0x000800, LO_RECEIVEDAUTH = 0x001000, + LO_MASQUERADE = 0x002000, LO_CA = 0x010000 }; @@ -637,6 +638,24 @@ opt_listen : INET4 { } listen_opts.sendertable = t; } + /* + | SENDERS tables MASQUERADE { + struct table *t = $2; + + if (listen_opts.options & LO_SENDERS) { + yyerror("senders already specified"); + YYERROR; + } + listen_opts.options |= LO_SENDERS|LO_MASQUERADE; + + if (! table_check_use(t, T_DYNAMIC|T_HASH, K_MAILADDRMAP)) { + yyerror("invalid use of table \"%s\" as " + "SENDERS parameter", t->t_name); + YYERROR; + } + listen_opts.sendertable = t; + } + */ ; listen : opt_listen listen @@ -2114,8 +2133,11 @@ config_listener(struct listener *h, struct listen_opts *lo) (void)strlcpy(h->hostname, lo->hostname, sizeof(h->hostname)); if (lo->hostnametable) (void)strlcpy(h->hostnametable, lo->hostnametable->t_name, sizeof(h->hostnametable)); - if (lo->sendertable) + if (lo->sendertable) { (void)strlcpy(h->sendertable, lo->sendertable->t_name, sizeof(h->sendertable)); + if (lo->options & LO_MASQUERADE) + h->flags |= F_MASQUERADE; + } if (lo->ssl & F_TLS_VERIFY) h->flags |= F_TLS_VERIFY; |