---

yaml --- r: 5713 b: refs/heads/master c: 8b83bc7 h: refs/heads/master i: 5711: 5c7e299 v: v3
git-mirror · Aug 8, 2005 · 1c4eacc · 1c4eacc
1 parent 70729b3
commit 1c4eacc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48de5beeb0ee821859c79ba5b9462654604d8bf3
+refs/heads/master: 8b83bc77bf77cc8459cb94e52b08e775104c4c48
diff --git a/trunk/net/ipv4/netfilter/ip_nat_standalone.c b/trunk/net/ipv4/netfilter/ip_nat_standalone.c
@@ -102,6 +102,10 @@ ip_nat_fn(unsigned int hooknum,
 		return NF_ACCEPT;
 	}
 
+	/* Don't try to NAT if this packet is not conntracked */
+	if (ct == &ip_conntrack_untracked)
+		return NF_ACCEPT;
+
 	switch (ctinfo) {
 	case IP_CT_RELATED:
 	case IP_CT_RELATED+IP_CT_IS_REPLY: