From nobody Tue Jan 14 10:37:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YXQZ55MY9z5kVlN; Tue, 14 Jan 2025 10:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXQZ53LPmz3By0; Tue, 14 Jan 2025 10:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736851069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0GEUCQER6kSy7HnzTp/83ZpYvemiYg38QbOvTeQYNZM=; b=vGtG3LAurLsC29o1n5YG1pLtY1XCZGks2Tbnywtm9lhNdzJXbcDEN+CwxsOTFhh1MZUe3y lUGU90bvhdoc8c9S8p1MejYvxcNiyCTC31ICS0jhKoYUatffGqHxw9IFjw9tpPj3CvQzBI qRFR932umuKGC0VfY5Fwxfa+EvrTYkGTju/i52aofHM0pnKWrDoVSJVEJOPigBJ65pkyB+ QhxJyPdVeStsNnJ12Pez7Ni6cpOCDOrYoStzuz8iZtXUUbzisbH4TwSRsHb58EM3vnZm1T JZRseowJ2DTo9Fda8oVEawisrHPcGEei9yV8//i96Qdtr4Jb4ThCkc9jF6zTCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736851069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0GEUCQER6kSy7HnzTp/83ZpYvemiYg38QbOvTeQYNZM=; b=SLAQmFyw7u+PoALgJRX9E9gVN1tRz+iAtNNRmXYCTDoSkcSVFSCfKf1+VEhz0GiGnftY46 iIk2OSOqc8rrzcyXXFbxlp4eidbGmr4KR7DP5Yro7onPnhZLvi/t0NZ0lLt2rhudGjKFjG HklkccTs9LWXvo+KL+gbMBDjGELtxE3zPN1h80K1d5IdYMPgwpKzCst1qCinoCQ0yOvckF gSkzWxZbBYfuHicjRh+zZ4kI7pkMfuqNPhax2B+w97nG36dTm+o+R6vi7UEGdcctE1gbFo OtEFOfV+qGQzLXrUXg0K1IBfIj15eEvrrpkIi37lkT13ERBMjWdcMOR7d8PmWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736851069; a=rsa-sha256; cv=none; b=Vx+pCLwqk/CPloIgxjsizVer5zllMYbdJadptAdKHFTp2AvMIYFObGpM14fEDh9tZn0SX6 3pousJ/jbdOFkqepazwRVdJFjDz8TpfUQqpIztUSZU4kBKU299bffq/zv+WDuSHcaSZ+p0 jiHwT1BxliJ66AAJcOKv+6cpIFRLCm+3BUO0isQe0zyDCeyB75jYifKQWvH7ZZY6lVQ50o Kp9Vk5oqJ3OcaUv7hTvXPRXJnoh7nRpRAUlwJxHnswMBBOmlzKbf97vD1rMv8Jim8IY0td uRlDdWtVZNcx9L2k9kG+XOVgsZPdj5lrku+VnByFYiaaMBad2rIK65b8MgAhHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YXQZ52t8Cz1CHk; Tue, 14 Jan 2025 10:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50EAbnUx047893; Tue, 14 Jan 2025 10:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50EAbnI4047890; Tue, 14 Jan 2025 10:37:49 GMT (envelope-from git) Date: Tue, 14 Jan 2025 10:37:49 GMT Message-Id: <202501141037.50EAbnI4047890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0d68985b0170 - main - pfctl: unbreak rule optimizer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d68985b0170f704ee45dfb6c209cc852870d2c2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d68985b0170f704ee45dfb6c209cc852870d2c2 commit 0d68985b0170f704ee45dfb6c209cc852870d2c2 Author: Kristof Provost AuthorDate: 2025-01-07 14:15:15 +0000 Commit: Kristof Provost CommitDate: 2025-01-14 08:54:18 +0000 pfctl: unbreak rule optimizer ok henning, looks Obtained from: OpenBSD, mikeb , 4a16887b1b Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 2 +- sbin/pfctl/pfctl_optimize.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 3c34b0237895..ff2e2d2c93b7 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -6179,7 +6179,7 @@ expand_rule(struct pfctl_rule *r, LOOP_THROUGH(struct node_uid, uid, uids, LOOP_THROUGH(struct node_gid, gid, gids, - r->naf = r->af = af; + r->af = af; if (r->rule_flag & PFRULE_AFTO) { assert(nat != NULL); diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index 9858f38b8671..a688fe484128 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -172,6 +172,7 @@ static struct pf_rule_field { PF_RULE_FIELD(dst.port_op, NOMERGE), PF_RULE_FIELD(src.neg, NOMERGE), PF_RULE_FIELD(dst.neg, NOMERGE), + PF_RULE_FIELD(af, NOMERGE), /* These fields can be merged */ PF_RULE_FIELD(src.addr, COMBINED),