[iptables] Merge branch 'stable' of git://dev.medozas.de/iptables
Patrick McHardy
netfilter-cvslog-bounces at lists.netfilter.org
Thu Jun 11 17:57:16 CEST 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=4ada8440f43e8335c96706b749f606b527c8a038
commit 4ada8440f43e8335c96706b749f606b527c8a038
Merge: 2d28001... 18c475d...
Author: Patrick McHardy <kaber at trash.net>
AuthorDate: Thu Jun 11 17:56:24 2009 +0200
Commit: Patrick McHardy <kaber at trash.net>
CommitDate: Thu Jun 11 17:56:24 2009 +0200
Merge branch 'stable' of git://dev.medozas.de/iptables
commit 18c475d7040abc6d3094ee0348904deafe997508
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Wed Jun 10 20:18:43 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Wed Jun 10 20:30:05 2009 +0200
manpages: markup corrections
The manpage of xt_cluster and xt_recent had some unclosed tags.
Backslashes in commands are also not wanted because manpages are a
freeform, automatically-wrapped text.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit f1afcc896e7f8be3a6419681fd8cdee1d600a3aa
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Wed Jun 10 13:52:58 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Wed Jun 10 20:29:59 2009 +0200
iptables: close open file descriptors
Just for correctness, close some file descriptors that were opened.
(E.g. ip6tables-save reading from procfs files.)
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit a3726818e07d47136010f09762637a3e597329e3
Author: kd6lvw <kd6lvw at yahoo.com>
AuthorDate: Sun Jun 7 14:23:00 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Wed Jun 10 05:22:21 2009 +0200
libxt_connlimit: initialize v6_mask
When converting "--connlimit-mask $bits" to a 128-bit v6 mask, the
code uses a left shift on v6_mask[n]. This requires v6_mask to be
filled with all one-bits beforehand, but this initialization was not
done.
References: http://bugzilla.netfilter.org/show_bug.cgi?id=597
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit ae737f0070c9aaccb722ba342b12043fb124d9e2
Author: Ian Bruce <ian_bruce at fastmail.net>
AuthorDate: Sat Jun 6 06:04:24 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Mon Jun 8 23:39:24 2009 +0200
libxt_tcp: manpage corrections and suggestions
From: Ian Bruce <ian_bruce at fastmail.net>
The commit corrects some minor errors in the iptables(8) man page,
related to port ranges in the "tcp" module.
Reference: http://bugs.debian.org/531677
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 156f58692bbe9e509b32670f93582bead785c926
Author: Frank Tobin <ftobin+netfilter at neverending.org>
AuthorDate: Thu May 21 05:09:00 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Mon Jun 8 23:38:46 2009 +0200
libxt_tcp: fix a manpage syntax typo
Reference: http://bugzilla.netfilter.org/show_bug.cgi?id=596
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
via 4ada8440f43e8335c96706b749f606b527c8a038 (commit)
via 18c475d7040abc6d3094ee0348904deafe997508 (commit)
via f1afcc896e7f8be3a6419681fd8cdee1d600a3aa (commit)
via a3726818e07d47136010f09762637a3e597329e3 (commit)
via ae737f0070c9aaccb722ba342b12043fb124d9e2 (commit)
via 156f58692bbe9e509b32670f93582bead785c926 (commit)
from 2d280014e281b520280b1a11662aea0da2ffc59c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4ada8440f43e8335c96706b749f606b527c8a038
Merge: 2d280014e281b520280b1a11662aea0da2ffc59c 18c475d7040abc6d3094ee0348904deafe997508
Author: Patrick McHardy <kaber at trash.net>
Date: Thu Jun 11 17:56:24 2009 +0200
Merge branch 'stable' of git://dev.medozas.de/iptables
commit 18c475d7040abc6d3094ee0348904deafe997508
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Wed Jun 10 20:18:43 2009 +0200
manpages: markup corrections
The manpage of xt_cluster and xt_recent had some unclosed tags.
Backslashes in commands are also not wanted because manpages are a
freeform, automatically-wrapped text.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit f1afcc896e7f8be3a6419681fd8cdee1d600a3aa
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Wed Jun 10 13:52:58 2009 +0200
iptables: close open file descriptors
Just for correctness, close some file descriptors that were opened.
(E.g. ip6tables-save reading from procfs files.)
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit a3726818e07d47136010f09762637a3e597329e3
Author: kd6lvw <kd6lvw at yahoo.com>
Date: Sun Jun 7 14:23:00 2009 +0200
libxt_connlimit: initialize v6_mask
When converting "--connlimit-mask $bits" to a 128-bit v6 mask, the
code uses a left shift on v6_mask[n]. This requires v6_mask to be
filled with all one-bits beforehand, but this initialization was not
done.
References: http://bugzilla.netfilter.org/show_bug.cgi?id=597
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit ae737f0070c9aaccb722ba342b12043fb124d9e2
Author: Ian Bruce <ian_bruce at fastmail.net>
Date: Sat Jun 6 06:04:24 2009 +0200
libxt_tcp: manpage corrections and suggestions
From: Ian Bruce <ian_bruce at fastmail.net>
The commit corrects some minor errors in the iptables(8) man page,
related to port ranges in the "tcp" module.
Reference: http://bugs.debian.org/531677
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 156f58692bbe9e509b32670f93582bead785c926
Author: Frank Tobin <ftobin+netfilter at neverending.org>
Date: Thu May 21 05:09:00 2009 +0200
libxt_tcp: fix a manpage syntax typo
Reference: http://bugzilla.netfilter.org/show_bug.cgi?id=596
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
-----------------------------------------------------------------------
extensions/libxt_TCPMSS.man | 5 ++---
extensions/libxt_TPROXY.man | 2 +-
extensions/libxt_cluster.man | 38 +++++++++++++++++++-------------------
extensions/libxt_connlimit.c | 4 +++-
extensions/libxt_connlimit.man | 2 +-
extensions/libxt_recent.man | 4 ++--
extensions/libxt_tcp.man | 6 +++---
ip6tables-restore.c | 2 ++
ip6tables-save.c | 1 +
iptables-restore.c | 2 ++
iptables-save.c | 1 +
iptables-xml.c | 2 ++
12 files changed, 39 insertions(+), 30 deletions(-)
Reference: http://bugzilla.netfilter.org/show_bug.cgi?id=596
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
diff --git a/extensions/libxt_tcp.man b/extensions/libxt_tcp.man
index 8f39cdb..0a99cdf 100644
--- a/extensions/libxt_tcp.man
+++ b/extensions/libxt_tcp.man
@@ -12,7 +12,7 @@ The flag
\fB\-\-sport\fP
is a convenient alias for this option.
.TP
-[\fB!\fP] \fB\-\-destination\-port\fP,\fB\-\-dport\fP \fIport\fP[\fB,\fP\fIport\fP]
+[\fB!\fP] \fB\-\-destination\-port\fP,\fB\-\-dport\fP \fIport\fP[\fB:\fP\fIport\fP]
Destination port or port range specification. The flag
\fB\-\-dport\fP
is a convenient alias for this option.
More information about the netfilter-cvslog
mailing list