From dbfcb1fa29da670ae565caef48760b9ac1c21a0b Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Thu, 20 Feb 2020 12:58:40 +0100 Subject: evaluate: print correct statement name on family mismatch nft add rule inet filter c ip daddr 1.2.3.4 dnat ip6 to f00::1 Error: conflicting protocols specified: ip vs. unknown. You must specify ip or ip6 family in tproxy statement Should be: ... "in nat statement". Fixes: fbe27464dee4588d90 ("src: add nat support for the inet family") Signed-off-by: Florian Westphal --- src/evaluate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/evaluate.c') diff --git a/src/evaluate.c b/src/evaluate.c index a3cbf939..ae629abe 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2807,9 +2807,10 @@ static int stmt_evaluate_l3proto(struct eval_ctx *ctx, (nproto == &proto_ip6 && family != NFPROTO_IPV6)) return stmt_binary_error(ctx, stmt, &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR], - "conflicting protocols specified: %s vs. %s. You must specify ip or ip6 family in tproxy statement", + "conflicting protocols specified: %s vs. %s. You must specify ip or ip6 family in %s statement", ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR].desc->name, - family2str(stmt->tproxy.family)); + family2str(family), + stmt->ops->name); return 0; } -- cgit v1.2.3