PPTP helper and NEWNAT

[Takuya Satoh]

Hi,
I tried to apply the
http://www.impsec.org/linux/masquerade/netfilter-pptp-2.4.17-rev2.patch.gz
patch to the 2.4.18-rc4 kernel patched previously with newnat7.  It applied
cleanly except for this:

include/linux/netfilter_ipv4/ip_conntrack.h:
***************
*** 147,152 ****
  #if defined(CONFIG_IP_NF_IRC) || defined(CONFIG_IP_NF_IRC_MODULE)
    struct ip_ct_irc ct_irc_info;
  #endif
   } help;

  #ifdef CONFIG_IP_NF_NAT_NEEDED
--- 155,164 ----
  #if defined(CONFIG_IP_NF_IRC) || defined(CONFIG_IP_NF_IRC_MODULE)
    struct ip_ct_irc ct_irc_info;
  #endif
+ #if defined(CONFIG_IP_NF_PPTP) || defined(CONFIG_IP_NF_PPTP_MODULE)
+   struct ip_ct_pptp ct_pptp_info;
+ #endif
+
   } help;

  #ifdef CONFIG_IP_NF_NAT_NEEDED

net/ipv4/netfilter/Makefile:
***************
*** 9,15 ****

  O_TARGET := netfilter.o

! export-objs = ip_conntrack_standalone.o ip_conntrack_ftp.o ip_fw_compat.o
ip_nat_standalone.o ip_tables.o

  # Multipart objects.
  list-multi  := ip_conntrack.o iptable_nat.o ipfwadm.o ipchains.o
--- 9,15 ----

  O_TARGET := netfilter.o

! export-objs = ip_conntrack_standalone.o ip_conntrack_ftp.o ip_fw_compat.o
ip_nat_standalone.o ip_tables.o ip_conntrack_pptp.o

  # Multipart objects.
  list-multi  := ip_conntrack.o iptable_nat.o ipfwadm.o ipchains.o
***************
*** 37,45 ****

  # connection tracking helpers
  obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o

  # NAT helpers
  obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o

  # generic IP tables
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
--- 37,47 ----

  # connection tracking helpers
  obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o
+ obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack_pptp.o

  # NAT helpers
  obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o
+ obj-$(CONFIG_IP_NF_PPTP) += ip_nat_pptp.o

  # generic IP tables
  obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o


Could anyone suggest a fix?
Taka