From 841d5f5a3deacfe7b4245df0890849d8e4ad5817 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 24 Oct 2018 12:35:04 +0200 Subject: json: Fix for recent changes to context structs Commits introducing nft_ctx pointer to netlink and eval contexts did not update JSON code accordingly. Fixes: 00f777bfc414a ("src: pass struct nft_ctx through struct eval_ctx") Fixes: 2dc07bcd7eaa5 ("src: pass struct nft_ctx through struct netlink_ctx") Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/parser_json.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/parser_json.c') diff --git a/src/parser_json.c b/src/parser_json.c index 46a02fe1..e497f0ce 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -3301,11 +3301,8 @@ static int json_verify_metainfo(struct json_ctx *ctx, json_t *root) static int __json_parse(struct json_ctx *ctx, json_t *root) { struct eval_ctx ectx = { - .nf_sock = ctx->nft->nf_sock, + .nft = ctx->nft, .msgs = ctx->msgs, - .cache = &ctx->nft->cache, - .octx = &ctx->nft->output, - .debug_mask = ctx->nft->debug_mask, }; json_t *tmp, *value; size_t index; -- cgit v1.2.3