summaryrefslogtreecommitdiffstats
path: root/iptables
diff options
context:
space:
mode:
authorJiri Popelka <jpopelka@redhat.com>2014-03-14 12:52:48 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-03-17 12:48:25 +0100
commitd25f308e54730677698d93f29ca4630e25237935 (patch)
tree445a852ad359387ea41bd004c9ac9b47efeaeb4e /iptables
parent991ad3874826d560efcf81c8422b1e9b5b935bbc (diff)
iptables-save: actually parse -M/--modprobe option
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables')
-rw-r--r--iptables/ip6tables-save.c2
-rw-r--r--iptables/iptables-save.8.in2
-rw-r--r--iptables/iptables-save.c2
-rw-r--r--iptables/xtables-save.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c
index 16821da8..56e5afb3 100644
--- 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 61282804..7f99d8a3 100644
--- 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 2c25b71f..bcf88ae1 100644
--- 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 fe77283e..d51cdcf7 100644
--- 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");