Date: Thu, 6 Feb 2025 14:00:18 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ebfcaba16943 - main - pfctl: load os passive fingerprints when testing the ruleset Message-ID: <202502061400.516E0IRK023802@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ebfcaba16943f2d122d8aa66e50aa965a7f1b86f commit ebfcaba16943f2d122d8aa66e50aa965a7f1b86f Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2025-02-03 10:23:51 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2025-02-06 14:00:05 +0000 pfctl: load os passive fingerprints when testing the ruleset ok henning Obtained from: OpenBSD, mikeb <mikeb@openbsd.org>, 4a9baa970f Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index ec07a5da999c..11634c4d230e 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -3295,7 +3295,7 @@ main(int argc, char *argv[]) if (pfctl_get_skip_ifaces()) error = 1; - if (rulesopt != NULL && !(opts & (PF_OPT_MERGE|PF_OPT_NOACTION)) && + if (rulesopt != NULL && !(opts & PF_OPT_MERGE) && !anchorname[0] && (loadopt & PFCTL_FLAG_OPTION)) if (pfctl_file_fingerprints(dev, opts, PF_OSFP_FILE)) error = 1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502061400.516E0IRK023802>