[netfilter-cvslog] r4003 - trunk/patch-o-matic-ng/pptp-conntrack-nat

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-26 14:03:43 +0200 (Sun, 26 Jun 2005)
New Revision: 4003

Modified:
   trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch
Log:
don't return error on success


Modified: trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch
===================================================================
--- trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch	2005-06-24 16:37:00 UTC (rev 4002)
+++ trunk/patch-o-matic-ng/pptp-conntrack-nat/linux-2.6.patch	2005-06-26 12:03:43 UTC (rev 4003)
@@ -135,3 +135,14 @@
  			         struct ip_conntrack_expect *, newtuple, &expect->mask)) {
  			/* Force NAT to find an unused tuple */
 
+diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linux-2.6.10/net/ipv4/netfilter/ip_conntrack_core.c linux-2.6.10-reuse-expect/net/ipv4/netfilter/ip_conntrack_core.c
+--- linux-2.6.10/net/ipv4/netfilter/ip_conntrack_core.c	2004-12-24 22:33:47.000000000 +0100
++++ linux-2.6.10-reuse-expect/net/ipv4/netfilter/ip_conntrack_core.c	2005-06-20 23:19:26.000000000 +0200
+@@ -952,7 +952,6 @@
+ 		 * related_to->expecting. 
+ 		 */
+ 		unexpect_related(old);
+-		ret = -EPERM;
+ 	} else if (LIST_FIND(&ip_conntrack_expect_list, expect_clash,
+ 			     struct ip_conntrack_expect *, &expect->tuple, 
+ 			     &expect->mask)) {