On Sun, Jul 27, 2003 at 10:08:40AM -0700, Linus Torvalds wrote:
[snip]
> o [NETFILTER]: Fix ip_nat_ftp in 2.6.0-test1
> o [NETFILTER]: Re-sync ipt_REJECT with 2.4.x
> o [NETFILTER]: Fix a bug in the IRC DCC command parser of
> ip_conntrack_irc
> o [NETFILTER]: Fix typo in ipt_MIRROR.c
> o [NETFILTER]: Make REJECT target compliant with RFC 1812
> o [NETFILTER]: Fix various problems with MIRROR target
> o [NETFILTER]: Fix issues with REJECT and MIRROR targets wrt. policy
> routing
> o [NETFILTER]: Fix locking of ipt_helper
> o [NETFILTER]: Drop reference to conntrack after removing confirmed
> expectation
One of these broke the compilation of net/ipv4/netfilter/ipt_helper.o:
CC [M] net/ipv4/netfilter/ipt_helper.o
In file included from net/ipv4/netfilter/ipt_helper.c:13:
include/linux/netfilter_ipv4/ip_conntrack_core.h: In function `ip_conntrack_confirm':
include/linux/netfilter_ipv4/ip_conntrack_core.h:46: error: `NF_ACCEPT' undeclared (first use in this function)
include/linux/netfilter_ipv4/ip_conntrack_core.h:46: error: (Each undeclared identifier is reported only once
include/linux/netfilter_ipv4/ip_conntrack_core.h:46: error: for each function it appears in.)
This trivial patch fixes it:
--- net/ipv4/netfilter/ipt_helper.c.orig 2003-07-27 15:19:49.000000000 -0500
+++ net/ipv4/netfilter/ipt_helper.c 2003-07-27 15:07:55.000000000 -0500
@@ -9,6 +9,7 @@
*/
#include <linux/module.h>
#include <linux/skbuff.h>
+#include <linux/netfilter.h>
#include <linux/netfilter_ipv4/ip_conntrack.h>
#include <linux/netfilter_ipv4/ip_conntrack_core.h>
#include <linux/netfilter_ipv4/ip_conntrack_helper.h>
florin
--"NT is to UNIX what a doughnut is to a particle accelerator."
This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:33 EST