--- linux-2.4.32/net/ipv4/netfilter/ip_conntrack_oracle.c.orig	2005-11-17 15:48:02.000000000 +0100
+++ linux-2.4.32/net/ipv4/netfilter/ip_conntrack_oracle.c	2005-11-24 12:51:23.000000000 +0100
@@ -331,15 +331,14 @@
 	exp_oracle_info->len = matchlen;
 	exp_oracle_info->port = port;
 
-	exp->tuple = ((struct ip_conntrack_tuple)
-		{ { ct->tuplehash[!dir].tuple.src.ip,
-		    { 0 } },
-		  { ip,
-		    { port },
-		    IPPROTO_TCP }});
-	exp->mask = ((struct ip_conntrack_tuple)
-		{ { 0xFFFFFFFF, { 0 } },
-		  { 0xFFFFFFFF, { 0xFFFF }, 0xFFFF }});
+	exp->tuple.src.ip = ct->tuplehash[!dir].tuple.src.ip;
+	exp->tuple.dst.ip = ip;
+	exp->tuple.dst.u.tcp.port = port;
+	exp->tuple.dst.protonum = IPPROTO_TCP;
+	exp->mask.src.ip = 0xFFFFFFFF;
+	exp->mask.dst.ip = 0xFFFFFFFF;
+	exp->mask.dst.u.tcp.port = 0xFFFF;
+	exp->mask.dst.protonum = 0xFFFF;
 
 	exp->expectfn = NULL;