From patchwork Wed Sep 20 17:34:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 816387 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xy6M66fCyz9s0g for ; Thu, 21 Sep 2017 03:34:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751740AbdITRe6 (ORCPT ); Wed, 20 Sep 2017 13:34:58 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:41534 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751723AbdITRe6 (ORCPT ); Wed, 20 Sep 2017 13:34:58 -0400 Received: from localhost ([::1]:36076 helo=xsao) by orbyte.nwl.cc with esmtp (Exim 4.89) (envelope-from ) id 1duitl-00069a-6l; Wed, 20 Sep 2017 19:34:57 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [iptables PATCH 1/2] ip{, 6}tables-restore: Don't ignore missing wait-interval value Date: Wed, 20 Sep 2017 19:34:35 +0200 Message-Id: <20170920173436.20221-2-phil@nwl.cc> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170920173436.20221-1-phil@nwl.cc> References: <20170920173436.20221-1-phil@nwl.cc> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Passing -W without a value doesn't make sense so bail out if none was given. Signed-off-by: Phil Sutter --- iptables/xshared.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptables/xshared.c b/iptables/xshared.c index 825479c338214..06db72d427e21 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -343,7 +343,7 @@ void parse_wait_interval(int argc, char *argv[], struct timeval *wait_interval) else if (xs_has_arg(argc, argv)) arg = argv[optind++]; else - return; + xtables_error(PARAMETER_PROBLEM, "wait interval value required"); ret = sscanf(arg, "%u", &usec); if (ret == 1) {