ip{,6}tables-restore: Don't accept wait-interval without wait

If -W <val> was given, error out if -w wasn't since that doesn't make
sense.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/iptables/ip6tables-restore.c b/iptables/ip6tables-restore.c
index eaa2bcbc3856e08379bfdb0655bc9a8fc38cf3cf..47310f20b936390d52c999a5f0a1e7d0f37b3206 100644 (file)
--- a/iptables/ip6tables-restore.c
+++ b/iptables/ip6tables-restore.c
@@ -273,6 +273,11 @@ int ip6tables_restore_main(int argc, char *argv[])
        }
        else in = stdin;
 
+       if (!wait_interval.tv_sec && !wait) {
+               fprintf(stderr, "Option --wait-interval requires option --wait\n");
+               exit(1);
+       }
+
        /* Grab standard input. */
        while (fgets(buffer, sizeof(buffer), in)) {
                int ret = 0;

diff --git a/iptables/iptables-restore.c b/iptables/iptables-restore.c
index 9dbfc572a7cec6332312b1fe06d58305238ae8fe..074552af5dc7429db30c3ec431dff00ac80515b3 100644 (file)
--- a/iptables/iptables-restore.c
+++ b/iptables/iptables-restore.c
@@ -271,6 +271,11 @@ iptables_restore_main(int argc, char *argv[])
        }
        else in = stdin;
 
+       if (!wait_interval.tv_sec && !wait) {
+               fprintf(stderr, "Option --wait-interval requires option --wait\n");
+               exit(1);
+       }
+
        /* Grab standard input. */
        while (fgets(buffer, sizeof(buffer), in)) {
                int ret = 0;