diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2018-11-08 13:24:23 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2018-11-08 13:24:23 +0000 |
| commit | 0adfb1ccc1bda987f30f92f59bcc6c9d3881c0bc (patch) | |
| tree | 15969c3bff50b6f842c49df7271d8e540dd171ea /usr.sbin | |
| parent | 451ad30b66e2128aa87885ed36a5069f55ee9429 (diff) | |
introduce smtp-in keyword in grammar so we can report smtp-in and smtp-out
events with less ambiguity
ok eric@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 13ca1e946b4..23f106781cc 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.229 2018/11/03 14:39:45 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.230 2018/11/08 13:24:22 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -190,7 +190,7 @@ typedef struct { %token PKI PORT PROC %token QUEUE QUIT %token RCPT_TO RECIPIENT RECEIVEDAUTH RELAY REJECT REPORT REWRITE RSET -%token SCHEDULER SENDER SENDERS SMTP SMTPS SOCKET SRC SUB_ADDR_DELIM +%token SCHEDULER SENDER SENDERS SMTP SMTP_IN SMTPS SOCKET SRC SUB_ADDR_DELIM %token TABLE TAG TAGGED TLS TLS_REQUIRE TTL %token USER USERBASE %token VERIFY VIRTUAL @@ -484,7 +484,7 @@ proc_params_opt proc_params report: -REPORT SMTP ON STRING { +REPORT SMTP_IN ON STRING { if (! dict_get(conf->sc_processors_dict, $4)) { yyerror("no processor exist with that name: %s", $4); free($4); @@ -1280,7 +1280,7 @@ filter_phase_connect ; filter: -FILTER SMTP { +FILTER SMTP_IN { filter_rule = xcalloc(1, sizeof *filter_rule); } filter_phase { TAILQ_INSERT_TAIL(&conf->sc_filter_rules[filter_rule->phase], filter_rule, entry); @@ -1903,6 +1903,7 @@ lookup(char *s) { "scheduler", SCHEDULER }, { "senders", SENDERS }, { "smtp", SMTP }, + { "smtp-in", SMTP_IN }, { "smtps", SMTPS }, { "socket", SOCKET }, { "src", SRC }, |