summaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-19 01:03:47 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-19 01:03:47 +0000
commit74a5d18a1f951ef6ae29ee72b72198e41ffe51c4 (patch)
treeaad29c03ca9825007b47b992f24090bdd9efb3a1 /package/kernel
parent6ed76af34a2393bf63049295954821f32e4e075c (diff)
reorganize nat helper packages, move ftp and irc nat to a package that is enabled by default, for security reasons - see #917 for more information
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5581 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/modules/netfilter.mk20
1 files changed, 18 insertions, 2 deletions
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 6f3994c12..8a99a27ec 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -81,6 +81,23 @@ endef
$(eval $(call KernelPackage,ipt-nat))
define KernelPackage/ipt-nathelper
+ TITLE:=Default Conntrack and NAT helpers
+ DEFAULT:=y
+ DESCRIPTION:=\
+ Default Netfilter (IPv4) Conntrack and NAT helpers \\\
+ \\\
+ Includes: \\\
+ - ip_conntrack_ftp \\\
+ - ip_nat_ftp \\\
+ - ip_conntrack_irc \\\
+ - ip_nat_irc \\\
+ - ip_conntrack_tftp
+ FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+ SUBMENU:=$(NFMENU)
+endef
+$(eval $(call KernelPackage,ipt-nathelper))
+
+define KernelPackage/ipt-nathelper-extra
TITLE:=Extra Conntrack and NAT helpers
DESCRIPTION:=\
Extra Netfilter (IPv4) Conntrack and NAT helpers \\\
@@ -93,8 +110,7 @@ define KernelPackage/ipt-nathelper
- ip_nat_pptp \\\
- ip_conntrack_sip \\\
- ip_nat_sip \\\
- - ip_nat_snmp_basic \\\
- - ip_conntrack_tftp
+ - ip_nat_snmp_basic
FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
SUBMENU:=$(NFMENU)
endef