iptables: option parsing inversion fix

iptables: option parsing inversion fix

[Jan Engelhardt]

The following changes since commit 2ad8dc895ec28a173c629c695c2e11c41b625b6e:

  xtables: use all IPv6 addresses resolved from a hostname (2011-02-27 02:28:44 +0100)

are available in the git repository at:
  git://dev.medozas.de/iptables master

Jan Engelhardt (2):
      iptables: fix an inversion
      doc: add VERSION section to manpages

 ip6tables.8.in |    3 +++
 iptables.8.in  |    3 +++
 xshared.c      |    2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)

[PATCH 1/2] iptables: fix an inversion

[Jan Engelhardt]

Revisiting the original condition (viewable in git log -1 -p
v1.4.10-57-gacef604), one can notice an unforuntate inversion. This
commit corrects this.

Testcase: -A INPUT -p tcp --dport 1

Reported-by: Florian Westphal
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 xshared.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xshared.c b/xshared.c
index b47beb1..c5a9015 100644
--- a/xshared.c
+++ b/xshared.c
@@ -87,7 +87,7 @@ static bool should_load_proto(struct iptables_command_state *cs)
 	if (cs->protocol == NULL)
 		return false;
 	if (find_proto(cs->protocol, XTF_DONT_LOAD,
-	    cs->options & OPT_NUMERIC, NULL) != NULL)
+	    cs->options & OPT_NUMERIC, NULL) == NULL)
 		return true;
 	return cs->proto_used;
 }
-- 
1.7.1

[PATCH 2/2] doc: add VERSION section to manpages

[Jan Engelhardt]

This shall make it easier to identify outdated HTML renditions on the
interwebs, since many of them do not display the .TH header like man(1)
does.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 ip6tables.8.in |    3 +++
 iptables.8.in  |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ip6tables.8.in b/ip6tables.8.in
index 5688133..4306934 100644
--- a/ip6tables.8.in
+++ b/ip6tables.8.in
@@ -419,3 +419,6 @@ iptables man page written by Herve Eychenne <rv@wallfire.org>.
 .\" .. sexy, too ..
 .\" .. witty, charming, powerful ..
 .\" .. and most of all, modest ..
+.SH VERSION
+.PP
+This manual page applies to ip6tables @PACKAGE_VERSION@.
diff --git a/iptables.8.in b/iptables.8.in
index d29deb2..f36d220 100644
--- a/iptables.8.in
+++ b/iptables.8.in
@@ -427,3 +427,6 @@ Man page originally written by Herve Eychenne <rv@wallfire.org>.
 .\" .. sexy, too ..
 .\" .. witty, charming, powerful ..
 .\" .. and most of all, modest ..
+.SH VERSION
+.PP
+This manual page applies to iptables @PACKAGE_VERSION@.
-- 
1.7.1

Re: iptables: option parsing inversion fix

[Patrick McHardy]

On 01.03.2011 15:44, Jan Engelhardt wrote:
> The following changes since commit 2ad8dc895ec28a173c629c695c2e11c41b625b6e:
> 
>   xtables: use all IPv6 addresses resolved from a hostname (2011-02-27 02:28:44 +0100)
> 
> are available in the git repository at:
>   git://dev.medozas.de/iptables master
> 
> Jan Engelhardt (2):
>       iptables: fix an inversion
>       doc: add VERSION section to manpages

Pulled, thanks Jan.