Otherwise, this forces user to place a double semi-colon to skip a
parser error in a multi-line commands:
# nft add "ct helper ip filter test { type \"ftp\" protocol tcp; };add rule
filter test ct helper set \"ftp\""
Error: syntax error, unexpected add, expecting end of file or newline or
semicolon
add ct helper ip filter test { type "ftp" protocol tcp; };add rule filter test
ct helper set "ftp"
^^^
Reported-by: Laura Garcia <[email protected]>
Signed-off-by: Pablo Neira Ayuso <[email protected]>
---
src/parser_bison.y | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/parser_bison.y b/src/parser_bison.y
index b20be3a896b0..48e44e5adc40 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -986,12 +986,12 @@ add_cmd : TABLE
table_spec
{
$$ = cmd_alloc(CMD_ADD, CMD_OBJ_QUOTA, &$2,
&@$, $3);
}
- | CT HELPER obj_spec ct_obj_alloc
'{' ct_helper_block '}' stmt_separator
+ | CT HELPER obj_spec ct_obj_alloc
'{' ct_helper_block '}'
{
$$ = cmd_alloc_obj_ct(CMD_ADD,
NFT_OBJECT_CT_HELPER, &$3, &@$, $4);
}
- | CT TIMEOUT obj_spec ct_obj_alloc
'{' ct_timeout_block '}' stmt_separator
+ | CT TIMEOUT obj_spec ct_obj_alloc
'{' ct_timeout_block '}'
{
$$ = cmd_alloc_obj_ct(CMD_ADD,
NFT_OBJECT_CT_TIMEOUT, &$3, &@$, $4);
}
@@ -1076,11 +1076,11 @@ create_cmd : TABLE
table_spec
{
$$ = cmd_alloc(CMD_CREATE, CMD_OBJ_QUOTA, &$2,
&@$, $3);
}
- | CT HELPER obj_spec ct_obj_alloc
'{' ct_helper_block '}' stmt_separator
+ | CT HELPER obj_spec ct_obj_alloc
'{' ct_helper_block '}'
{
$$ = cmd_alloc_obj_ct(CMD_CREATE,
NFT_OBJECT_CT_HELPER, &$3, &@$, $4);
}
- | CT TIMEOUT obj_spec ct_obj_alloc
'{' ct_timeout_block '}' stmt_separator
+ | CT TIMEOUT obj_spec ct_obj_alloc
'{' ct_timeout_block '}'
{
$$ = cmd_alloc_obj_ct(CMD_CREATE,
NFT_OBJECT_CT_TIMEOUT, &$3, &@$, $4);
}
--
2.11.0
