From nobody Thu Feb 06 14:00:18 2025 X-Original-To: dev-commits-src-main@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 4Ypdz71NGXz5mV39; Thu, 06 Feb 2025 14:00:19 +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 4Ypdz705xnz3cqy; Thu, 06 Feb 2025 14:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738850419; 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=Ct3jCM8V4nUMJR1Fh4DDvwkRGmnxdZvTIfVgQAIQk0A=; b=bweljyBFaB2TgPpoOBqk3H/TOICmGKN5gWWewZUObkXJ0GPYoxcSR86+A8Iy5Gtt2ZMwjI 9AlzxA2VOrRPbrL9Xbff/mtrv9qcYmOtlwkwqy2Rg0prt4zNsG9kib8p88VEpX7SIJgDl3 xELGTI/z4DLBuNgiKr3o+8y/f+/bHg9R1QXof5tnSdgklZxdbXhkMwTOBL1cm8gB0oGCQ7 yluQGd3e08vxh5Fu5Ssn4J1CaM2mUEEtpNapEUCxMR6tir9Lkj5VnIhBvWym9KGaCNC60B ImRkrcPQe9K0Q05mIwaOxIaOy6kE61ikrCIgK5SV2emsj2SH2o5/NBsm9VbI8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738850419; 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=Ct3jCM8V4nUMJR1Fh4DDvwkRGmnxdZvTIfVgQAIQk0A=; b=nERP+4DcoixbwlaQEwOlL0KHz0pA7Fg5Yak/RYKgkFPXadSMYKSy0/ZAcTYSuRgmVmrNQZ IyiLNLKRSGVL2wAhS6E9VcIgt/QXTpu/n6PgAbHQ3Kylmg0jgCm4Vcghz9A+MZ2hulhVow hubNAqIh2t5pORUe6phDsljGlBp2pEvWpYG31Tuc18KqeTAQyVXvXnzpdi2qZp1S+cZL9y pJpAWg3IVP1fKirNeh4qkFdymxxALuyLiLPkVKXXKPilN0LDfO3l2thD+i/985yehX5kIU zvm4FAVRMstE/boc8NVw3CQLsj01Gf8M6hvrzitArVdBF62tZ/14CMZ/9hiXWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738850419; a=rsa-sha256; cv=none; b=dADqabMRc9gZ4P2/0Y+/Hj1SAoT6nPgwI2a4xCMX3gwNYSbJbqS7l6paYq+zlU0SXSwUWS X+jKf/Vrj6B4pDckMTUyR1sBDXNVDNfEtVrfCuDI0SxOdlEBWmuumbpbwGzKGm3NMGIHcN zmeVevLnc105CXaUZqhO4CyhyOQPhAXL2bwytN/Nqoo3b4t4D+7ITALivL8DIguIhO56/d 0E8RgerGiZBpVmU0ptlL9399ajyfDpfGfp/uDvfQc4tOOOtagfYIsI6XsOzo/ZDLyjgGv6 aIgFFyKhZTa5COC9c5KgwtTV5BYfgbm6iy8nu2oQdb6NdPRiCvHWhqtQQPirQg== 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 4Ypdz66pJWzhf4; Thu, 06 Feb 2025 14:00:18 +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 516E0Ig3023805; Thu, 6 Feb 2025 14:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516E0IRK023802; Thu, 6 Feb 2025 14:00:18 GMT (envelope-from git) Date: Thu, 6 Feb 2025 14:00:18 GMT Message-Id: <202502061400.516E0IRK023802@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: ebfcaba16943 - main - pfctl: load os passive fingerprints when testing the ruleset List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ebfcaba16943f2d122d8aa66e50aa965a7f1b86f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ebfcaba16943f2d122d8aa66e50aa965a7f1b86f commit ebfcaba16943f2d122d8aa66e50aa965a7f1b86f Author: Kristof Provost AuthorDate: 2025-02-03 10:23:51 +0000 Commit: Kristof Provost CommitDate: 2025-02-06 14:00:05 +0000 pfctl: load os passive fingerprints when testing the ruleset ok henning Obtained from: OpenBSD, mikeb , 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;