From 576bc0f8e51feac9af06dc206d69a695e4d35c91 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 12 Aug 2015 18:44:22 +0200 Subject: evaluate: display error on unexisting chain when listing nft list chain ip test output :1:1-25: Error: Could not process rule: Chain 'output' does not exist list chain ip test output ^^^^^^^^^^^^^^^^^^^^^^^^^ Signed-off-by: Pablo Neira Ayuso --- src/evaluate.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/evaluate.c b/src/evaluate.c index 00e9c4b4..1405da83 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1960,16 +1960,26 @@ static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd) static int cmd_evaluate_list(struct eval_ctx *ctx, struct cmd *cmd) { + struct table *table; + switch (cmd->obj) { case CMD_OBJ_TABLE: if (cmd->handle.table == NULL) return 0; - case CMD_OBJ_CHAIN: case CMD_OBJ_SET: if (table_lookup(&cmd->handle) == NULL) return cmd_error(ctx, "Could not process rule: Table '%s' does not exist", cmd->handle.table); return 0; + case CMD_OBJ_CHAIN: + table = table_lookup(&cmd->handle); + if (table == NULL) + return cmd_error(ctx, "Could not process rule: Table '%s' does not exist", + cmd->handle.table); + if (chain_lookup(table, &cmd->handle) == NULL) + return cmd_error(ctx, "Could not process rule: Chain '%s' does not exist", + cmd->handle.chain); + return 0; case CMD_OBJ_SETS: case CMD_OBJ_RULESET: return 0; -- cgit v1.2.3