From nobody Wed Oct 09 00:35:39 2024 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 4XNYp32xDHz5YZt2; Wed, 09 Oct 2024 00:35:39 +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 4XNYp32DZtz4kpV; Wed, 9 Oct 2024 00:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434139; 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=HXbUR30z07vkyEHf13CNlanOrGwf9hEEAXAvj3JL+sE=; b=SOmd8dBXgm2xIB+bQrR6gaxvpy/u1jfB/OgpGKTh5/pPawx4riIYV05CGNt50JIpUDfUbf fd+5MnF7l5kdFt5W9y4BoC86fNZRWoLD4z6eNnaSzr8WhfTEWwvWwRyets3EoVNSkOiXR/ I/Re6XryoIYJ91Kxwa4oolDKxCu8ct+vH36voUJB9brHnCYTHAHsJJZHhvLiE2NMLU0Jhb Tk2ZUxi8vC4Cb7kLT5oxPHJb3+YLLRntL0xtTQVhgl1+DOu3X5MMy71X3F/oZNGPqe7vQ6 0eUvEZ4/a4K4TtjCmvv+tj7F5SPgk8kHROFzkoqaz8ciAEzSTmHe4/KXUEf5qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728434139; 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=HXbUR30z07vkyEHf13CNlanOrGwf9hEEAXAvj3JL+sE=; b=Hy2vxwASfaRplY360jc36LyxkmnLAyWhH8JSOAUWGjnURdr+0MiwMbPjVNnH0+6J8tkZnM iMsH6ke2yV6E7gS4oEtMs45ZT60AIzFO1+RFhbq7fKMfm6pD9X2xhmHiMs15+orpLfXt0+ Rg72n/X+JO4AA1m6rni83AZZQlIb0nMyFi0maMvwGg8B8/rIFbhbvEuGm6TtBGdP73D/+o Fz+4U+v7HYhlInEjPiekhEWQVen20pantYtOyxj99mUIn+EY+DMcYDtxyLU5/kjGogxw0n /hj4KmB2eDv8EB0LaXYWYAXRnSc6m4BSkWPUlWmLTN5KlIi0uo+SYYTkFk6m+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728434139; a=rsa-sha256; cv=none; b=K+Xfrhe9EX6TDdfcziFLQoFLtXbfallTCVOSWtiAFqtyHLoMcjbg3XeCyl+xqa6+DLl04B Uvn2hJqAnQDjblemU7R71EmfGOazikk4O4krP0FJ+xft+8uRBgqh2zKRI8awlLAvgBe1rl sZhtDf218xKySVKc0Lu3dpDSGWFrCUWUlkejjjgRGbHYndvqydW0UX0DeWe3540yNAcw1C TN9WKHWHKtUrmoVKGJNmuRXx/Omyu89zxpr8vug0E5tWmd98OuAUAAtiRFDKLsRrt9q7Hh dT7/GqEzvmEurI51Bo9Tbp2xpdQm3k82BkjJcyjSjQSCvlBAntZ9fxBA+Jw/hg== 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 4XNYp31rNJzsbg; Wed, 9 Oct 2024 00:35:39 +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 4990Zd90033873; Wed, 9 Oct 2024 00:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4990ZdTD033870; Wed, 9 Oct 2024 00:35:39 GMT (envelope-from git) Date: Wed, 9 Oct 2024 00:35:39 GMT Message-Id: <202410090035.4990ZdTD033870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e4550c9aa06a - main - capsicum-test: include SCTP tests 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4550c9aa06af54d066c794f1da14f7c91bb5bc0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e4550c9aa06af54d066c794f1da14f7c91bb5bc0 commit e4550c9aa06af54d066c794f1da14f7c91bb5bc0 Author: Ed Maste AuthorDate: 2024-10-07 19:18:33 +0000 Commit: Ed Maste CommitDate: 2024-10-09 00:34:50 +0000 capsicum-test: include SCTP tests HAVE_SCTP is #defined in syscalls.h, so move the #ifdef after the inclusion of the header that #defines it. Issue https://github.com/google/capsicum-test/issues/60 is open upstream in case a slightly different version is needed for Linux. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46995 --- contrib/capsicum-test/sctp.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/capsicum-test/sctp.cc b/contrib/capsicum-test/sctp.cc index 76302059fa19..c8c642454a80 100644 --- a/contrib/capsicum-test/sctp.cc +++ b/contrib/capsicum-test/sctp.cc @@ -1,6 +1,5 @@ // Tests of SCTP functionality // Requires: libsctp-dev package on Debian Linux, CONFIG_IP_SCTP in kernel config -#ifdef HAVE_SCTP #include #include #include @@ -12,6 +11,7 @@ #include "capsicum.h" #include "capsicum-test.h" +#ifdef HAVE_SCTP static cap_rights_t r_ro; static cap_rights_t r_wo; static cap_rights_t r_rw;