[src/netbsd-2-0]: src/dist/ipf/tools Pullup rev 1.7 (requested by christos in...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/536e11b72278
branches:  netbsd-2-0
changeset: 561280:536e11b72278
user:      jmc <jmc%NetBSD.org@localhost>
date:      Sat Jun 05 04:58:29 2004 +0000

description:
Pullup rev 1.7 (requested by christos in ticket #440)

ipfilter 4.1.1 does not behave according to rules in ipf.conf. PR#24989

diffstat:

 dist/ipf/tools/ipf_y.y |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 597d46a858d0 -r 536e11b72278 dist/ipf/tools/ipf_y.y
--- a/dist/ipf/tools/ipf_y.y    Sat Jun 05 04:57:35 2004 +0000
+++ b/dist/ipf/tools/ipf_y.y    Sat Jun 05 04:58:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipf_y.y,v 1.1.1.1.2.5 2004/05/30 11:27:18 tron Exp $   */
+/*     $NetBSD: ipf_y.y,v 1.1.1.1.2.6 2004/06/05 04:58:29 jmc Exp $    */
 
 %{
 #include "ipf.h"
@@ -1945,6 +1945,7 @@
        if (fr->fr_proto == 0 && f->fr_proto != 0)
                fr->fr_proto = f->fr_proto;
 
-       if (((fr->fr_flx & FI_TCPUDP) == 0) && ((f->fr_flx & FI_TCPUDP) != 0))
+       if ((fr->fr_mproto == 0) && ((fr->fr_flx & FI_TCPUDP) == 0) &&
+           ((f->fr_flx & FI_TCPUDP) != 0))
                fr->fr_flx |= FI_TCPUDP;
 }