From owner-dev-commits-src-main@freebsd.org Thu Feb 4 17:58:12 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 39B2052A41E;
Thu, 4 Feb 2021 17:58:12 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4DWmVr0w7Nz4ggP;
Thu, 4 Feb 2021 17:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 125A710330;
Thu, 4 Feb 2021 17:58:12 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 114HwC8c042229;
Thu, 4 Feb 2021 17:58:12 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114HwChc042228;
Thu, 4 Feb 2021 17:58:12 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 17:58:12 GMT
Message-Id: <202102041758.114HwChc042228@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Alex Richardson <arichardson@FreeBSD.org>
Subject: git: 58de61b9967b - main - sbin/pfctl: fix tests after recent output
changes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: arichardson
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 58de61b9967b36f5fbd34e8b51ece7b4b772f104
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 17:58:12 -0000
The branch main has been updated by arichardson:
URL: https://cgit.FreeBSD.org/src/commit/?id=58de61b9967b36f5fbd34e8b51ece7b4b772f104
commit 58de61b9967b36f5fbd34e8b51ece7b4b772f104
Author: Alex Richardson <arichardson@FreeBSD.org>
AuthorDate: 2021-02-04 17:56:26 +0000
Commit: Alex Richardson <arichardson@FreeBSD.org>
CommitDate: 2021-02-04 17:56:26 +0000
sbin/pfctl: fix tests after recent output changes
The output now contains http-alt instead of 8080 and personal-agent
instead of 5555.
This was probably caused by 228e2087a32847fa51168f3f0c58f931cb2cb0f8.
Reviewed By: kp
Differential Revision: https://reviews.freebsd.org/D28481
---
sbin/pfctl/tests/files/pf0089.ok | 2 +-
sbin/pfctl/tests/files/pf0096.ok | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sbin/pfctl/tests/files/pf0089.ok b/sbin/pfctl/tests/files/pf0089.ok
index 1f80e22b92b8..c2403e775da1 100644
--- a/sbin/pfctl/tests/files/pf0089.ok
+++ b/sbin/pfctl/tests/files/pf0089.ok
@@ -8,4 +8,4 @@ pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = ssh flags S/SA k
pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = ssh flags S/SA keep state (source-track rule, max-src-conn 10)
pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = ssh flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99)
pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = http flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5)
-pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 8080 flags S/SA synproxy state (source-track rule, max-src-conn 1000, max-src-conn-rate 1000/5, overload <bad> flush global, src.track 5)
+pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = http-alt flags S/SA synproxy state (source-track rule, max-src-conn 1000, max-src-conn-rate 1000/5, overload <bad> flush global, src.track 5)
diff --git a/sbin/pfctl/tests/files/pf0096.ok b/sbin/pfctl/tests/files/pf0096.ok
index e1d9efe31f93..df7af0a3a157 100644
--- a/sbin/pfctl/tests/files/pf0096.ok
+++ b/sbin/pfctl/tests/files/pf0096.ok
@@ -1,5 +1,5 @@
myports = "5555 6666"
moreports = "5555 6666 7777"
-pass in proto tcp from any to any port = 5555 flags S/SA keep state
+pass in proto tcp from any to any port = personal-agent flags S/SA keep state
pass in proto tcp from any to any port = 6666 flags S/SA keep state
pass in proto tcp from any to any port = 7777 flags S/SA keep state