git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_nat_ftp.c
diff --git
a/net/ipv4/netfilter/ip_nat_ftp.c
b/net/ipv4/netfilter/ip_nat_ftp.c
index
c6000e7
..
3328fc5
100644
(file)
--- a/
net/ipv4/netfilter/ip_nat_ftp.c
+++ b/
net/ipv4/netfilter/ip_nat_ftp.c
@@
-143,10
+143,8
@@
static unsigned int ip_nat_ftp(struct sk_buff **pskb,
break;
}
break;
}
- if (port == 0) {
- ip_conntrack_expect_free(exp);
+ if (port == 0)
return NF_DROP;
return NF_DROP;
- }
if (!mangle[type](pskb, newip, port, matchoff, matchlen, ct, ctinfo,
seq)) {
if (!mangle[type](pskb, newip, port, matchoff, matchlen, ct, ctinfo,
seq)) {
@@
-156,14
+154,14
@@
static unsigned int ip_nat_ftp(struct sk_buff **pskb,
return NF_ACCEPT;
}
return NF_ACCEPT;
}
-static void __exit fini(void)
+static void __exit
ip_nat_ftp_
fini(void)
{
ip_nat_ftp_hook = NULL;
/* Make sure noone calls it, meanwhile. */
synchronize_net();
}
{
ip_nat_ftp_hook = NULL;
/* Make sure noone calls it, meanwhile. */
synchronize_net();
}
-static int __init init(void)
+static int __init i
p_nat_ftp_i
nit(void)
{
BUG_ON(ip_nat_ftp_hook);
ip_nat_ftp_hook = ip_nat_ftp;
{
BUG_ON(ip_nat_ftp_hook);
ip_nat_ftp_hook = ip_nat_ftp;
@@
-173,11
+171,11
@@
static int __init init(void)
/* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */
static int warn_set(const char *val, struct kernel_param *kp)
{
/* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */
static int warn_set(const char *val, struct kernel_param *kp)
{
- printk(KERN_INFO
__stringify(KBUILD_MODNAME)
+ printk(KERN_INFO
KBUILD_MODNAME
": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
return 0;
}
module_param_call(ports, warn_set, NULL, NULL, 0);
": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
return 0;
}
module_param_call(ports, warn_set, NULL, NULL, 0);
-module_init(init);
-module_exit(fini);
+module_init(i
p_nat_ftp_i
nit);
+module_exit(
ip_nat_ftp_
fini);