iptables-save: actually parse -M/--modprobe option

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

diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c
index 16821da83f39c5d7cb050ac95bd34ceab4079a35..56e5afb38758e42d34b90526bbe2b4fd1431b858 100644 (file)
--- a/iptables/ip6tables-save.c
+++ b/iptables/ip6tables-save.c
@@ -137,7 +137,7 @@ int ip6tables_save_main(int argc, char *argv[])
        init_extensions6();
 #endif
 
-       while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "bcdt:M:", options, NULL)) != -1) {
                switch (c) {
                case 'b':
                        fprintf(stderr, "-b/--binary option is not implemented\n");

diff --git a/iptables/iptables-save.8.in b/iptables/iptables-save.8.in
index 61282804c4d910376b9fe29b150a7dc72c975449..7f99d8a356f569197636b89bb39b9e0066cbbd34 100644 (file)
--- a/iptables/iptables-save.8.in
+++ b/iptables/iptables-save.8.in
@@ -36,7 +36,7 @@ and
 are used to dump the contents of IP or IPv6 Table in easily parseable format
 to STDOUT. Use I/O-redirection provided by your shell to write to a file.
 .TP
-\fB\-M\fP \fImodprobe_program\fP
+\fB\-M\fR, \fB\-\-modprobe\fR \fImodprobe_program\fP
 Specify the path to the modprobe program. By default, iptables-save will
 inspect /proc/sys/kernel/modprobe to determine the executable's path.
 .TP

diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c
index 2c25b71fe265b666a64829de55cfe3972b6c87a4..bcf88ae1ab1f18c05da6ec27049dc99bf84685ec 100644 (file)
--- a/iptables/iptables-save.c
+++ b/iptables/iptables-save.c
@@ -136,7 +136,7 @@ iptables_save_main(int argc, char *argv[])
        init_extensions4();
 #endif
 
-       while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "bcdt:M:", options, NULL)) != -1) {
                switch (c) {
                case 'b':
                        fprintf(stderr, "-b/--binary option is not implemented\n");

diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c
index fe77283ef4c74cf7766d1f910fb0057ab06fd77d..d51cdcf7d781e87960ec80df9d3f4b319f180728 100644 (file)
--- a/iptables/xtables-save.c
+++ b/iptables/xtables-save.c
@@ -104,7 +104,7 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
 
-       while ((c = getopt_long(argc, argv, "bcdt:46", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "bcdt:M:46", options, NULL)) != -1) {
                switch (c) {
                case 'b':
                        fprintf(stderr, "-b/--binary option is not implemented\n");