iptables branch, master, updated. v1.4.8-17-g78514bc
Patrick McHardy
netfilter-cvslog-bounces at lists.netfilter.org
Fri Jun 25 14:51:15 CEST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "iptables".
The branch, master has been updated
via 78514bc3a9b1b724c9fc904941c5854644865673 (commit)
via e6d0d94139e826f7b5d8446ce174155c04963b07 (commit)
via 76f7a230e4182ab2b64a68c9d84437035d925f3b (commit)
via dd2bbe0b614ad60fb2e267863471836aae424425 (commit)
via 6a7696b5eeba301b76da12c77e9b0b5ce448bc6b (commit)
via 11c2dd54b69e06ae3f35dea130ecba3df3859243 (commit)
via 0cb675b8f18c4b074d4c69461638820708e98100 (commit)
via 491c1660fced08e2d1a08c101c63af04250275d0 (commit)
from d40f1628c3717daebc437a398a285e371b5b6f7f (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 78514bc3a9b1b724c9fc904941c5854644865673
Merge: e6d0d94139e826f7b5d8446ce174155c04963b07 d40f1628c3717daebc437a398a285e371b5b6f7f
Author: Patrick McHardy <kaber at trash.net>
Date: Fri Jun 25 14:50:53 2010 +0200
Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables
commit e6d0d94139e826f7b5d8446ce174155c04963b07
Merge: 6a7696b5eeba301b76da12c77e9b0b5ce448bc6b 76f7a230e4182ab2b64a68c9d84437035d925f3b
Author: Patrick McHardy <kaber at trash.net>
Date: Fri Jun 25 14:50:03 2010 +0200
Merge branch 'master' of git://dev.medozas.de/iptables
commit 76f7a230e4182ab2b64a68c9d84437035d925f3b
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu Jun 24 21:23:44 2010 +0200
libxt_conntrack: do print netmask
References: http://bugzilla.netfilter.org/show_bug.cgi?id=659
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit dd2bbe0b614ad60fb2e267863471836aae424425
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu Jun 24 21:13:47 2010 +0200
libxt_hashlimit: always print burst value
iptables -L lists the burst value, and so should iptables -S. I was
certainly surprised to see it gone even when explicitly specifying
--hashlimit-burst 5 on the command line.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 6a7696b5eeba301b76da12c77e9b0b5ce448bc6b
Merge: 4a498502c10e690798aa78eb92e3aed7ce79f4e0 11c2dd54b69e06ae3f35dea130ecba3df3859243
Author: Patrick McHardy <kaber at trash.net>
Date: Thu Jun 24 17:00:23 2010 +0200
Merge branch 'master' of git://dev.medozas.de/iptables
commit 11c2dd54b69e06ae3f35dea130ecba3df3859243
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon Jun 7 12:00:24 2010 +0200
xtables: remove xtables_set_revision function
Since iptables uses its own copies of the header files anyway where the
revision field is exposed, there is no reach to access name[] beyond its
size.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 0cb675b8f18c4b074d4c69461638820708e98100
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon Jun 7 11:50:25 2010 +0200
xtables: another try at chain name length checking
Since XT_EXTENSION_MAXNAMELEN is now available, make use of it
and clear the confusion.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 491c1660fced08e2d1a08c101c63af04250275d0
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon Jun 7 10:59:03 2010 +0200
includes: sync header files from Linux 2.6.35-rc1
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
extensions/libxt_conntrack.c | 16 ++++++--
extensions/libxt_hashlimit.c | 6 +--
include/linux/kernel.h | 62 +++++++++++++++++++++++++++++++++
include/linux/netfilter/x_tables.h | 30 +++++++++++-----
include/linux/netfilter/xt_CONNMARK.h | 22 +-----------
include/linux/netfilter/xt_MARK.h | 6 +---
include/linux/netfilter/xt_TEE.h | 3 ++
include/linux/netfilter/xt_connmark.h | 11 ++++++
include/linux/netfilter/xt_mark.h | 4 ++
include/linux/netfilter/xt_recent.h | 7 ++++
include/linux/netfilter_ipv6.h | 1 +
include/xtables.h.in | 1 -
ip6tables-restore.c | 4 +-
ip6tables.c | 12 +++----
iptables-restore.c | 4 +-
iptables.c | 15 +++-----
xtables.c | 18 ++-------
18 files changed, 145 insertions(+), 79 deletions(-)
create mode 100644 include/linux/kernel.h
hooks/post-receive
--
iptables
More information about the netfilter-cvslog
mailing list