Bug#336431: [PATCH] fix ip_conntrack_helper_pptp build when CONFIG_IP_NF_NAT_NEEDED=n

Bug#336431: [PATCH] fix ip_conntrack_helper_pptp build when CONFIG_IP_NF_NAT_NEEDED=n

[dann frazier]

As reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=336431,
ip_conntrack_helper_pptp in 2.6.14 fails to build if
CONFIG_IP_NF_NAT_NEEDED isn't enabled.  This patch fixes this by
disabling manipulation of the dir field of ip_conntrack_expect
structures when full nat isn't configured.  Compile tested only.

Signed-off-by: dann frazier <dannf@hp.com>

--- linux-source-2.6.14/net/ipv4/netfilter/ip_conntrack_helper_pptp.c.orig	2005-10-27 18:02:08.000000000 -0600
+++ linux-source-2.6.14/net/ipv4/netfilter/ip_conntrack_helper_pptp.c	2005-10-31 18:12:03.000000000 -0700
@@ -270,13 +270,14 @@
 	exp_orig->expectfn = pptp_expectfn;
 	exp_orig->flags = 0;
 
-	exp_orig->dir = IP_CT_DIR_ORIGINAL;
-
 	/* both expectations are identical apart from tuple */
 	memcpy(exp_reply, exp_orig, sizeof(*exp_reply));
 	memcpy(&exp_reply->tuple, &exp_tuples[1], sizeof(exp_reply->tuple));
 
+#ifdef CONFIG_IP_NF_NAT_NEEDED
+	exp_orig->dir = IP_CT_DIR_ORIGINAL;
 	exp_reply->dir = !exp_orig->dir;
+#endif
 
 	if (ip_nat_pptp_hook_exp_gre)
 		ret = ip_nat_pptp_hook_exp_gre(exp_orig, exp_reply);

-- 
dann frazier <dannf@hp.com>

Re: [PATCH] fix ip_conntrack_helper_pptp build when CONFIG_IP_NF_NAT_NEEDED=n

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 891 bytes --]

On Mon, Oct 31, 2005 at 06:13:55PM -0700, dann frazier wrote:
> As reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=336431,
> ip_conntrack_helper_pptp in 2.6.14 fails to build if
> CONFIG_IP_NF_NAT_NEEDED isn't enabled.  This patch fixes this by
> disabling manipulation of the dir field of ip_conntrack_expect
> structures when full nat isn't configured.  Compile tested only.

Thanks for reporting this bug.   Yasuyuki Kozakai has submitted a
slightly cleaner version, so I'm merging his patch.

-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Bug#336431: [PATCH] fix ip_conntrack_helper_pptp build when CONFIG_IP_NF_NAT_NEEDED=n

[dann frazier]

tags 336431 + upstream
tags 336431 + patch
stop

On Thu, 2005-11-03 at 10:54 +0100, Harald Welte wrote:
> On Mon, Oct 31, 2005 at 06:13:55PM -0700, dann frazier wrote:
> > As reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=336431,
> > ip_conntrack_helper_pptp in 2.6.14 fails to build if
> > CONFIG_IP_NF_NAT_NEEDED isn't enabled.  This patch fixes this by
> > disabling manipulation of the dir field of ip_conntrack_expect
> > structures when full nat isn't configured.  Compile tested only.
> 
> Thanks for reporting this bug.   Yasuyuki Kozakai has submitted a
> slightly cleaner version, so I'm merging his patch.

Thanks for the response Harald.

Looks like this is the patch we should use:
  http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=2991

-- 
dann frazier <dannf@hp.com>

Re: [PATCH] fix ip_conntrack_helper_pptp build when CONFIG_IP_NF_NAT_NEEDED=n

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 1376 bytes --]

On Thu, Nov 03, 2005 at 09:29:53AM -0700, dann frazier wrote:
> tags 336431 + upstream
> tags 336431 + patch
> stop
> 
> On Thu, 2005-11-03 at 10:54 +0100, Harald Welte wrote:
> > On Mon, Oct 31, 2005 at 06:13:55PM -0700, dann frazier wrote:
> > > As reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=336431,
> > > ip_conntrack_helper_pptp in 2.6.14 fails to build if
> > > CONFIG_IP_NF_NAT_NEEDED isn't enabled.  This patch fixes this by
> > > disabling manipulation of the dir field of ip_conntrack_expect
> > > structures when full nat isn't configured.  Compile tested only.
> > 
> > Thanks for reporting this bug.   Yasuyuki Kozakai has submitted a
> > slightly cleaner version, so I'm merging his patch.
> 
> Thanks for the response Harald.
> 
> Looks like this is the patch we should use:
>   http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=2991

no, it's 

http://patchwork.netfilter.org/netfilter-devel/patch.pl?id=3001

sorry for the confusion.

-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]