aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-01-26 01:07:59 -0800
committerDavid S. Miller <davem@davemloft.net>2007-01-26 01:07:59 -0800
commit7399072a7348d025e7bcb5eb5d5e9be941d490b7 (patch)
tree7e8371fa5c6d9a41957644a8f0ac551e722419cb /net
parenta46bf7d5a81b350cd204b82bd25ee6ffbc2967d4 (diff)
downloadkernel_samsung_smdk4412-7399072a7348d025e7bcb5eb5d5e9be941d490b7.zip
kernel_samsung_smdk4412-7399072a7348d025e7bcb5eb5d5e9be941d490b7.tar.gz
kernel_samsung_smdk4412-7399072a7348d025e7bcb5eb5d5e9be941d490b7.tar.bz2
[NETFILTER]: nf_conntrack_pptp: fix NAT setup of expected GRE connections
When an expected connection arrives, the NAT helper should be called to set up NAT similar to the master connection. The PPTP conntrack helper incorrectly checks whether the _expected_ connection has NAT setup before calling the NAT helper (which is never the case), instead of checkeing whether the _master_ connection is NATed. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_pptp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c
index f0ff00e..c59df3b 100644
--- a/net/netfilter/nf_conntrack_pptp.c
+++ b/net/netfilter/nf_conntrack_pptp.c
@@ -113,7 +113,7 @@ static void pptp_expectfn(struct nf_conn *ct,
rcu_read_lock();
nf_nat_pptp_expectfn = rcu_dereference(nf_nat_pptp_hook_expectfn);
- if (nf_nat_pptp_expectfn && ct->status & IPS_NAT_MASK)
+ if (nf_nat_pptp_expectfn && ct->master->status & IPS_NAT_MASK)
nf_nat_pptp_expectfn(ct, exp);
else {
struct nf_conntrack_tuple inv_t;