Index | Thread | Search

From:
Kristof Provost <kp@FreeBSD.org>
Subject:
pfctl: remove duplicated code
To:
tech@openbsd.org
Date:
Wed, 25 Jun 2025 11:46:13 +0200

Download raw body.

Thread
As part of the fix for anchor rules with filter opts the FOM_SETPRIO section was accidentally duplicated ([1.677](https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sbin/pfctl/parse.y?rev=1.677&content-type=text/x-cvsweb-markup)
)
Remove the redundant code.

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index cd5d3a4d029..b35ce02ca2d 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -5977,11 +5977,6 @@ filteropts_to_rule(struct pf_rule *r, struct filter_opts *opts)
                r->delay = opts->delay;
                r->rule_flag |= PFRULE_SETDELAY;
        }
-       if (opts->marker & FOM_SETPRIO) {
-               r->set_prio[0] = opts->set_prio[0];
-               r->set_prio[1] = opts->set_prio[1];
-               r->scrub_flags |= PFSTATE_SETPRIO;
-       }
        if (opts->marker & FOM_SETTOS) {
                r->scrub_flags |= PFSTATE_SETTOS;
                r->set_tos = opts->settos;