From patchwork Mon Apr 4 09:41:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mart Frauenlob X-Patchwork-Id: 605794 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qdn7F31Cmz9s1h for ; Mon, 4 Apr 2016 19:41:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755032AbcDDJlP (ORCPT ); Mon, 4 Apr 2016 05:41:15 -0400 Received: from vie01a-dmta-at03-1.mx.upcmail.net ([62.179.121.151]:29140 "EHLO vie01a-dmta-at03-1.mx.upcmail.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754730AbcDDJlO (ORCPT ); Mon, 4 Apr 2016 05:41:14 -0400 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.72) (envelope-from ) id 1an10S-0002ai-Ev for netfilter-devel@vger.kernel.org; Mon, 04 Apr 2016 11:41:12 +0200 Received: from eris.upc.at ([84.113.104.147]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id e9hB1s00E3ApWyU019hCx0; Mon, 04 Apr 2016 11:41:12 +0200 X-SourceIP: 84.113.104.147 X-Authenticated-Sender: mart.frauenlob@chello.at From: Mart Frauenlob To: netfilter-devel@vger.kernel.org Subject: [PATCH] conntrack: Fix wrong --src, or --dst option shown. Date: Mon, 4 Apr 2016 11:41:04 +0200 Message-Id: <1459762864-10326-1-git-send-email-mart.frauenlob@chello.at> X-Mailer: git-send-email 1.7.2.5 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org If running into PARAMETER_PROBLEM on usage of --mask-src, or --mask-dst without using the needed --orig-src, or --orig-dst option, the wrong options were offered in the error message. Signed-off-by: Mart Frauenlob --- src/conntrack.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conntrack.c b/src/conntrack.c index 2367459..d40f23f 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -2091,14 +2091,14 @@ nfct_filter_init(const int family) if (options & CT_OPT_MASK_SRC) { if (!(options & CT_OPT_ORIG_SRC)) exit_error(PARAMETER_PROBLEM, - "Can't use --mask-src without --src"); + "Can't use --mask-src without --orig-src"); nfct_network_attr_prepare(family, DIR_SRC); } if (options & CT_OPT_MASK_DST) { if (!(options & CT_OPT_ORIG_DST)) exit_error(PARAMETER_PROBLEM, - "Can't use --mask-dst without --dst"); + "Can't use --mask-dst without --orig-dst"); nfct_network_attr_prepare(family, DIR_DST); } }