iptables-{save,restore}: warn that -b/--binary isn't implemented

see also 296dca39be

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/iptables/ip6tables-restore.c b/iptables/ip6tables-restore.c
index b8b9e0dd0abd1d7b64dfb60414fdde91b26a13c1..0f4dd97a2ac1543a8db56a2f75ac9b166bdd9080 100644 (file)
--- a/iptables/ip6tables-restore.c
+++ b/iptables/ip6tables-restore.c
@@ -25,11 +25,10 @@
 #define DEBUGP(x, args...)
 #endif
 
-static int binary = 0, counters = 0, verbose = 0, noflush = 0;
+static int counters = 0, verbose = 0, noflush = 0;
 
 /* Keeping track of external matches and targets.  */
 static const struct option options[] = {
-       {.name = "binary",   .has_arg = false, .val = 'b'},
        {.name = "counters", .has_arg = false, .val = 'c'},
        {.name = "verbose",  .has_arg = false, .val = 'v'},
        {.name = "test",     .has_arg = false, .val = 't'},
@@ -44,8 +43,7 @@ static void print_usage(const char *name, const char *version) __attribute__((no
 
 static void print_usage(const char *name, const char *version)
 {
-       fprintf(stderr, "Usage: %s [-b] [-c] [-v] [-t] [-h]\n"
-                       "          [ --binary ]\n"
+       fprintf(stderr, "Usage: %s [-c] [-v] [-t] [-h]\n"
                        "          [ --counters ]\n"
                        "          [ --verbose ]\n"
                        "          [ --test ]\n"
@@ -207,7 +205,7 @@ int ip6tables_restore_main(int argc, char *argv[])
        while ((c = getopt_long(argc, argv, "bcvthnM:T:", options, NULL)) != -1) {
                switch (c) {
                        case 'b':
-                               binary = 1;
+                               fprintf(stderr, "-b/--binary option is not implemented\n");
                                break;
                        case 'c':
                                counters = 1;

diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c
index a86a64a3a9a8e349805a672e7ddad08efe445394..16821da83f39c5d7cb050ac95bd34ceab4079a35 100644 (file)
--- a/iptables/ip6tables-save.c
+++ b/iptables/ip6tables-save.c
@@ -139,6 +139,9 @@ int ip6tables_save_main(int argc, char *argv[])
 
        while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) {
                switch (c) {
+               case 'b':
+                       fprintf(stderr, "-b/--binary option is not implemented\n");
+                       break;
                case 'c':
                        show_counters = 1;
                        break;

diff --git a/iptables/iptables-restore.c b/iptables/iptables-restore.c
index 8c942ff618df64330b199d8729cdf240bcfbc3b3..261822ddee3d1c59f0dfbb91ddc15b722222a859 100644 (file)
--- a/iptables/iptables-restore.c
+++ b/iptables/iptables-restore.c
@@ -22,11 +22,10 @@
 #define DEBUGP(x, args...)
 #endif
 
-static int binary = 0, counters = 0, verbose = 0, noflush = 0;
+static int counters = 0, verbose = 0, noflush = 0;
 
 /* Keeping track of external matches and targets.  */
 static const struct option options[] = {
-       {.name = "binary",   .has_arg = false, .val = 'b'},
        {.name = "counters", .has_arg = false, .val = 'c'},
        {.name = "verbose",  .has_arg = false, .val = 'v'},
        {.name = "test",     .has_arg = false, .val = 't'},
@@ -43,8 +42,7 @@ static void print_usage(const char *name, const char *version) __attribute__((no
 
 static void print_usage(const char *name, const char *version)
 {
-       fprintf(stderr, "Usage: %s [-b] [-c] [-v] [-t] [-h]\n"
-                       "          [ --binary ]\n"
+       fprintf(stderr, "Usage: %s [-c] [-v] [-t] [-h]\n"
                        "          [ --counters ]\n"
                        "          [ --verbose ]\n"
                        "          [ --test ]\n"
@@ -207,7 +205,7 @@ iptables_restore_main(int argc, char *argv[])
        while ((c = getopt_long(argc, argv, "bcvthnM:T:", options, NULL)) != -1) {
                switch (c) {
                        case 'b':
-                               binary = 1;
+                               fprintf(stderr, "-b/--binary option is not implemented\n");
                                break;
                        case 'c':
                                counters = 1;

diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c
index 2999c7f4ded856d44d747ecb0316fab3e0a8b1da..2c25b71fe265b666a64829de55cfe3972b6c87a4 100644 (file)
--- a/iptables/iptables-save.c
+++ b/iptables/iptables-save.c
@@ -138,6 +138,9 @@ iptables_save_main(int argc, char *argv[])
 
        while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) {
                switch (c) {
+               case 'b':
+                       fprintf(stderr, "-b/--binary option is not implemented\n");
+                       break;
                case 'c':
                        show_counters = 1;
                        break;

diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index f7850bb21039b98e51c54a973ee0096e0e259898..3cb095fe8bf4cc5305cd481e1d6c48aa735a54fc 100644 (file)
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -24,11 +24,10 @@
 #define DEBUGP(x, args...)
 #endif
 
-static int binary = 0, counters = 0, verbose = 0, noflush = 0;
+static int counters = 0, verbose = 0, noflush = 0;
 
 /* Keeping track of external matches and targets.  */
 static const struct option options[] = {
-       {.name = "binary",   .has_arg = false, .val = 'b'},
        {.name = "counters", .has_arg = false, .val = 'c'},
        {.name = "verbose",  .has_arg = false, .val = 'v'},
        {.name = "test",     .has_arg = false, .val = 't'},
@@ -47,8 +46,7 @@ static void print_usage(const char *name, const char *version) __attribute__((no
 
 static void print_usage(const char *name, const char *version)
 {
-       fprintf(stderr, "Usage: %s [-b] [-c] [-v] [-t] [-h]\n"
-                       "          [ --binary ]\n"
+       fprintf(stderr, "Usage: %s [-c] [-v] [-t] [-h]\n"
                        "          [ --counters ]\n"
                        "          [ --verbose ]\n"
                        "          [ --test ]\n"
@@ -208,7 +206,7 @@ xtables_restore_main(int family, const char *progname, int argc, char *argv[])
        while ((c = getopt_long(argc, argv, "bcvthnM:T:46", options, NULL)) != -1) {
                switch (c) {
                        case 'b':
-                               binary = 1;
+                               fprintf(stderr, "-b/--binary option is not implemented\n");
                                break;
                        case 'c':
                                counters = 1;

diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c
index 42d2907165108ec5f8ad772a7b968625c449424b..fe77283ef4c74cf7766d1f910fb0057ab06fd77d 100644 (file)
--- a/iptables/xtables-save.c
+++ b/iptables/xtables-save.c
@@ -106,6 +106,9 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[])
 
        while ((c = getopt_long(argc, argv, "bcdt:46", options, NULL)) != -1) {
                switch (c) {
+               case 'b':
+                       fprintf(stderr, "-b/--binary option is not implemented\n");
+                       break;
                case 'c':
                        show_counters = true;
                        break;