summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-07-05 15:16:05 +0200
committerPatrick McHardy <kaber@trash.net>2011-07-05 15:16:05 +0200
commit795ea2e8d4d9f01a606d0d7aac22572801e06989 (patch)
treeeff674a743855b7a539158f39769862c85aa7b73
parent411b390f3ffcd4708a0dfc0f2824a637de511cea (diff)
parent32cea83f26a2c342b9410e6dfb0530b33f8af928 (diff)
Merge branch 'master' of git://dev.medozas.de/iptables
-rw-r--r--INSTALL2
-rw-r--r--configure.ac2
-rw-r--r--iptables/ip6tables.8.in5
-rw-r--r--iptables/iptables.8.in3
-rw-r--r--iptables/iptables.c2
5 files changed, 4 insertions, 10 deletions
diff --git a/INSTALL b/INSTALL
index acb56cd5..e17e8441 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,7 +31,7 @@ Configuring and compiling
--with-xtlibdir=
The path to where Xtables extensions should be installed to. It
- defaults to ${prefix}/libexec/xtables.
+ defaults to ${libdir}/xtables.
--enable-devel (or --disable-devel)
diff --git a/configure.ac b/configure.ac
index 6c90caaf..5cb1b1bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_ARG_WITH([xtlibdir],
AS_HELP_STRING([--with-xtlibdir=PATH],
[Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
[xtlibdir="$withval"],
- [xtlibdir="${libexecdir}/xtables"])
+ [xtlibdir="${libdir}/xtables"])
AC_ARG_ENABLE([ipv4],
AS_HELP_STRING([--disable-ipv4], [Do not build iptables]),
[enable_ipv4="$enableval"], [enable_ipv4="yes"])
diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in
index 20e271de..748cebba 100644
--- a/iptables/ip6tables.8.in
+++ b/iptables/ip6tables.8.in
@@ -1,4 +1,4 @@
-.TH IP6TABLES 8 "" "iptables 1.4.4" "iptables 1.4.4"
+.TH IP6TABLES 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@"
.\"
.\" Man page written by Andras Kis-Szabo <kisza@sch.bme.hu>
.\" It is based on iptables man page.
@@ -366,9 +366,6 @@ module. You can specify multiple extended match modules in one line,
and you can use the \fB\-h\fP or \fB\-\-help\fP
options after the module has been specified to receive help specific
to that module.
-.PP
-The following are included in the base package, and most of these can
-be preceded by a "\fB!\fP" to invert the sense of the match.
.\" @MATCH@
.SH TARGET EXTENSIONS
ip6tables can use extended target modules: the following are included
diff --git a/iptables/iptables.8.in b/iptables/iptables.8.in
index 3b717a11..24618b7b 100644
--- a/iptables/iptables.8.in
+++ b/iptables/iptables.8.in
@@ -365,9 +365,6 @@ module. You can specify multiple extended match modules in one line,
and you can use the \fB\-h\fP or \fB\-\-help\fP
options after the module has been specified to receive help specific
to that module.
-.PP
-The following are included in the base package, and most of these can
-be preceded by a "\fB!\fP" to invert the sense of the match.
.\" @MATCH@
.SH TARGET EXTENSIONS
iptables can use extended target modules: the following are included
diff --git a/iptables/iptables.c b/iptables/iptables.c
index 477e8f1d..6ceaf6b8 100644
--- a/iptables/iptables.c
+++ b/iptables/iptables.c
@@ -178,9 +178,9 @@ static const int inverse_for_options[NUMBER_OF_OPT] =
/* -x */ 0,
/* -i */ IPT_INV_VIA_IN,
/* -o */ IPT_INV_VIA_OUT,
-/* -f */ IPT_INV_FRAG,
/*--line*/ 0,
/* -c */ 0,
+/* -f */ IPT_INV_FRAG,
};
#define opts iptables_globals.opts