[src/netbsd-2-0]: src/dist/ipf/tools Pullup rev 1.14 (requested by grant in t...

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

details:   https://anonhg.NetBSD.org/src/rev/54159b3bbc3a
branches:  netbsd-2-0
changeset: 562760:54159b3bbc3a
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Oct 08 03:00:52 2004 +0000

description:
Pullup rev 1.14 (requested by grant in ticket #890)

The "keep options" only allow one order, not both as they should for proper
backwards compatibility. PR#27086

diffstat:

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

diffs (15 lines):

diff -r 77965d76870f -r 54159b3bbc3a dist/ipf/tools/ipf_y.y
--- a/dist/ipf/tools/ipf_y.y    Mon Oct 04 06:07:24 2004 +0000
+++ b/dist/ipf/tools/ipf_y.y    Fri Oct 08 03:00:52 2004 +0000
@@ -997,9 +997,8 @@
                                                fr->fr_age[1] = $4;) }
        ;
 
-keep:  | IPFY_KEEP keepstate
-       | IPFY_KEEP keepfrag
-       | IPFY_KEEP keepstate IPFY_KEEP keepfrag
+keep:  | IPFY_KEEP keepstate keep
+       | IPFY_KEEP keepfrag keep
        ;
 
 keepstate: