|
 |
388998 |
From f5757357c0bb6b5df843d15b90f235190d3b4448 Mon Sep 17 00:00:00 2001
|
|
|
388998 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
388998 |
Date: Fri, 11 May 2018 16:34:48 +0200
|
|
|
388998 |
Subject: [PATCH] ip{,6}tables-restore: Don't ignore missing wait-interval
|
|
|
388998 |
value
|
|
|
388998 |
|
|
|
388998 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1465078
|
|
|
388998 |
Upstream Status: iptables commit 60e0ffd365a2d
|
|
|
388998 |
|
|
|
388998 |
commit 60e0ffd365a2d936b3df13c1289b2ef57b756d92
|
|
|
388998 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
388998 |
Date: Wed Sep 20 19:34:35 2017 +0200
|
|
|
388998 |
|
|
|
388998 |
ip{,6}tables-restore: Don't ignore missing wait-interval value
|
|
|
388998 |
|
|
|
388998 |
Passing -W without a value doesn't make sense so bail out if none was
|
|
|
388998 |
given.
|
|
|
388998 |
|
|
|
388998 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
388998 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
388998 |
|
|
|
388998 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
388998 |
---
|
|
|
388998 |
iptables/xshared.c | 2 +-
|
|
|
388998 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
388998 |
|
|
|
388998 |
diff --git a/iptables/xshared.c b/iptables/xshared.c
|
|
|
388998 |
index 3fbe3b1a99b77..b8a81fd968361 100644
|
|
|
388998 |
--- a/iptables/xshared.c
|
|
|
388998 |
+++ b/iptables/xshared.c
|
|
|
388998 |
@@ -318,7 +318,7 @@ void parse_wait_interval(int argc, char *argv[], struct timeval *wait_interval)
|
|
|
388998 |
else if (xs_has_arg(argc, argv))
|
|
|
388998 |
arg = argv[optind++];
|
|
|
388998 |
else
|
|
|
388998 |
- return;
|
|
|
388998 |
+ xtables_error(PARAMETER_PROBLEM, "wait interval value required");
|
|
|
388998 |
|
|
|
388998 |
ret = sscanf(arg, "%u", &usec);
|
|
|
388998 |
if (ret == 1) {
|
|
|
388998 |
--
|
|
|
388998 |
2.17.0
|
|
|
388998 |
|