From d6f06c3069990759a95a28c5dfcb76e9c6eebae0 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 15 Sep 2015 13:20:34 +0200 Subject: src: use new symbols in libnftnl Adapt the nftables code to use the new symbols in libnftnl. This patch contains quite some renaming to reserve the nft_ prefix for our high level library. Explicitly request libnftnl 1.0.5 at configure stage. Signed-off-by: Pablo Neira Ayuso --- src/parser_bison.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/parser_bison.y') diff --git a/src/parser_bison.y b/src/parser_bison.y index 942470f6..cfb6b707 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -842,12 +842,12 @@ monitor_object : /* empty */ { $$ = CMD_MONITOR_OBJ_ANY; } | ELEMENTS { $$ = CMD_MONITOR_OBJ_ELEMS; } ; -monitor_format : /* empty */ { $$ = NFT_OUTPUT_DEFAULT; } +monitor_format : /* empty */ { $$ = NFTNL_OUTPUT_DEFAULT; } | export_format ; -export_format : XML { $$ = NFT_OUTPUT_XML; } - | JSON { $$ = NFT_OUTPUT_JSON; } +export_format : XML { $$ = NFTNL_OUTPUT_XML; } + | JSON { $$ = NFTNL_OUTPUT_JSON; } ; describe_cmd : primary_expr -- cgit v1.2.3