[netfilter-cvslog] r4130 - branches/netfilter-ha/linux-2.6/patches

[hidden at netfilter.org]

Author: hidden at netfilter.org
Date: 2005-07-19 12:13:14 +0200 (Tue, 19 Jul 2005)
New Revision: 4130

Modified:
   branches/netfilter-ha/linux-2.6/patches/ct_sync_config_and_makefile.patch
Log:
patches/ct_sync_config_and_makefile.patch: define
IP_NF_CONNTRACK_SYNC_MARKED as boolean



Modified: branches/netfilter-ha/linux-2.6/patches/ct_sync_config_and_makefile.patch
===================================================================
--- branches/netfilter-ha/linux-2.6/patches/ct_sync_config_and_makefile.patch	2005-07-19 10:10:49 UTC (rev 4129)
+++ branches/netfilter-ha/linux-2.6/patches/ct_sync_config_and_makefile.patch	2005-07-19 10:13:14 UTC (rev 4130)
@@ -1,7 +1,7 @@
-Index: linux-2.6.9/net/ipv4/netfilter/Makefile
+Index: linux-2.6.10-ctsync/net/ipv4/netfilter/Makefile
 ===================================================================
---- linux-2.6.9.orig/net/ipv4/netfilter/Makefile	2004-12-10 00:10:57.000000000 +0100
-+++ linux-2.6.9/net/ipv4/netfilter/Makefile	2004-12-15 22:03:22.000000000 +0100
+--- linux-2.6.10-ctsync.orig/net/ipv4/netfilter/Makefile	2005-07-19 11:26:32.516195604 +0200
++++ linux-2.6.10-ctsync/net/ipv4/netfilter/Makefile	2005-07-19 11:27:42.791714055 +0200
 @@ -16,6 +16,9 @@
  ipfwadm-objs		:= $(ip_nf_compat-objs) ipfwadm_core.o
  ipchains-objs		:= $(ip_nf_compat-objs) ipchains_core.o
@@ -12,17 +12,17 @@
  # connection tracking
  obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
  
-@@ -99,3 +102,5 @@
+@@ -101,3 +104,5 @@
  obj-$(CONFIG_IP_NF_COMPAT_IPFWADM) += ipfwadm.o
  
  obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o
 +
 +obj-$(CONFIG_IP_NF_CT_SYNC) += ct_sync.o
-Index: linux-2.6.9/net/ipv4/netfilter/Kconfig
+Index: linux-2.6.10-ctsync/net/ipv4/netfilter/Kconfig
 ===================================================================
---- linux-2.6.9.orig/net/ipv4/netfilter/Kconfig	2004-12-10 00:10:57.000000000 +0100
-+++ linux-2.6.9/net/ipv4/netfilter/Kconfig	2004-12-15 22:03:22.000000000 +0100
-@@ -718,5 +718,22 @@
+--- linux-2.6.10-ctsync.orig/net/ipv4/netfilter/Kconfig	2005-07-19 11:26:32.516195604 +0200
++++ linux-2.6.10-ctsync/net/ipv4/netfilter/Kconfig	2005-07-19 11:30:00.179497725 +0200
+@@ -742,5 +742,23 @@
  	  
  	  IF unsure, say `N'.
  
@@ -37,6 +37,7 @@
 +	  If unsure, say `N'.
 +
 +config IP_NF_CONNTRACK_SYNC_MARKED
++	bool "Synchronize marked connections only"
 +	depends on IP_NF_CT_SYNC && IP_NF_CONNTRACK_MARK
 +	help
 +	  This option enables the 'cmarkbit' option of ct_sync.  This means that