diff -urN linux-2.4.19-pre5/net/ipv4/netfilter/ip_conntrack_ftp.c linux-2419p5-ipt126a-submitted/net/ipv4/netfilter/ip_conntrack_ftp.c --- linux-2.4.19-pre5/net/ipv4/netfilter/ip_conntrack_ftp.c Sat Dec 1 18:27:13 2001 +++ linux-2419p5-ipt126a-submitted/net/ipv4/netfilter/ip_conntrack_ftp.c Sat Mar 30 22:59:24 2002 @@ -15,7 +15,7 @@ #define MAX_PORTS 8 static int ports[MAX_PORTS]; -static int ports_c; +static int ports_c = 0; #ifdef MODULE_PARM MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_PORTS) "i"); #endif @@ -380,7 +380,7 @@ static void fini(void) { int i; - for (i = 0; (i < MAX_PORTS) && ports[i]; i++) { + for (i = 0; i < ports_c; i++) { DEBUGP("ip_ct_ftp: unregistering helper for port %d\n", ports[i]); ip_conntrack_helper_unregister(&ftp[i]); diff -urN linux-2.4.19-pre5/net/ipv4/netfilter/ip_conntrack_irc.c linux-2419p5-ipt126a-submitted/net/ipv4/netfilter/ip_conntrack_irc.c --- linux-2.4.19-pre5/net/ipv4/netfilter/ip_conntrack_irc.c Sun Mar 3 17:17:11 2002 +++ linux-2419p5-ipt126a-submitted/net/ipv4/netfilter/ip_conntrack_irc.c Sat Mar 30 22:59:24 2002 @@ -29,7 +29,7 @@ #define MAX_PORTS 8 static int ports[MAX_PORTS]; -static int ports_n_c = 0; +static int ports_c = 0; MODULE_AUTHOR("Harald Welte "); MODULE_DESCRIPTION("IRC (DCC) connection tracking module"); @@ -256,7 +256,7 @@ fini(); return -EBUSY; } - ports_n_c++; + ports_c++; } return 0; } @@ -266,7 +266,7 @@ static void fini(void) { int i; - for (i = 0; (i < MAX_PORTS) && ports[i]; i++) { + for (i = 0; i < ports_c; i++) { DEBUGP("unregistering port %d\n", ports[i]); ip_conntrack_helper_unregister(&irc_helpers[i]); diff -urN linux-2.4.19-pre5/net/ipv4/netfilter/ip_nat_ftp.c linux-2419p5-ipt126a-submitted/net/ipv4/netfilter/ip_nat_ftp.c --- linux-2.4.19-pre5/net/ipv4/netfilter/ip_nat_ftp.c Sat Dec 1 18:27:13 2001 +++ linux-2419p5-ipt126a-submitted/net/ipv4/netfilter/ip_nat_ftp.c Sat Mar 30 22:59:24 2002 @@ -317,7 +317,7 @@ { int i; - for (i = 0; (i < MAX_PORTS) && ports[i]; i++) { + for (i = 0; i < ports_c; i++) { DEBUGP("ip_nat_ftp: unregistering port %d\n", ports[i]); ip_nat_helper_unregister(&ftp[i]); }