rework grammar for builtin filters so i can start documenting it

1 files changed, 15 insertions, 15 deletions

diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index ad6a1a570dc..b74a1e4af34 100644
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.254 2019/08/10 16:07:01 gilles Exp $	*/
+/*	$OpenBSD: parse.y,v 1.255 2019/08/11 12:17:06 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -175,7 +175,7 @@ typedef struct {
 %}
 
 %token	ACTION ALIAS ANY ARROW AUTH AUTH_OPTIONAL
-%token	BACKUP BOUNCE BUILTIN
+%token	BACKUP BOUNCE
 %token	CA CERT CHAIN CHROOT CIPHERS COMMIT COMPRESSION CONNECT
 %token	DATA DATA_LINE DHE DISCONNECT DOMAIN
 %token	EHLO ENABLE ENCRYPTION ERROR EXPAND_ONLY 
@@ -189,7 +189,7 @@ typedef struct {
 %token	MAIL_FROM MAILDIR MASK_SRC MASQUERADE MATCH MAX_MESSAGE_SIZE MAX_DEFERRED MBOX MDA MTA MX
 %token	NO_DSN NO_VERIFY NOOP
 %token	ON
-%token	PKI PORT PROC PROC_EXEC PROXY_V2
+%token	PHASE PKI PORT PROC PROC_EXEC PROXY_V2
 %token	QUEUE QUIT
 %token	RCPT_TO RDNS RECIPIENT RECEIVEDAUTH REGEX RELAY REJECT REPORT REWRITE RSET
 %token	SCHEDULER SENDER SENDERS SMTP SMTP_IN SMTP_OUT SMTPS SOCKET SRC SUB_ADDR_DELIM
@@ -1436,45 +1436,45 @@ filter_phase_global_options;
 filter_phase_connect:
 CONNECT {
 	filter_config->phase = FILTER_CONNECT;
-} filter_phase_connect_options filter_action_builtin
+} MATCH filter_phase_connect_options filter_action_builtin
 ;
 
 
 filter_phase_helo:
 HELO {
 	filter_config->phase = FILTER_HELO;
-} filter_phase_helo_options filter_action_builtin
+} MATCH filter_phase_helo_options filter_action_builtin
 ;
 
 filter_phase_ehlo:
 EHLO {
 	filter_config->phase = FILTER_EHLO;
-} filter_phase_helo_options filter_action_builtin
+} MATCH filter_phase_helo_options filter_action_builtin
 ;
 
 filter_phase_mail_from:
 MAIL_FROM {
 	filter_config->phase = FILTER_MAIL_FROM;
-} filter_phase_mail_from_options filter_action_builtin
+} MATCH filter_phase_mail_from_options filter_action_builtin
 ;
 
 filter_phase_rcpt_to:
 RCPT_TO {
 	filter_config->phase = FILTER_RCPT_TO;
-} filter_phase_rcpt_to_options filter_action_builtin
+} MATCH filter_phase_rcpt_to_options filter_action_builtin
 ;
 
 filter_phase_data:
 DATA {
 	filter_config->phase = FILTER_DATA;
-} filter_phase_data_options filter_action_builtin
+} MATCH filter_phase_data_options filter_action_builtin
 ;
 
 /*
 filter_phase_data_line:
 DATA_LINE {
 	filter_config->phase = FILTER_DATA_LINE;
-} filter_action_builtin
+} MATCH filter_action_builtin
 ;
 
 filter_phase_quit:
@@ -1486,20 +1486,20 @@ QUIT {
 filter_phase_rset:
 RSET {
 	filter_config->phase = FILTER_RSET;
-} filter_phase_rset_options filter_action_builtin
+} MATCH filter_phase_rset_options filter_action_builtin
 ;
 
 filter_phase_noop:
 NOOP {
 	filter_config->phase = FILTER_NOOP;
-} filter_phase_noop_options filter_action_builtin
+} MATCH filter_phase_noop_options filter_action_builtin
 ;
 */
 
 filter_phase_commit:
 COMMIT {
 	filter_config->phase = FILTER_COMMIT;
-} filter_phase_commit_options filter_action_builtin
+} MATCH filter_phase_commit_options filter_action_builtin
 ;
 
 
@@ -1615,7 +1615,7 @@ FILTER STRING PROC_EXEC STRING {
 	filter_config = NULL;
 }
 |
-FILTER STRING BUILTIN {
+FILTER STRING PHASE {
 	if (dict_get(conf->sc_filters_dict, $2)) {
 		yyerror("filter already exists with that name: %s", $2);
 		free($2);
@@ -2255,7 +2255,6 @@ lookup(char *s)
 		{ "auth-optional",     	AUTH_OPTIONAL },
 		{ "backup",		BACKUP },
 		{ "bounce",		BOUNCE },
-		{ "builtin",		BUILTIN },
 		{ "ca",			CA },
 		{ "cert",		CERT },
 		{ "chain",		CHAIN },
@@ -2307,6 +2306,7 @@ lookup(char *s)
 		{ "no-verify",		NO_VERIFY },
 		{ "noop",		NOOP },
 		{ "on",			ON },
+		{ "phase",		PHASE },
 		{ "pki",		PKI },
 		{ "port",		PORT },
 		{ "proc",		PROC },