From: Alexander Bluhm <bluhm@openbsd.org>
Subject: Re: pfctl: remove duplicated code
To: Alexandr Nedvedicky <sashan@fastmail.net>
Cc: Kristof Provost <kp@freebsd.org>, tech@openbsd.org
Date: Fri, 27 Jun 2025 12:00:44 +0200

On Fri, Jun 27, 2025 at 08:24:34AM +0200, Alexandr Nedvedicky wrote:
> Hello Kristof,,
> 
> 
> yes indeed. I'll commit your diff later today unless someone will object.

OK bluhm@

> thanks for reporting it.
> 
> regards
> sashan
> 
> On Wed, Jun 25, 2025 at 11:46:13AM +0200, Kristof Provost wrote:
> > 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;
> >