From nobody Mon Jun 16 00:36:07 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 4bL9zD1QPhz5yD5s; Mon, 16 Jun 2025 00:36:08 +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 4bL9zC6M24z4Qkt; Mon, 16 Jun 2025 00:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750034167; 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=gzZCz/Glvd+MEsLN5w/XZm9Ddush4LEAa8RwTovrrY0=; b=jvxZb6M/TMTdDUzMvHbDD3CHgBt/E/WgtXW/E34ner/bA25q2o582JUlnlHN41M1BhJJyJ mH+IElS6ZKACEqLab8v7IxVHx1Hr97aR9uuTpZY9ap/1ObF4Hkc0RgkJrSbFLljlzVkdiR eRkTf/R/PoiB3AxRVIqb0xf+Q8Ex04gwl8dfDIMkFHoAjI4UEKvDsqiGACKyCaRoVQnNWT otGzphKzJv11+G7jPSx9v5hP5ioP+iPqeCeuWX6rLMVoYe6o0G4LPmGhwNjsiNWfRU4gcq /bo3VoFw59IwbM+dIqr8ikOfLuvx/XufGo0W24LKXjC1JAFfg+IoClRtVGTuww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750034167; 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=gzZCz/Glvd+MEsLN5w/XZm9Ddush4LEAa8RwTovrrY0=; b=IdePs0lvsFWKb2dqpe5Spv07tKXJSMVkxX5zHfnKi8KGz+2owBf3OIVKeGudFM8FWzk5JZ PNcwOQEzFsZWPJGfY+kjoFCoBC1RgQ0OLORRgcBYGzrJqIdEGT2Q9UnkxGAhi8MAQB/mWq qWBQCwDwPXGmLgckl8fLtdBk6ijmZNerKsqOsMUA8ERFVwgyUKphT0jCwD+cRzaL2TkvFi XWooxbHPRM54pSMJGWUndNm82vdl1aiuQJCqEOjtLzVYJUhpluijyjJ/ZeX3a59cxIxP3E 6pAZQvTghNfr9XhH0YJJUeHKFHDLXAsKRee2EZ4VB4+fZhpKEqmUH+A55fg/cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750034167; a=rsa-sha256; cv=none; b=Kfv3ah68mFoKnDCl3AIe+6Ul22WmmNzVJtg9xojI9UZMjrMBTgpouaMc5PmUDMax9pmYlP l16iVrSnIToN5Z064FTqo+NpkLmK7BqP5YiVPdidV0iIesfuuRaf9k4JB22XXt5XgXzWx/ iC72aKJ5R9DRxFQS/JUHJ+8cjV4reiXFxJopCGjzCjv9p/1mStpwOMMri84oZ1GNm7Lix7 cq2vcMQArkhuw2qyxsgz8FhUT6FfSx9rGY3EbrI83yJcGWcKkwTir3nTsFfzNhS/MAlgyD xICUatk40OWUdbapTmKW4Iv3TEn0nobPO8kaDuhGeIxZ3wnd+9NdEf6KN7uJIQ== 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 4bL9zC5xDSzcB7; Mon, 16 Jun 2025 00:36:07 +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 55G0a71X004534; Mon, 16 Jun 2025 00:36:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G0a7mC004531; Mon, 16 Jun 2025 00:36:07 GMT (envelope-from git) Date: Mon, 16 Jun 2025 00:36:07 GMT Message-Id: <202506160036.55G0a7mC004531@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: 0dc94ef142af - main - NDEX.keymaps: Fix "Mulitlingual" typo 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: 0dc94ef142af0000e89bcbb5ab8719a05cf229c0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0dc94ef142af0000e89bcbb5ab8719a05cf229c0 commit 0dc94ef142af0000e89bcbb5ab8719a05cf229c0 Author: Pau Amma AuthorDate: 2025-06-16 00:35:13 +0000 Commit: Ed Maste CommitDate: 2025-06-16 00:35:13 +0000 NDEX.keymaps: Fix "Mulitlingual" typo Reviewed by: allanjude, emaste Differential Revision: https://reviews.freebsd.org/D50647 --- share/vt/keymaps/INDEX.keymaps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/vt/keymaps/INDEX.keymaps b/share/vt/keymaps/INDEX.keymaps index b650765d68df..2b1db8528e85 100644 --- a/share/vt/keymaps/INDEX.keymaps +++ b/share/vt/keymaps/INDEX.keymaps @@ -211,7 +211,7 @@ ca-fr.kbd:fr:Français Canadien (avec accents) ca-fr.kbd:es:Francocanadiense (con acentos) ca-fr.kbd:uk:Французько-канадська (accent keys) -ca-multi.kbd:en:Canadian Mulitlingual Standard +ca-multi.kbd:en:Canadian Multilingual Standard ca-multi.kbd:fr:Canadien multilingue standard de.kbd:en:German From nobody Mon Jun 16 00:53:16 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 4bLBM05CZ2z5yDwt; Mon, 16 Jun 2025 00:53:16 +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 4bLBM04X23z3HDF; Mon, 16 Jun 2025 00:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750035196; 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=noGJwnB88yOeYxYW/IcAyfzPlFnqGtQ/QTOWxDNMEPs=; b=Ngk2DolVC0RSR3tMzOMjvyzS1BMvbJFvBvD1evNhhytpfcUsgLnds4+VRWE5b1VTq37u9G tXj3rqMAxgw8kJ3axo3mpEHtL26mfl1lTzNxEi1jlzoihW8k94k4QreTG7No9PFCAY9+Hh hNGSVGOXmmKINBQopsnxBiv93cXcqrnLcpKbl3nSDXsFY83gvSOSsW3L55mlW/NoMIssQd eB53rJpUhmxxjUgG091mggmGaL7yFatMidqU8UFZllXaSoSnzhUdlTFWOZGsRi2By0D0nI pTYHUPwhHjfPC5RHWw70gikFf7VRKGe9I0KYmrs06myeyGcg+E3imn9uk5sbFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750035196; 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=noGJwnB88yOeYxYW/IcAyfzPlFnqGtQ/QTOWxDNMEPs=; b=u6WvrBT76LSqzEZbWbksvn10G1TSeU5APn0ewm/6Bv82xUQp/pJVlz6sdeL5SWBpAOtYEE ih6I0LjFHdrXC+GH25MXVW8MaE3rwA7CtxKzipbh1mjo9VxGJJZ26t4EzLuGD2PavTVGnq l5fMAsWWLIwjgs5ByBnLFW0SRQ2EbwK0GB+fc37gSaUA0sHNgpFz+tOjJLVAieJWqGfwKV CVlFFhOrAGJzUkIvjYIgavpY7pWX+ukALiAd5ywyxsmpux3V1reeqMu9sKMrt49vfuIf4q i/KhnVL876/sZQjip0Bs+z8lj8fOjnWIvYlp7Pun4VGVEBEdX1uKHa1zoBtA0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750035196; a=rsa-sha256; cv=none; b=lwMCvq5RH4Qjtpz7DXutlxEOFePEaQUWsMy3XOgnrQhvCbsekvAd0XPpPQNG+iDWvtWnSh tHk3vHzvTTp+MlLW+09083ZkCNwwuOkJX37/DMrpVCrdbV0E3MJhFcyIqjEcqbJnau80ms EcEI1GzbG20YFEZXn2XUC5AMvvOLPGV26sXhv52OXt8NtjqreOxm5ynSgLS4tmqeC6Vp0D j6T+gDEpK8AeoWy5r3e1PmQJL7sO35d6TayLVKw8yjX5j9SmvB/WxITK1oao3/CFUdzAB+ ATnwldMQwydyRZ+HYsXAaa+m0FrYlu0+6cPpZzDuPiB4JPQbF1QN+PlbbOATBg== 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 4bLBM047VtzcMB; Mon, 16 Jun 2025 00:53:16 +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 55G0rGGg040750; Mon, 16 Jun 2025 00:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G0rG6r040747; Mon, 16 Jun 2025 00:53:16 GMT (envelope-from git) Date: Mon, 16 Jun 2025 00:53:16 GMT Message-Id: <202506160053.55G0rG6r040747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 18117f3f1269 - main - Obsoletefiles.inc: Correct paths for some man pages 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18117f3f1269c3b70c04ed741cc1ca3f3ecd8be9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=18117f3f1269c3b70c04ed741cc1ca3f3ecd8be9 commit 18117f3f1269c3b70c04ed741cc1ca3f3ecd8be9 Author: Mark Johnston AuthorDate: 2025-06-16 00:51:26 +0000 Commit: Mark Johnston CommitDate: 2025-06-16 00:52:34 +0000 Obsoletefiles.inc: Correct paths for some man pages Reported by: dougm MFC after: 1 week Fixes: 87b646630c48 ("vm_page: Consolidate page busy sleep mechanisms") --- ObsoleteFiles.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 10ce9c7661de..3dc879fe5b0b 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -4025,9 +4025,9 @@ OLD_FILES+=usr/share/man/man4/twa.4.gz OLD_FILES+=usr/share/man/man9/kernel_vmount.9.gz # 20211115: vm_page busy functions removed -OLD_FILES+=share/man/man9/vm_page_sbusy.9.gz -OLD_FILES+=share/man/man9/vm_page_xbusy.9.gz -OLD_FILES+=share/man/man9/vm_page_sleep_if_busy.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_sbusy.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_xbusy.9.gz +OLD_FILES+=usr/share/man/man9/vm_page_sleep_if_busy.9.gz # 20211113: new clang import which bumps version from 12.0.1 to 13.0.0 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/algorithm From nobody Mon Jun 16 02:31:54 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 4bLDXs6QM7z5yLbk; Mon, 16 Jun 2025 02:31:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLDXs4G5Wz3GF3; Mon, 16 Jun 2025 02:31:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id QoC9uMSa15MqyQzdcuwJ64; Mon, 16 Jun 2025 02:31:56 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id QzdautpzOWX70QzdbuvwwX; Mon, 16 Jun 2025 02:31:56 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=d71WygjE c=1 sm=1 tr=0 ts=684f821c a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=EOVmtpnw_-W6AFn27tQA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 700E6F8A; Sun, 15 Jun 2025 19:31:54 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 3D2B730C; Sun, 15 Jun 2025 19:31:54 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ronald Klop cc: Cy Schubert , dev-commits-src-main@FreeBSD.org, dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: git: b6e33f0cd536 - main - rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS In-reply-to: <240137891.21754.1749997280448@localhost> References: <240137891.21754.1749997280448@localhost> Comments: In-reply-to Ronald Klop message dated "Sun, 15 Jun 2025 16:21:20 +0200." 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=us-ascii Date: Sun, 15 Jun 2025 19:31:54 -0700 Message-Id: <20250616023154.3D2B730C@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJKEjef0td0njZq9S4Rap6bfylYZUBseueFKJfO+QuSzizOSULHR6NFKjzRwXb7lWhUJINpzqzxj60bgKWxKmW92cq5SLRPs9w9lUi9EbGVxRrAJ1eL+ qEDX4RHecUI5KMxOW0dw8yk/Kq+zbR+riGfJ5vTjlH8uJSaCIp+iSyqOd+FznOicRKyhjSN8k9uv7DElWV6+bdN01keiHopVvA2rPKiIXR1QgDRJBr9Xiqc7 Gsx5MrmQDXSEH8HVFv5duOF5ieU29SZw8xKNpOOVPGotZHQHBC91stzgfwWoTJIwE0LThv/8z3jCYeJOflcaTqsvjsP68gZqrLi6MM8tLGMm1KKpMC6y7FeD of7vnwpa X-Rspamd-Queue-Id: 4bLDXs4G5Wz3GF3 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message <240137891.21754.1749997280448@localhost>, Ronald Klop writes: > ------=_Part_21753_1823422774.1749997280446 > Content-Type: text/plain; charset=us-ascii; format=flowed > Content-Transfer-Encoding: 7bit > > Van: Cy Schubert > Datum: 15 juni 2025 07:08 > Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits > -src-main@FreeBSD.org > Onderwerp: git: b6e33f0cd536 - main - rc.d/mountcritlocal: Make sure zpools > are imported for legacy ZFS > > > > > > > The branch main has been updated by cy: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=b6e33f0cd53683e06570606d5bd88f > c04a4b76fe > > > > commit b6e33f0cd53683e06570606d5bd88fc04a4b76fe > > Author: Cy Schubert > > AuthorDate: 2025-06-14 13:16:16 +0000 > > Commit: Cy Schubert > > CommitDate: 2025-06-15 04:39:36 +0000 > > > > rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS > > > > Legacy ZFS uses fstab to mount its datasets. In an attempt to fix > > another problem 900bc0206348 broke legacy ZFS in fstab(5). This > > comit works around the problem by mountcritlocal scanning /etc/fstab > > for zfs mountpoint and if any are found invoke /etc/rc.d/zpool start. > > > > Reviewed by: imp > > Differential Revision: https://reviews.freebsd.org/D50844 > > --- > > libexec/rc/rc.d/mountcritlocal | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/libexec/rc/rc.d/mountcritlocal b/libexec/rc/rc.d/mountcritloca > l > > index f91eaf44457c..6dce672657fc 100755 > > --- a/libexec/rc/rc.d/mountcritlocal > > +++ b/libexec/rc/rc.d/mountcritlocal > > @@ -27,6 +27,15 @@ mountcritlocal_start() > > ;; > > esac > > > > + while read a b vfstype rest; do > > + if [ "$vfstype" = "zfs" -a "$a" != "#" ]; then > > + # zpool is needed for legacy ZFS > > + echo 'Importing zpools for legacy ZFS' > > + /etc/rc.d/zpool start > > + break > > + fi > > + done < /etc/fstab > > + > > # Mount everything except nfs filesystems. > > startmsg -n 'Mounting local filesystems:' > > mount_excludes='no' > > > > > > > > > > > > > Does this mean that a comment # must always be folllowed by a whitespace? Yes. It's a hack but it's the only way without grep (when /usr may not be mounted). In the very worst case rc.d/zpool will be needlessly executed. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Mon Jun 16 02:51:44 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 4bLDzh4xWbz5yMmB; Mon, 16 Jun 2025 02:51:44 +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 4bLDzh4M7Cz3RyH; Mon, 16 Jun 2025 02:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042304; 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=jfsIZT/JWtTFL/9e2BDkuUhA4yBHGBQT5O0qJsBP2xY=; b=VnLBzQMxPm4HvQSDLJxq9D6Zc4/a+lYbF8k0/+8u8OwgmogJgKXIJ+pRxUCc79wtofEVQK FdVsn0kgX2fcFUe9vgHFAKN0ayvId9UeY05N0n62RQQSBoI+LOir1V9Kn/ZN6dgk+pNQjU ia4YTdI1J8UjRIfRmwSWUfeEHeR/JIulfxi4yaHkTcXpG7z5IJWPk2N1s4SzT6PUMSeEPc c+xa5LBDCCGl5FshHfCqnrdxDuce7ALET0NbcpqNxaOsT+HCCEoIBLMaHlr+sPvBgY5E97 9uazDixoZkcfL0KX2Br9QOvvuEwCmpzxmm06zjcwPIkLNuK1u8VEOeH7WV4XRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042304; 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=jfsIZT/JWtTFL/9e2BDkuUhA4yBHGBQT5O0qJsBP2xY=; b=Qdtj4NtOZS4j3kfaXo2hks0saZKOCR+d8AeECUKWhVYe5JB7eKbEbF/ftPkSgdZ5kNfVos SdotPK9vMrSw+iqnn8YJbxQBVkmJMqNFb9Cyga3iRJcAIUKt3yuBI0ZP2UxtC8lIaG7b6z r55qHG5L2wIvse54WXJWY5iRJDHljpcbg76V6uitfcAckoNX0XEjhikPuHcIAlBEgeQxTj ftqB0oFbsbMGOdCk142hfDHhQ6aNyXh6AxECiaINvlRDNJZbZCQ5vdlm9XWU9i3GlOhivt Tp9hT1CAgiauhOT7BE62iQUzO3WNMScDVIobZbdzdQc7vio1mo3/qwkzUR91XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042304; a=rsa-sha256; cv=none; b=V8LtLQAp8jawM5KcNSiPcezfzDt9ga5R/JeGC3DygXaNY3VQSvPAsE7NmQtSrt13otk6Og YyXEPEOqUJC28hPZs28hivUgElcjQd+8ygcnVvckTctDiz6cQBNyybPaX5LD3U4JQE4CeO ob67QcYT7rdmCD/H1fu+I2TwJy5JysLqUVjJob8/UeDThDE2PN0gK93CTV2i04n754CQTe /PrrOIzM9bSfhM5ubLSO9dUsm4lkJKAjOdCGkOmT1e8OlLUI1qBzolH8+r5MUUVrDzfjt7 5DbgW8Haeypz8uSdbhjvondlT5NIQdtuMzPZk3Qx7J6tLbiidd0B0OyMjebvYA== 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 4bLDzh3rP0zgbM; Mon, 16 Jun 2025 02:51:44 +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 55G2piOH062764; Mon, 16 Jun 2025 02:51:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2piDL062761; Mon, 16 Jun 2025 02:51:44 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:44 GMT Message-Id: <202506160251.55G2piDL062761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: ee3960cba106 - main - krb5: Add build plumbing 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee3960cba1068e12fb032a68c46d74841d9edab3 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ee3960cba1068e12fb032a68c46d74841d9edab3 commit ee3960cba1068e12fb032a68c46d74841d9edab3 Author: Cy Schubert AuthorDate: 2025-06-05 04:18:38 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:35 +0000 krb5: Add build plumbing Add tne necessary Makefiles and header files to facilitate building MIT KRB5 as part of buildworld. Nothing will build until the WITH_MITKRB5/MK_MITKRB5 option has been plumbed in Makefile.inc1. Before any changes to Makefile.inc1 are made to enable MIT KRB5, additional commits to other affected software will need to be committed. krb5/Makefile was inspired by kerberos5/Makefile. The Makefiles in krb5/util and krb5/lib were inspired by those in lib/libc and in lib/ncurses. Differential revision: https://reviews.freebsd.org/D50695 Sponsored by: The FreeBSD Foundation --- krb5/Makefile | 7 + krb5/Makefile.et | 22 + krb5/Makefile.inc | 45 + krb5/README | 13 + krb5/include/Makefile | 73 ++ krb5/include/Makefile.inc | 10 + krb5/include/autoconf.h | 768 ++++++++++++++ krb5/include/gssapi/Makefile | 30 + krb5/include/gssrpc/Makefile | 33 + krb5/include/gssrpc/types.h | 130 +++ krb5/include/krb5/Makefile | 29 + krb5/include/krb5_private/Makefile | 43 + krb5/include/osconf.h | 141 +++ krb5/lib/Makefile | 14 + krb5/lib/Makefile.inc | 16 + krb5/lib/apputils/Makefile | 31 + krb5/lib/crypto/Makefile | 51 + krb5/lib/crypto/builtin/Makefile.inc | 25 + krb5/lib/crypto/builtin/aes/Makefile.inc | 14 + krb5/lib/crypto/builtin/camellia/Makefile.inc | 12 + krb5/lib/crypto/builtin/des/Makefile.inc | 22 + krb5/lib/crypto/builtin/enc_provider/Makefile.inc | 17 + krb5/lib/crypto/builtin/hash_provider/Makefile.inc | 15 + krb5/lib/crypto/builtin/md4/Makefile.inc | 12 + krb5/lib/crypto/builtin/md5/Makefile.inc | 12 + krb5/lib/crypto/builtin/sha1/Makefile.inc | 12 + krb5/lib/crypto/builtin/sha2/Makefile.inc | 13 + krb5/lib/crypto/krb/Makefile.inc | 65 ++ krb5/lib/crypto/openssl/Makefile.inc | 21 + krb5/lib/crypto/openssl/des/Makefile.inc | 12 + krb5/lib/crypto/openssl/enc_provider/Makefile.inc | 25 + krb5/lib/crypto/openssl/hash_provider/Makefile.inc | 12 + krb5/lib/gssapi/Makefile | 48 + krb5/lib/gssapi/errmap.h | 274 +++++ krb5/lib/gssapi/error_map.h | 112 ++ krb5/lib/gssapi/generic/Makefile.et | 30 + krb5/lib/gssapi/generic/Makefile.inc | 55 + krb5/lib/gssapi/krb5/Makefile.et | 30 + krb5/lib/gssapi/krb5/Makefile.inc | 72 ++ krb5/lib/gssapi/mechglue/Makefile.inc | 74 ++ krb5/lib/gssapi/spnego/Makefile.inc | 14 + krb5/lib/kadm5clnt/Makefile | 97 ++ krb5/lib/kadm5clnt/clnt/Makefile.inc | 17 + krb5/lib/kadm5srv/Makefile | 107 ++ krb5/lib/kadm5srv/srv/Makefile.inc | 25 + krb5/lib/kadmin_common/Makefile | 47 + krb5/lib/kdb/Makefile | 66 ++ krb5/lib/kprop_util/Makefile | 28 + krb5/lib/krad/Makefile | 39 + krb5/lib/krb5/Makefile | 75 ++ krb5/lib/krb5/asn.1/Makefile.inc | 14 + krb5/lib/krb5/ccache/Makefile.inc | 30 + krb5/lib/krb5/docs/Makefile.inc | 1069 ++++++++++++++++++++ krb5/lib/krb5/error_tables/Makefile.inc | 146 +++ krb5/lib/krb5/keytab/Makefile.inc | 20 + krb5/lib/krb5/krb/Makefile.inc | 123 +++ krb5/lib/krb5/os/Makefile.inc | 56 + krb5/lib/krb5/rcache/Makefile.inc | 17 + krb5/lib/krb5/unicode/Makefile.inc | 14 + krb5/lib/rpc/Makefile | 85 ++ krb5/libexec/Makefile | 16 + krb5/libexec/Makefile.inc | 12 + krb5/libexec/kadmind/Makefile | 49 + krb5/libexec/kdc/Makefile | 84 ++ krb5/libexec/kprop/Makefile | 33 + krb5/libexec/kpropd/Makefile | 33 + krb5/libexec/kproplog/Makefile | 31 + krb5/plugins/Makefile | 19 + krb5/plugins/Makefile.inc | 16 + krb5/plugins/audit/Makefile | 28 + krb5/plugins/k5tls/Makefile | 33 + krb5/plugins/kdb/Makefile | 15 + krb5/plugins/kdb/Makefile.inc | 10 + krb5/plugins/kdb/db2/Makefile | 65 ++ krb5/plugins/kdb/db2/libdb2/Makefile.inc | 15 + krb5/plugins/kdb/db2/libdb2/btree/Makefile.inc | 24 + krb5/plugins/kdb/db2/libdb2/db/Makefile.inc | 12 + krb5/plugins/kdb/db2/libdb2/hash/Makefile.inc | 19 + krb5/plugins/kdb/db2/libdb2/include/Makefile.inc | 21 + krb5/plugins/kdb/db2/libdb2/mpool/Makefile.inc | 12 + krb5/plugins/kdb/db2/libdb2/recno/Makefile.inc | 19 + krb5/plugins/preauth/Makefile | 14 + krb5/plugins/preauth/Makefile.inc | 13 + krb5/plugins/preauth/otp/Makefile | 30 + krb5/plugins/preauth/pkinit/Makefile | 38 + krb5/plugins/preauth/spake/Makefile | 42 + krb5/plugins/preauth/test/Makefile | 33 + krb5/usr.bin/Makefile | 14 + krb5/usr.bin/Makefile.inc | 12 + krb5/usr.bin/gss-client/Makefile | 30 + krb5/usr.bin/kadmin/Makefile | 43 + krb5/usr.bin/kdestroy/Makefile | 35 + krb5/usr.bin/kinit/Makefile | 37 + krb5/usr.bin/klist/Makefile | 35 + krb5/usr.bin/kpasswd/Makefile | 37 + krb5/usr.bin/ksu/Makefile | 44 + krb5/usr.bin/kswitch/Makefile | 35 + krb5/usr.bin/ktutil/Makefile | 43 + krb5/usr.bin/kvno/Makefile | 35 + krb5/usr.bin/sclient/Makefile | 35 + krb5/usr.bin/sim_client/Makefile | 25 + krb5/usr.sbin/Makefile | 16 + krb5/usr.sbin/Makefile.inc | 12 + krb5/usr.sbin/gss-server/Makefile | 30 + krb5/usr.sbin/kadmin.local/Makefile | 31 + krb5/usr.sbin/kdb5_util/Makefile | 75 ++ krb5/usr.sbin/sim_server/Makefile | 26 + krb5/usr.sbin/sserver/Makefile | 37 + krb5/util/Makefile | 17 + krb5/util/Makefile.inc | 13 + krb5/util/build-tools/Makefile | 32 + krb5/util/build-tools/krb5-config.sh | 263 +++++ krb5/util/compile_et/Makefile | 38 + krb5/util/et/Makefile | 47 + krb5/util/profile/Makefile | 78 ++ krb5/util/ss/Makefile | 89 ++ krb5/util/support/Makefile | 48 + krb5/util/verto/Makefile | 49 + share/mk/bsd.libnames.mk | 13 + share/mk/src.libnames.mk | 81 +- 120 files changed, 6717 insertions(+), 3 deletions(-) diff --git a/krb5/Makefile b/krb5/Makefile new file mode 100644 index 000000000000..c49601990c4a --- /dev/null +++ b/krb5/Makefile @@ -0,0 +1,7 @@ +SUBDIR= util .WAIT \ + include .WAIT \ + lib .WAIT\ + plugins libexec usr.bin usr.sbin +# SUBDIR_PARALLEL= + +.include diff --git a/krb5/Makefile.et b/krb5/Makefile.et new file mode 100644 index 000000000000..b89e17857675 --- /dev/null +++ b/krb5/Makefile.et @@ -0,0 +1,22 @@ +# +# SPDX-License-Idendifier: BSD-2-Clause +# +# Copyright (c) 2025 FreeBSD Foundation +# +# This sofware was developed by Cy Schubert +# under sponsorship from the FreeBSD Foundation. +# + +.et.h: + rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.c et-h-${.PREFIX}.h + cp ${.ALLSRC} et-h-${.PREFIX}.et + ${COMPILE_ET} et-h-${.PREFIX}.et + mv et-h-${.PREFIX}.h ${.PREFIX}.h + rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.h + +.et.c: + rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c et-c-${.PREFIX}.h + cp ${.ALLSRC} et-c-${.PREFIX}.et + ${COMPILE_ET} et-c-${.PREFIX}.et + mv et-c-${.PREFIX}.c ${.PREFIX}.c + rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.c diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc new file mode 100644 index 000000000000..52910c3ebe4a --- /dev/null +++ b/krb5/Makefile.inc @@ -0,0 +1,45 @@ +# +# SPDX-License-Idendifier: BSD-2-Clause +# +# Copyright (c) 2025 FreeBSD Foundation +# +# This sofware was developed by Cy Schubert +# under sponsorship from the FreeBSD Foundation. +# + +.include + +# MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. +KRB5_SRCTOP= ${SRCTOP}/krb5 +KRB5_DIR= ${SRCTOP}/crypto/krb5/src +KRB5_ETDIR?= ${DESTDIR}/usr/share/et +KRB5_SRCLIBDIR= ${KRB5_DIR}/lib + +KRB5_OBJTOP= ${OBJTOP}/krb5 +KRB5_OBJHDR= ${OBJTOP}/include +COMPILE_ET= compile_et -d ${KRB5_DIR}/util/et --textdomain mit-krb5 +MAKE_COMMANDS= ${KRB5_OBJTOP}/util/ss/mk_cmds + +# There are no WARNS levels for this. +CFLAGS+= -Wno-deprecated-non-prototype \ + -Wno-macro-redefined \ + -Wno-unused-parameter + +WARNS?= 1 + +KRB5RCTMPDIR= /var/tmp +KRB5PREFIX= /usr +KRB5_EXEC_PREFIX= /usr +KRB5_BINDIR= /usr/bin +KRB5_LIBDIR= /usr/lib +KRB5_SBINDIR= /usr/sbin +KRB5_MODULEDIR= /usr/lib/krb5/plugins +KRB5_GSSMODULEDIR= /usr/lib/gss +KRB5_LOCALEDIR= /usr/share/locale +KRB5_DOCSDIR= ${SHAREDIR}/doc/krb5 +KRB5_HTMLDOCSDIR= ${KRB5_DOCSDIR}/html +KRB5_LOCALSTATEDIR= /var +KRB5_RUNSTATEDIR= /var/run +KRB5_SYSCONFDIR= /etc +KRB5_DYNOBJEXT= .so +KRB5_SYSCONFCONF= /etc/krb5.conf diff --git a/krb5/README b/krb5/README new file mode 100644 index 000000000000..95a4beb2c98f --- /dev/null +++ b/krb5/README @@ -0,0 +1,13 @@ +This subtree is world-exportable, as it does not contain any +cryptographic code. + +At the time of writing, it did not even contain source code, only +Makefiles and headers. + +Please maintain this "exportable" status quo. + +Thanks! + +Cy Schubert +cy@freebsd.org +2023-08-09 diff --git a/krb5/include/Makefile b/krb5/include/Makefile new file mode 100644 index 000000000000..ee086e1ea07d --- /dev/null +++ b/krb5/include/Makefile @@ -0,0 +1,73 @@ +# +# SPDX-License-Idendifier: BSD-2-Clause +# +# Copyright (c) 2025 FreeBSD Foundation +# +# This sofware was developed by Cy Schubert +# under sponsorship from the FreeBSD Foundation. +# + +PACKAGE= krb5 + +.include + +.include "../Makefile.inc" + +SUBDIR= krb5_private krb5 gssrpc gssapi + +SUBDIR_PARALLEL= + +.include + +INCSGROUPS= INCS COM_ERR VERTO GSSAPI_KRB5 + +INCSDIR= ${INCLUDEDIR} + +.PATH: ${KRB5_DIR}/include + +INCS= kdb.h \ + krad.h \ + krb5.h + +GSSAPI_KRB5DIR= ${INCLUDEDIR}/gssapi_krb5/gssapi +GSSAPI_KRB5= gssapi.h + +CLEANFILES= osconf.new + +# XXX The output of this needs to be verified against the osconf.h I created +# It is only used to verify osconf.h has not changed +osconf.h: + cat ./osconf.hin | sed -e "s\"@KRB5RCTMPDIR\"${KRB5RCTMPDIR}\"" -e "s\"@PREFIX\"${KRB5PREFIX}\"" -e "s\"@EXEC_PREFIX\"${KRB5_EXEC_PREFIX}\"" -e "s\"@BINDIR\"${KRB5_BINDIR}\"" -e "s\"@LIBDIR\"${KRB5_LIBDIR}\"" -e "s\"@SBINDIR\"${KRB5_SBINDIR}\"" -e "s\"@MODULEDIR\"${KRB5_MODULEDIR}\"" -e "s\"@GSSMODULEDIR\"${KRB5_GSSMODULEDIR}\"" -e "s\"@LOCALSTATEDIR\"${KRB5_LOCALSTATEDIR}\"" -e "s\"@RUNSTATEDIR\"${KRB5_RUNSTATEDIR}\"" -e "s\"@SYSCONFDIR\"${KRB5_SYSCONFDIR}\"" -e "s\"@DYNOBJEXT\"${KRB5_DYNOBJEXT}\"" -e "s\"@SYSCONFCONF\":${KRB5_SYSCONFCONF}\"" > osconf.new + sh ${MOVEIFCHANGED} osconf.new osconf.h + +rebuild-error-tables: ${K5_ET_HEADERS} + +force: + +stage_includes: copies +installincludes: copies +SDESTDIR?= ${SYSROOT:U${DESTDIR}} + +.PHONY: force rebuild-error-tables osconf.h + +.PATH: ${KRB5_DIR}/util/et +COM_ERRDIR= ${INCLUDEDIR} +COM_ERR= com_err.h + +.PATH: ${KRB5_DIR}/util/verto +VERTODIR= ${INCLUDEDIR} +VERTO= verto-module.h \ + verto.h + +.PATH: ${KRB5_DIR}/include/krb5 + +copies: + cd ${KRB5_DIR}/include; \ + ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m444 ${INCS} ${SDESTDIR}${INCLUDEDIR} + cd ${KRB5_DIR}/util/et; \ + ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m444 ${COM_ERR} ${SDESTDIR}${INCLUDEDIR} + cd ${KRB5_DIR}/util/verto; \ + ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m444 ${VERTO} ${SDESTDIR}${INCLUDEDIR} + + +.include diff --git a/krb5/include/Makefile.inc b/krb5/include/Makefile.inc new file mode 100644 index 000000000000..56c36b7539f7 --- /dev/null +++ b/krb5/include/Makefile.inc @@ -0,0 +1,10 @@ +# +# SPDX-License-Idendifier: BSD-2-Clause +# +# Copyright (c) 2025 FreeBSD Foundation +# +# This sofware was developed by Cy Schubert +# under sponsorship from the FreeBSD Foundation. +# + +.include "../Makefile.inc" diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h new file mode 100644 index 000000000000..24039611c7e7 --- /dev/null +++ b/krb5/include/autoconf.h @@ -0,0 +1,768 @@ +/* include/autoconf.h. Generated from autoconf.h.in by configure. */ +/* include/autoconf.h.in. Generated from configure.ac by autoheader. */ + + +#ifndef KRB5_AUTOCONF_H +#define KRB5_AUTOCONF_H + +#include +#include + + +/* Define if AES-NI support is enabled */ +/* #undef AESNI */ + +/* Define if socket can't be bound to 0.0.0.0 */ +/* #undef BROKEN_STREAMS_SOCKETS */ + +/* Define if va_list objects can be simply copied by assignment. */ +/* #undef CAN_COPY_VA_LIST */ + +/* Define to reduce code size even if it means more cpu usage */ +/* #undef CONFIG_SMALL */ + +/* Define if __attribute__((constructor)) works */ +#define CONSTRUCTOR_ATTR_WORKS 1 + +/* Define to use OpenSSL crypto library */ +#define CRYPTO_OPENSSL 1 + +/* Define to default ccache name */ +#define DEFCCNAME "FILE:/tmp/krb5cc_%{uid}" + +/* Define to default client keytab name */ +#define DEFCKTNAME "FILE:/var/krb5/user/%{euid}/client.keytab" + +/* Define to default keytab name */ +#define DEFKTNAME "FILE:/etc/krb5.keytab" + +/* Define if library initialization should be delayed until first use */ +#define DELAY_INITIALIZER 1 + +/* Define if __attribute__((destructor)) works */ +#define DESTRUCTOR_ATTR_WORKS 1 + +/* Define to disable PKINIT plugin support */ +/* #undef DISABLE_PKINIT */ + +/* Define if LDAP KDB support within the Kerberos library (mainly ASN.1 code) + should be enabled. */ +/* #undef ENABLE_LDAP */ + +/* Define if translation functions should be used. */ +/* #undef ENABLE_NLS */ + +/* Define if thread support enabled */ +#define ENABLE_THREADS 1 + +/* Define as return type of endrpcent */ +#define ENDRPCENT_TYPE void + +/* Define to the type of elements in the array set by `getgroups'. Usually + this is either `int' or `gid_t'. */ +#define GETGROUPS_T gid_t + +/* Define if gethostbyname_r returns int rather than struct hostent * */ +#define GETHOSTBYNAME_R_RETURNS_INT 1 + +/* Type of getpeername second argument. */ +#define GETPEERNAME_ARG3_TYPE GETSOCKNAME_ARG3_TYPE + +/* Define if getpwnam_r exists but takes only 4 arguments (e.g., POSIX draft 6 + implementations like some Solaris releases). */ +/* #undef GETPWNAM_R_4_ARGS */ + +/* Define if getpwnam_r returns an int */ +#define GETPWNAM_R_RETURNS_INT 1 + +/* Define if getpwuid_r exists but takes only 4 arguments (e.g., POSIX draft 6 + implementations like some Solaris releases). */ +/* #undef GETPWUID_R_4_ARGS */ + +/* Define if getservbyname_r returns int rather than struct servent * */ +#define GETSERVBYNAME_R_RETURNS_INT 1 + +/* Type of pointer target for argument 3 to getsockname */ +#define GETSOCKNAME_ARG3_TYPE socklen_t + +/* Define if gmtime_r returns int instead of struct tm pointer, as on old + HP-UX systems. */ +/* #undef GMTIME_R_RETURNS_INT */ + +/* Define if va_copy macro or function is available. */ +#define HAS_VA_COPY 1 + +/* Define to 1 if you have the `access' function. */ +#define HAVE_ACCESS 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the `bswap16' function. */ +/* #undef HAVE_BSWAP16 */ + +/* Define to 1 if you have the `bswap64' function. */ +/* #undef HAVE_BSWAP64 */ + +/* Define to 1 if bswap_16 is available via byteswap.h */ +/* #undef HAVE_BSWAP_16 */ + +/* Define to 1 if bswap_64 is available via byteswap.h */ +/* #undef HAVE_BSWAP_64 */ + +/* Define if bt_rseq is available, for recursive btree traversal. */ +#define HAVE_BT_RSEQ 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +/* Define to 1 if you have the `chmod' function. */ +#define HAVE_CHMOD 1 + +/* Define if cmocka library is available. */ +/* #undef HAVE_CMOCKA */ + +/* Define to 1 if you have the `compile' function. */ +/* #undef HAVE_COMPILE */ + +/* Define if com_err has compatible gettext support */ +#define HAVE_COM_ERR_INTL 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CPUID_H */ + +/* Define to 1 if you have the `daemon' function. */ +#define HAVE_DAEMON 1 + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_R 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `dn_skipname' function. */ +#define HAVE_DN_SKIPNAME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ENDIAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the `EVP_PKEY_get_bn_param' function. */ +#define HAVE_EVP_PKEY_GET_BN_PARAM 1 + +/* Define to 1 if you have the `explicit_bzero' function. */ +#define HAVE_EXPLICIT_BZERO 1 + +/* Define to 1 if you have the `explicit_memset' function. */ +/* #undef HAVE_EXPLICIT_MEMSET */ + +/* Define to 1 if you have the `fchmod' function. */ +#define HAVE_FCHMOD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `flock' function. */ +#define HAVE_FLOCK 1 + +/* Define to 1 if you have the `fnmatch' function. */ +#define HAVE_FNMATCH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FNMATCH_H 1 + +/* Define if you have the getaddrinfo function */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getenv' function. */ +#define HAVE_GETENV 1 + +/* Define to 1 if you have the `geteuid' function. */ +#define HAVE_GETEUID 1 + +/* Define if gethostbyname_r exists and its return type is known */ +#define HAVE_GETHOSTBYNAME_R 1 + +/* Define to 1 if you have the `getnameinfo' function. */ +#define HAVE_GETNAMEINFO 1 + +/* Define if system getopt should be used. */ +#define HAVE_GETOPT 1 + +/* Define if system getopt_long should be used. */ +#define HAVE_GETOPT_LONG 1 + +/* Define if getpwnam_r is available and useful. */ +#define HAVE_GETPWNAM_R 1 + +/* Define if getpwuid_r is available and useful. */ +#define HAVE_GETPWUID_R 1 + +/* Define to 1 if you have the `getresgid' function. */ +#define HAVE_GETRESGID 1 + +/* Define to 1 if you have the `getresuid' function. */ +#define HAVE_GETRESUID 1 + +/* Define if getservbyname_r exists and its return type is known */ +#define HAVE_GETSERVBYNAME_R 1 + +/* Have the gettimeofday function */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `getusershell' function. */ +#define HAVE_GETUSERSHELL 1 + +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_IFADDRS_H 1 + +/* Define to 1 if you have the `inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the `inet_pton' function. */ +#define HAVE_INET_PTON 1 + +/* Define to 1 if the system has the type `int16_t'. */ +#define HAVE_INT16_T 1 + +/* Define to 1 if the system has the type `int32_t'. */ +#define HAVE_INT32_T 1 + +/* Define to 1 if the system has the type `int8_t'. */ +#define HAVE_INT8_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_KEYUTILS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LBER_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LDAP_H */ + +/* Define to 1 if you have the `crypto' library (-lcrypto). */ +#define HAVE_LIBCRYPTO 1 + +/* Define if building with libedit. */ +#define HAVE_LIBEDIT 1 + +/* Define to 1 if you have the `nsl' library (-lnsl). */ +/* #undef HAVE_LIBNSL */ + +/* Define to 1 if you have the `resolv' library (-lresolv). */ +/* #undef HAVE_LIBRESOLV */ + +/* Define to 1 if you have the `socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define if the util library is available */ +#define HAVE_LIBUTIL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MACHINE_BYTE_ORDER_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MACHINE_ENDIAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define if netdb.h declares h_errno */ +#define HAVE_NETDB_H_H_ERRNO 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the `ns_initparse' function. */ +#define HAVE_NS_INITPARSE 1 + +/* Define to 1 if you have the `ns_name_uncompress' function. */ +#define HAVE_NS_NAME_UNCOMPRESS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define if persistent keyrings are supported */ +/* #undef HAVE_PERSISTENT_KEYRING */ + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define if #pragma weak references work */ +#define HAVE_PRAGMA_WEAK_REF 1 + +/* Define if you have POSIX threads libraries and header files. */ +#define HAVE_PTHREAD 1 + +/* Define to 1 if you have the `pthread_once' function. */ +#define HAVE_PTHREAD_ONCE 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if you have the `pthread_rwlock_init' function. */ +#define HAVE_PTHREAD_RWLOCK_INIT 1 + +/* Define if pthread_rwlock_init is provided in the thread library. */ +#define HAVE_PTHREAD_RWLOCK_INIT_IN_THREAD_LIB 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define if building with GNU Readline. */ +/* #undef HAVE_READLINE */ + +/* Define if regcomp exists and functions */ +#define HAVE_REGCOMP 1 + +/* Define to 1 if you have the `regexec' function. */ +#define HAVE_REGEXEC 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_REGEXPR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_REGEX_H 1 + +/* Define to 1 if you have the `res_nclose' function. */ +#define HAVE_RES_NCLOSE 1 + +/* Define to 1 if you have the `res_ndestroy' function. */ +#define HAVE_RES_NDESTROY 1 + +/* Define to 1 if you have the `res_ninit' function. */ +#define HAVE_RES_NINIT 1 + +/* Define to 1 if you have the `res_nsearch' function. */ +#define HAVE_RES_NSEARCH 1 + +/* Define to 1 if you have the `res_search' function */ +#define HAVE_RES_SEARCH 1 + +/* Define to 1 if you have the `re_comp' function. */ +/* #undef HAVE_RE_COMP */ + +/* Define to 1 if you have the `re_exec' function. */ +/* #undef HAVE_RE_EXEC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SASL_SASL_H */ + +/* Define if struct sockaddr contains sa_len */ +#define HAVE_SA_LEN 1 + +/* Define to 1 if you have the `secure_getenv' function. */ +#define HAVE_SECURE_GETENV 1 + +/* Define to 1 if you have the `setegid' function. */ +#define HAVE_SETEGID 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `seteuid' function. */ +#define HAVE_SETEUID 1 + +/* Define if setluid provided in OSF/1 security library */ +/* #undef HAVE_SETLUID */ + +/* Define to 1 if you have the `setregid' function. */ +#define HAVE_SETREGID 1 + +/* Define to 1 if you have the `setresgid' function. */ +#define HAVE_SETRESGID 1 + +/* Define to 1 if you have the `setresuid' function. */ +#define HAVE_SETRESUID 1 + +/* Define to 1 if you have the `setreuid' function. */ +#define HAVE_SETREUID 1 + +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the `setvbuf' function. */ +#define HAVE_SETVBUF 1 + +/* Define if there is a socklen_t type. If not, probably use size_t */ +#define HAVE_SOCKLEN_T 1 + +/* Define to 1 if you have the `srand' function. */ +#define HAVE_SRAND 1 + +/* Define to 1 if you have the `srand48' function. */ +#define HAVE_SRAND48 1 + +/* Define to 1 if you have the `srandom' function. */ +#define HAVE_SRANDOM 1 + +/* Define to 1 if the system has the type `ssize_t'. */ +#define HAVE_SSIZE_T 1 + +/* Define to 1 if you have the `stat' function. */ +#define HAVE_STAT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `step' function. */ +/* #undef HAVE_STEP */ + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strptime' function. */ +#define HAVE_STRPTIME 1 + +/* Define to 1 if the system has the type `struct cmsghdr'. */ +#define HAVE_STRUCT_CMSGHDR 1 + +/* Define if there is a struct if_laddrconf. */ +/* #undef HAVE_STRUCT_IF_LADDRCONF */ + +/* Define to 1 if the system has the type `struct in6_pktinfo'. */ +#define HAVE_STRUCT_IN6_PKTINFO 1 + +/* Define to 1 if the system has the type `struct in_pktinfo'. */ +/* #undef HAVE_STRUCT_IN_PKTINFO */ + +/* Define if there is a struct lifconf. */ +/* #undef HAVE_STRUCT_LIFCONF */ + +/* Define to 1 if the system has the type `struct rt_msghdr'. */ +#define HAVE_STRUCT_RT_MSGHDR 1 + +/* Define to 1 if the system has the type `struct sockaddr_storage'. */ +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 + +/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1 + +/* Define to 1 if `st_mtimespec.tv_nsec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 + +/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BSWAP_H */ + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define if sys_errlist in libc */ +#define HAVE_SYS_ERRLIST 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FILIO_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the `timegm' function. */ +#define HAVE_TIMEGM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `unsetenv' function. */ +#define HAVE_UNSETENV 1 + +/* Define to 1 if the system has the type `u_char'. */ +#define HAVE_U_CHAR 1 + +/* Define to 1 if the system has the type `u_int'. */ +#define HAVE_U_INT 1 + +/* Define to 1 if the system has the type `u_int16_t'. */ +#define HAVE_U_INT16_T 1 + +/* Define to 1 if the system has the type `u_int32_t'. */ +#define HAVE_U_INT32_T 1 + +/* Define to 1 if the system has the type `u_int8_t'. */ +#define HAVE_U_INT8_T 1 + +/* Define to 1 if the system has the type `u_long'. */ +#define HAVE_U_LONG 1 + +/* Define to 1 if you have the `vasprintf' function. */ +#define HAVE_VASPRINTF 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `vsprintf' function. */ +#define HAVE_VSPRINTF 1 + +/* Define to 1 if the system has the type `__int128_t'. */ +#define HAVE___INT128_T 1 + +/* Define to 1 if the system has the type `__uint128_t'. */ +#define HAVE___UINT128_T 1 + +/* Define if errno.h declares perror */ +/* #undef HDR_HAS_PERROR */ + +/* May need to be defined to enable IPv6 support, for example on IRIX */ +/* #undef INET6 */ + +/* Define if MIT Project Athena default configuration should be used */ +/* #undef KRB5_ATHENA_COMPAT */ + +/* Define for DNS support of locating realms and KDCs */ +#define KRB5_DNS_LOOKUP 1 + +/* Define to enable DNS lookups of Kerberos realm names */ +/* #undef KRB5_DNS_LOOKUP_REALM */ + +/* Define if the KDC should return only vague error codes to clients */ +/* #undef KRBCONF_VAGUE_ERRORS */ + +/* define if the system header files are missing prototype for daemon() */ +#define NEED_DAEMON_PROTO 1 + +/* Define if in6addr_any is not defined in libc */ +/* #undef NEED_INSIXADDR_ANY */ + +/* define if the system header files are missing prototype for + ss_execute_command() */ +/* #undef NEED_SS_EXECUTE_COMMAND_PROTO */ + +/* define if the system header files are missing prototype for strptime() */ +/* #undef NEED_STRPTIME_PROTO */ + +/* define if the system header files are missing prototype for swab() */ +/* #undef NEED_SWAB_PROTO */ + *** 6711 LINES SKIPPED *** From nobody Mon Jun 16 02:51:46 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 4bLDzl0KK3z5yN4N; Mon, 16 Jun 2025 02:51:47 +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 4bLDzk5Trkz3S6T; Mon, 16 Jun 2025 02:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042306; 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=rjuEVaAL8H3VEW/6swmw1QDjMD5/D5WYivCDu3iYtzg=; b=c/wZsGBSbiZ0RwH+dEpK2oIDyIr+w86qn9AmNpVsWYOlomRV4sTfCHqgF89LLTLzkZ4RtQ 10Rk+Q+knpOg/7qwGMVq3OM5I73scjEw+H8vy2b53tl60r/e8xVQKQJ2aNrabJDCMLmIB2 JGhCk9JfdK+GDm+BR7R3rSR+YLmpXBDS378kgcmB50OP3WWfz2ahFTI2q36ZioM1YvRKZs Q0iHlu4JECQJH5iTiy3Za2apdn0+mvTBDZxJzvErejUJODN2spNtqxXNjZUCWAlUV8bNH5 VAd6VABfidk9YPQ0Ge+GcL6a6t+NogtyU40HPMaeVjzYdtK5LSkRMDxVt6flYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042306; 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=rjuEVaAL8H3VEW/6swmw1QDjMD5/D5WYivCDu3iYtzg=; b=TDCTY6HelOIRJWrfvptr8aSFNyyT+kt0vltzHhuJncRqVg4K5/JOW5X/88LauuDKjRSbBy TxhQvJKrzJEA9Ubu1CuS2tj40RUJt1il6aN3B5j5GiPhtUJU51sSzxv6oKdl4VlA7ba7ef 1mqEYoBAjYckVRfra9UQ1Be8edkAooasOpYO/u8RR71UIdAL7d8NiI0JzQFedZLcxCibI4 2VrOBWrpNBYHvO0XWBfOocJ2ttd6Wn0Zq8/XqpXXW6/3csvIrUaEqX1rv5qgy1lwdOilaU 1z1FEcms2cgBwKILZjY5so2rLmhl4/myxlGFjtIIUCkpUbAF3W1cIbiZxps92w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042306; a=rsa-sha256; cv=none; b=qVfkk9FtvcV9Kx+k/SY0omxI0EmN7FkFTybXnegiOQ2e6YHYiw1CfPRw/SqzlnIAiRNr36 aEXfGnFL5sIL+h4We+GMVSCaOF4fZ7cgbr+c5CfLWnqo8w+KWIn1bFyJkxVBwxvucdoz/W WmRYSlwriE/7EXuF98gMZAL+rVjvGoLO8f7dlxYsesdau3F2vdyXdOJ50mwiwZ1PSLDDsh uL8D+RIMeSZHlZ6pBwM34SgreDc+mEjADqnYcchqWA261dFSbSxOCIVFcPYXK9588qxYQh NAN/2260zbp3E55NZGnXTAIiPea2Sv+8HaTzQVFyPdGbvv71Uc9mupLGZmnEFQ== 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 4bLDzk4xMMzggQ; Mon, 16 Jun 2025 02:51:46 +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 55G2pkI4062838; Mon, 16 Jun 2025 02:51:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pkNx062835; Mon, 16 Jun 2025 02:51:46 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:46 GMT Message-Id: <202506160251.55G2pkNx062835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 3d79be24cf16 - main - pam_krb5: Stitch pam-krb5 plumbing into libpam 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d79be24cf1684be80b929523f844932dfcdfef8 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3d79be24cf1684be80b929523f844932dfcdfef8 commit 3d79be24cf1684be80b929523f844932dfcdfef8 Author: Cy Schubert AuthorDate: 2025-06-05 05:07:53 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:35 +0000 pam_krb5: Stitch pam-krb5 plumbing into libpam The eyeire.org pam-krb5 supports MIT KRB5 and Heimdal. FreeBSD will use it to implement pam_krb5 for MIT KRB5. The existing libpam pam_krb5 only supports Heimdal and therefore cannot be used with the MIT KRB5 import. Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50696 --- lib/libpam/modules/pam_krb5/Makefile | 52 +++++ lib/libpam/modules/pam_krb5/config.h | 412 +++++++++++++++++++++++++++++++++ lib/libpam/modules/pam_krb5/pam_krb5.c | 4 + 3 files changed, 468 insertions(+) diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index 1c2831facd50..ddd5c17ad259 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -23,6 +23,56 @@ # SUCH DAMAGE. # +.include + +.if ${MK_MITKRB5} != "no" +SRCDIR= ${SRCTOP}/contrib/pam-krb5 +.PATH: ${SRCDIR}/module \ + ${SRCDIR}/portable \ + ${SRCDIR}/pam-util \ + ${SRCDIR} + +PACKAGE= krb5 +LIB= pam_krb5 +LIBADD= com_err krb5 + +SRCS= account.c \ + alt-auth.c \ + args.c \ + auth.c \ + cache.c \ + context.c \ + dummy.c \ + fast.c \ + krb5-extra.c \ + logging.c \ + pam-util_options.c \ + module_options.c \ + pam_syslog.c \ + pam_vsyslog.c \ + password.c \ + prompting.c \ + public.c \ + setcred.c \ + support.c \ + vector.c + +CFLAGS= -I${SRCDIR} \ + -I${.CURDIR} \ + -fno-strict-aliasing \ + -Wno-error=incompatible-pointer-types-discards-qualifiers \ + -DHAVE_CONFIG_H + +WARNS?= 3 + +CLEANFILES= pam-util_options.c module_options.c + +pam-util_options.c: .PHONY + cp ${SRCDIR}/pam-util/options.c pam-util_options.c + +module_options.c: .PHONY + cp ${SRCDIR}/module/options.c module_options.c +.else PACKAGE= kerberos LIB= pam_krb5 @@ -35,4 +85,6 @@ WARNS?= 3 LIBADD+= krb5 +.endif + .include diff --git a/lib/libpam/modules/pam_krb5/config.h b/lib/libpam/modules/pam_krb5/config.h new file mode 100644 index 000000000000..75695eef66a1 --- /dev/null +++ b/lib/libpam/modules/pam_krb5/config.h @@ -0,0 +1,412 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the `asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* Define to 1 if you have the declaration of `krb5_kt_free_entry', and to 0 + if you don't. */ +#define HAVE_DECL_KRB5_KT_FREE_ENTRY 1 + +/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you + don't. */ +#define HAVE_DECL_REALLOCARRAY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ET_COM_ERR_H */ + +/* Define to 1 if you have the `explicit_bzero' function. */ +#define HAVE_EXPLICIT_BZERO 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_HX509_ERR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IBM_SVC_KRB5_SVC_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_K5PROFILE_H */ + +/* Define to enable kadmin client features. */ +#define HAVE_KADM5CLNT 1 + +/* Define to 1 if you have the `kadm5_init_krb5_context' function. */ +#define HAVE_KADM5_INIT_KRB5_CONTEXT 1 + +/* Define to 1 if you have the `kadm5_init_with_skey_ctx' function. */ +/* #undef HAVE_KADM5_INIT_WITH_SKEY_CTX */ + +/* Define to 1 if you have the header file. */ +#define HAVE_KADM5_KADM5_ERR_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_KERBEROSV5_COM_ERR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_KERBEROSV5_KRB5_H */ + +/* Define to enable Kerberos features. */ +#define HAVE_KRB5 1 + +/* Define to 1 if you have the `krb5_appdefault_string' function. */ +#define HAVE_KRB5_APPDEFAULT_STRING 1 + +/* Define to 1 if you have the `krb5_cc_get_full_name' function. */ +#define HAVE_KRB5_CC_GET_FULL_NAME 1 + +/* Define to 1 if you have the `krb5_data_free' function. */ +/* #undef HAVE_KRB5_DATA_FREE */ + +/* Define to 1 if you have the `krb5_free_default_realm' function. */ +#define HAVE_KRB5_FREE_DEFAULT_REALM 1 + +/* Define to 1 if you have the `krb5_free_error_message' function. */ +#define HAVE_KRB5_FREE_ERROR_MESSAGE 1 + +/* Define to 1 if you have the `krb5_free_string' function. */ +#define HAVE_KRB5_FREE_STRING 1 + +/* Define to 1 if you have the `krb5_get_error_message' function. */ +#define HAVE_KRB5_GET_ERROR_MESSAGE 1 + +/* Define to 1 if you have the `krb5_get_error_string' function. */ +/* #undef HAVE_KRB5_GET_ERROR_STRING */ + +/* Define to 1 if you have the `krb5_get_err_txt' function. */ +/* #undef HAVE_KRB5_GET_ERR_TXT */ + +/* Define to 1 if you have the `krb5_get_init_creds_opt_alloc' function. */ +#define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1 + +/* Define to 1 if you have the `krb5_get_init_creds_opt_free' function. */ +#define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1 + +/* Define if krb5_get_init_creds_opt_free takes two arguments. */ +#define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE_2_ARGS 1 + +/* Define to 1 if you have the `krb5_get_init_creds_opt_set_anonymous' + function. */ +#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ANONYMOUS 1 + +/* Define to 1 if you have the + `krb5_get_init_creds_opt_set_change_password_prompt' function. */ +#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_CHANGE_PASSWORD_PROMPT 1 + +/* Define to 1 if you have the `krb5_get_init_creds_opt_set_default_flags' + function. */ +/* #undef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_DEFAULT_FLAGS */ + +/* Define to 1 if you have the `krb5_get_init_creds_opt_set_fast_ccache_name' + function. */ +#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_FAST_CCACHE_NAME 1 + +/* Define to 1 if you have the `krb5_get_init_creds_opt_set_out_ccache' + function. */ +#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_OUT_CCACHE 1 + +/* Define to 1 if you have the `krb5_get_init_creds_opt_set_pa' function. */ +#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PA 1 + +/* Define to 1 if you have the `krb5_get_init_creds_opt_set_pkinit' function. + */ +/* #undef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PKINIT */ + +/* Define if krb5_get_init_creds_opt_set_pkinit takes 9 arguments. */ +/* #undef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PKINIT_9_ARGS */ + +/* Define to 1 if you have the `krb5_get_profile' function. */ +/* #undef HAVE_KRB5_GET_PROFILE */ + +/* Define to 1 if you have the `krb5_get_prompt_types' function. */ +#define HAVE_KRB5_GET_PROMPT_TYPES 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_KRB5_H 1 + +/* Define if your Kerberos implementation is Heimdal. */ +/* #undef HAVE_KRB5_HEIMDAL */ + +/* Define to 1 if you have the `krb5_init_secure_context' function. */ +#define HAVE_KRB5_INIT_SECURE_CONTEXT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_KRB5_KRB5_H 1 + +/* Define if your Kerberos implementation is MIT. */ +#define HAVE_KRB5_MIT 1 + +/* Define to 1 if you have the `krb5_principal_get_realm' function. */ +/* #undef HAVE_KRB5_PRINCIPAL_GET_REALM */ + +/* Define to 1 if you have the `krb5_principal_set_comp_string' function. */ +/* #undef HAVE_KRB5_PRINCIPAL_SET_COMP_STRING */ + +/* Define to 1 if the system has the type `krb5_realm'. */ +/* #undef HAVE_KRB5_REALM */ + +/* Define to 1 if you have the `krb5_set_password' function. */ +#define HAVE_KRB5_SET_PASSWORD 1 + +/* Define to 1 if you have the `krb5_set_trace_filename' function. */ +#define HAVE_KRB5_SET_TRACE_FILENAME 1 + +/* Define to 1 if you have the `krb5_svc_get_msg' function. */ +/* #undef HAVE_KRB5_SVC_GET_MSG */ + +/* Define to 1 if you have the `krb5_verify_init_creds_opt_init' function. */ +#define HAVE_KRB5_VERIFY_INIT_CREDS_OPT_INIT 1 + +/* Define to 1 if you have the `krb5_xfree' function. */ +/* #undef HAVE_KRB5_XFREE */ + +/* Define to 1 if the system has the type `long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +/* Define to 1 if you have the `pam_getenv' function. */ +#define HAVE_PAM_GETENV 1 + +/* Define to 1 if you have the `pam_getenvlist' function. */ +#define HAVE_PAM_GETENVLIST 1 + +/* Define to 1 if you have the `pam_modutil_getpwnam' function. */ +/* #undef HAVE_PAM_MODUTIL_GETPWNAM */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PAM_PAM_APPL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PAM_PAM_EXT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PAM_PAM_MODUTIL_H */ + +/* Define to 1 if you have the `pam_syslog' function. */ +/* #undef HAVE_PAM_SYSLOG */ + +/* Define to 1 if you have the `pam_vsyslog' function. */ +/* #undef HAVE_PAM_VSYSLOG */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PROFILE_H */ + +/* Define to 1 if you have the `reallocarray' function. */ +#define HAVE_REALLOCARRAY 1 + +/* Define to 1 if you have the `regcomp' function. */ +#define HAVE_REGCOMP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_APPL_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SECURITY_PAM_EXT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SECURITY_PAM_MODUTIL_H */ + +/* Define to 1 if the system has the type `ssize_t'. */ +#define HAVE_SSIZE_T 1 + +/* Define to 1 if stdbool.h conforms to C99. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strndup' function. */ +#define HAVE_STRNDUP 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BITTYPES_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if the system has the type `unsigned long long int'. */ +#define HAVE_UNSIGNED_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if the system has the type `_Bool'. */ +#define HAVE__BOOL 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* The name of the PAM module, used by the pam_vsyslog replacement. */ +#define MODULE_NAME "pam_krb5" + +/* Name of package */ +#define PACKAGE "pam-krb5" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "eagle@eyrie.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "pam-krb5" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "pam-krb5 4.11" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "pam-krb5" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "4.11" + +/* Define to const if PAM uses const in pam_get_item, empty otherwise. */ +#define PAM_CONST const + +/* Define to const if PAM uses const in pam_strerror, empty otherwise. */ +#define PAM_STRERROR_CONST const + +/* Define to the full path to openssl for some tests. */ +#define PATH_OPENSSL "/usr/bin/openssl" + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 8 + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Version number of package */ +#define VERSION "4.11" + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 5f448165b20a..e13c1b794d5b 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -60,6 +60,10 @@ #include #include +#ifdef MK_MITKRB5 +/* For MIT KRB5 only. */ +#include +#endif #define PAM_SM_AUTH #define PAM_SM_ACCOUNT From nobody Mon Jun 16 02:51:47 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 4bLDzm0W2mz5yMsT; Mon, 16 Jun 2025 02:51:48 +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 4bLDzl6J00z3S3y; Mon, 16 Jun 2025 02:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042307; 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=rze+hu7CNiidrRC6hlfOqnEkGFKblIAMqHpgu6hzgpU=; b=VAWneh1FQK9fhZdIaPla4uiTfQx/oah30dPPiXVoWkbDnQDRdiEcBdiwSoaCoFUTFQujmx o9rov8Xp1pNeoLfzxzCqPYlzyvnHXdR2jL9dT17OKSZUpqn2QF3fRzjKarStflc5KUFU8k qC8jHtv9ZV4g0Ratnbg/q4gc3WqsZfp8NX3wrQze/rp5DfWbYRAiy9Ua+A99hsQS5Eg+P8 amFAlUcl16TjnVUqg4au13KYhmvWN1budW/I/YdOj0pRzuU3ZY/dUtbpBS+pn/B0gyjeHj a1Ouq3U6+StXiprQ5Zjn20KUPrXkIcN/JSNX+saYQ1w5mG9QCe9NKRYDSuwFGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042307; 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=rze+hu7CNiidrRC6hlfOqnEkGFKblIAMqHpgu6hzgpU=; b=E5fx7xRZpsrsXMgnpl2oNiHU9hdya+7TdRJv+kZwlyQ+1+HM/lyCT6vy62T4c5SjROMtEE L0ZPp2EAZu6HktXoV/JW3HJmv+Hr4fsfTTttC4jfJ/+wCmaZzhgT3r0lPPYwiwAOmZP/e6 Z40OaEu42FyuSyxT8bBeN0tOqbFtD+cPAzS9LHUjQLhipNuNibUvV5ZG7056t5JYuE0TEz 15iaYGi5IVf7d2zm33CRg1j+spegAWJ4YQ0pXRpQAoO4G6lSFbvDDhx6QxlTAuRAqLSoBn hipsixAnrxROKNqotVRoetH6ZdM0d9GmV8s0ZbCf6Z5OGkbd7/xAKBHUK4UssA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042307; a=rsa-sha256; cv=none; b=V4bjHm2+h0GNKPlpIUFBp+L5Rfhy2nAKwoelDZIibNK4M/88G1eepIdNUTL/hyef+VlEwm gZKec3v6j190b2SIlbmV6k8KwmVSXSyRP4vPxiCSzrgVEdSnvwVZnYhj+fKNaBjiR/Uw01 N4Q8d0IeKVdkjR59kdck7FPqr8SKPJTiyl9WT508miKO+IwdMUuEF9MVOzcRy2XZgSDLAA 2VzqJvtVR21hzl/0CZfa3BsAmTmdcXSOPKZoMmUYChZJwEiNNdmh9vX6KHMOgaJ/FfgJVm XtZd23xX4vuhADJRgm9Y+pAkxO+DedPvShWv5y2U0hAoa06sPGY2lTKi3+1DHA== 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 4bLDzl5tfqzggd; Mon, 16 Jun 2025 02:51:47 +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 55G2plRW062871; Mon, 16 Jun 2025 02:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2plI3062868; Mon, 16 Jun 2025 02:51:47 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:47 GMT Message-Id: <202506160251.55G2plI3062868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: bafe0e7edaee - main - pam_ksu: Proactively address MIT KRB5 build failure 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 commit bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 Author: Cy Schubert AuthorDate: 2025-06-05 17:09:57 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:35 +0000 pam_ksu: Proactively address MIT KRB5 build failure MIT KRB5 does not provide a krb5_make_principal() function. We need to provide this ourselves for now. We provide the function for now while MIT and Heimdal are both in the tree. When Heimdal is removed we can inline the calls to krb5_get_default_realm() and krb5_build_principal_va(). krb5_build_principal_va() is deprecated in MIT KRB5. Its replacement, krb5_build_principal_alloc_va() will be used instead at that time. Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50808 --- lib/libpam/modules/pam_ksu/Makefile | 11 +++++++ lib/libpam/modules/pam_ksu/pam_ksu.c | 61 ++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile index c5fd72d9db7d..953ca23d1416 100644 --- a/lib/libpam/modules/pam_ksu/Makefile +++ b/lib/libpam/modules/pam_ksu/Makefile @@ -25,10 +25,21 @@ PACKAGE= kerberos +.include + LIB= pam_ksu SRCS= pam_ksu.c MAN= pam_ksu.8 +WARNS?= 3 LIBADD+= krb5 +.if ${MK_MITKRB5} != "no" +WARNS= 2 +CFLAGS+= -I${SRCTOP}/crypto/krb5/src/include +CFLAGS+= -I${SRCTOP}/krb5/include +CFLAGS+= -include ${SRCTOP}/crypto/krb5/src/include/k5-int.h +CFLAGS+= -DMK_MITKRB5=yes +.endif + .include diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c index 47362c835c12..a6b3f043d3f4 100644 --- a/lib/libpam/modules/pam_ksu/pam_ksu.c +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c @@ -48,6 +48,61 @@ static long get_su_principal(krb5_context, const char *, const char *, static int auth_krb5(pam_handle_t *, krb5_context, const char *, krb5_principal); +#ifdef MK_MITKRB5 +/* For MIT KRB5 only. */ + +/* + * XXX This entire module will need to be rewritten when heimdal + * XXX compatidibility is no longer needed. + */ +#define KRB5_DEFAULT_CCFILE_ROOT "/tmp/krb5cc_" +#define KRB5_DEFAULT_CCROOT "FILE:" KRB5_DEFAULT_CCFILE_ROOT + +/* + * XXX We will replace krb5_build_principal_va() with + * XXX krb5_build_principal_alloc_va() when Heimdal is finally + * XXX removed. + */ +krb5_error_code KRB5_CALLCONV +krb5_build_principal_va(krb5_context context, + krb5_principal princ, + unsigned int rlen, + const char *realm, + va_list ap); +typedef char *heim_general_string; +typedef heim_general_string Realm; +typedef Realm krb5_realm; +typedef const char *krb5_const_realm; + +static krb5_error_code +krb5_make_principal(krb5_context context, krb5_principal principal, + krb5_const_realm realm, ...) +{ + krb5_error_code rc; + va_list ap; + if (realm == NULL) { + krb5_realm temp_realm = NULL; + if ((rc = krb5_get_default_realm(context, &temp_realm))) + return (rc); + realm=temp_realm; + if (temp_realm) + free(temp_realm); + } + va_start(ap, realm); + /* + * XXX Ideally we should be using krb5_build_principal_alloc_va() + * XXX here because krb5_build_principal_va() is deprecated. But, + * XXX this would require changes elsewhere in the calling code + * XXX to call krb5_free_principal() elsewhere to free the + * XXX principal. We can do that after Heimdal is removed from + * XXX our tree. + */ + rc = krb5_build_principal_va(context, principal, strlen(realm), realm, ap); + va_end(ap); + return (rc); +} +#endif + PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc __unused, const char *argv[] __unused) @@ -217,7 +272,13 @@ get_su_principal(krb5_context context, const char *target_user, const char *curr if (rv != 0) return (errno); if (default_principal == NULL) { +#ifdef MK_MITKRB5 + /* For MIT KRB5. */ + rv = krb5_make_principal(context, default_principal, NULL, current_user, NULL); +#else + /* For Heimdal. */ rv = krb5_make_principal(context, &default_principal, NULL, current_user, NULL); +#endif if (rv != 0) { PAM_LOG("Could not determine default principal name."); return (rv); From nobody Mon Jun 16 02:51:48 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 4bLDzn2RmGz5yMxP; Mon, 16 Jun 2025 02:51: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 4bLDzn09qlz3Rsr; Mon, 16 Jun 2025 02:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042309; 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=hfCZJr1GGO+8VBKNOKXxvAS4vEy862IIxxJok6b726o=; b=KIhAEp4QxTFlbyPkaNMI2ZYEvz/u04q7N/n+JgcNQbIN/0rU296ieU1nNKSHMjwJ7uPVRG b3XEdVSvLhCfcdgRFkzmvU3rdAX6nVI6CPoTsObgnX+fwZbVOfaEyl0Idda7XInxDUHBVy 0CVYZ0blMK0zzPxU09VWBFdUZ90Zofx3PnU94Bs7+1J6xVsQOx6Xolzqz4mYZmi+rWK58B 4ocNxGDwnMp1s+gtHSFdCdo858sqt5wCUboJZGRgw7XkBwHKtTGkgyUOv/afnkN47C642T d8o/U4N4Z67d8yZyDRGIvIoNiLGGI7mWtD8zXhxIcbpYHm5HEcZ97hhlEk5Vaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042309; 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=hfCZJr1GGO+8VBKNOKXxvAS4vEy862IIxxJok6b726o=; b=ocUV74dmdAZoDKaMYBQAehf9NLUzzw6DrqVVkbWcen0ZcGNPoK7d3ggFGnQF6F+XeXRom6 eVNxZDyRS3znaIihmEm+DadJjeZ+ErZ7CzkAU57KvoCIcef6jsC/ZqQ/+/84bGb9CK8uKA V3m1WJ8IwJh94dAZgp2cNKe+Uu3WdTI7J2VbxQTw9slV+K2CUApi4fA1Ahwh4pCohXLDBY /X1DRvPCteMfC2JlA5zkuX+fCOkuXxF8ZMK4MJ9DsrQmO+7g05qanPSxKaZi8saniI2VHJ 3/aWhXRroeoHSJ7yYDH9vhSjptS7JRjj9JpFA5cMIFPHyRcVYVN3FOm+trqPyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042309; a=rsa-sha256; cv=none; b=MCPInPrfxdb3S4d5bYdHuxnNjwSv4HNxhYTGwk7QGhNSaSqyhnyTK4Xl9NhGsSNBdI7dO4 Go2lQAgqVLwzYBOokaRHAEx3fM5/yKEyg/flBR0lTLkYvZzYgq/sVdgKs3q2cUgHibPc6G tm6tbr2x/PbaBRprUpPKeAxOqgqCKIBAaA8bZ+xkjMMsd7rhpFADPXkDVSZwALbG1VouPS Wy+RxJrC1taMES6Rz5IWir2Uk44TshEx23NNlUh4e0pw9IwEz5gmlazRbjqpp5zHvQY2lf T9Q5ZyjXA07K/LkwrJ/ZfsoBvDPBXREr9/7uyDYImiSshRwv4BmeJbK38mk9Mg== 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 4bLDzm6rqTzgkD; Mon, 16 Jun 2025 02:51:48 +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 55G2pmHC062907; Mon, 16 Jun 2025 02:51:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pmJ3062904; Mon, 16 Jun 2025 02:51:48 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:48 GMT Message-Id: <202506160251.55G2pmJ3062904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: d903f2e289a7 - main - pam-krb5: Add no_warn dummy option 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d903f2e289a7f8c502918ebc64d46aaa86efce24 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d903f2e289a7f8c502918ebc64d46aaa86efce24 commit d903f2e289a7f8c502918ebc64d46aaa86efce24 Author: Cy Schubert AuthorDate: 2025-06-10 17:46:15 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:36 +0000 pam-krb5: Add no_warn dummy option This is to avoid throwing unknown option errors for pam.d files that should work for the Heimdal pam_krb5 and the MIT friendly pam-krb5. This option will be removed when the pam.d files are cleaned up after the removal of Heimdal. Sponsored by: The FreeBSD Foundation --- contrib/pam-krb5/module/internal.h | 1 + contrib/pam-krb5/module/options.c | 1 + 2 files changed, 2 insertions(+) diff --git a/contrib/pam-krb5/module/internal.h b/contrib/pam-krb5/module/internal.h index f3d832a17248..f3ea30139815 100644 --- a/contrib/pam-krb5/module/internal.h +++ b/contrib/pam-krb5/module/internal.h @@ -109,6 +109,7 @@ struct pam_config { /* The authentication context, which bundles together Kerberos data. */ struct context *ctx; + bool no_warn; /* XXX Dummy argument, remove when Heimdal is removed. */ }; /* Default to a hidden visibility for all internal functions. */ diff --git a/contrib/pam-krb5/module/options.c b/contrib/pam-krb5/module/options.c index f2c3791d895a..799b3a33e168 100644 --- a/contrib/pam-krb5/module/options.c +++ b/contrib/pam-krb5/module/options.c @@ -52,6 +52,7 @@ static const struct option options[] = { { K(no_ccache), false, BOOL (false) }, { K(no_prompt), true, BOOL (false) }, { K(no_update_user), true, BOOL (false) }, + { K(no_warn), true, BOOL (false) }, { K(only_alt_auth), true, BOOL (false) }, { K(pkinit_anchors), true, STRING (NULL) }, { K(pkinit_prompt), true, BOOL (false) }, From nobody Mon Jun 16 02:51:49 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 4bLDzp5CRWz5yN0g; Mon, 16 Jun 2025 02:51:50 +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 4bLDzp2B6Sz3Rsv; Mon, 16 Jun 2025 02:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042310; 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=jLvg5I8xgolSJpKtvxpwZrW9BLuUlDWENK5Sd/MK3wc=; b=kZSthWjxEsE6//HRj4UDtBK5oU9QSASQzgOInF6dh7LRIbIVaHiyW5Umyg3puliWoiIutp g6Fpmnk0COWX8Kbr1dfNJmOJYyJWEzqD4TYeKcApbXWMG6Pi9YePWbMEsloGZWCPK3sfCB oCyEooeJ61in9oMDEUC05SmhmD3wYbKVI6K8/edgqOffGKGrfoFEXdco5zqelUFdQ1xyIb ap9YQd58j+lcwtd2tbuH2LUjhdtTrMeyljWWGaQO6wFyMEHkARsTm29xCw+QJDNRLQ1gBi B9M209T1XHU0xPOGB6WDW+Wc67tgd327LFeiF1RldFoa4JiKjLTC4s0RItQnWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042310; 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=jLvg5I8xgolSJpKtvxpwZrW9BLuUlDWENK5Sd/MK3wc=; b=gIa68W5TuotuTm6s8lcyvZ93dTctlMX0oMH4g66Ea86kIYT7FGd6apXrE8O/VFik5AOAGW iGBXHuX8fzQRX1sTXfh/+wtZamWoWpHXNM2cLJUNrLNgH9U7zkhwF8d1K066HeiBLLxTUy P0vD8qUsKQQQpdRe5+fzMMy4kh3f/7NMgycufbztPTVS6Nq7FV7YqOfUdAoL4KeE3hpyek I0MHdTJ4s7ezgRsvZZdefbsdSUouw7CqM6bl27r+4f8fChJn1GkAlJmUFGkeJTHrdEprFV 9I6Ee2S/wa30p+BPTGeTEaXc/bF4UijTKR3tvpwdiwfAfbkWjfiTRvQvLYEuow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042310; a=rsa-sha256; cv=none; b=mTIzUNlKCQAbvXhCPcraum8MpV+fegYsUAvMV2/z4Fx2IzIePUU+knzz6CNv87SHjEBtHX 1izkxPUlpJk2YTSSHBPWyx1aFuGFOWFcD3PjLCVi1l4DKjpdDVfStkyrJgeMkBReuHH/bp mEqfl20VdijDq/DCEZlz2yXDVmjZzNRu74ZqI96StwehYMCo7XA3qdh7HJoj6EFuiQBXcL MP8Z4MhZkMNgR+5Yet7qIv3OItlZ//QBIHvI17LIipJuLWFP0gw9nOoWr1ACIJlsv+gJoX hroJe3YwrZnpvaeCIRuIKQM+M6Ltu4U+n+wKRvIeHMmeTxCDVp5sEVSaw9dOMg== 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 4bLDzp0hgDzgR2; Mon, 16 Jun 2025 02:51:50 +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 55G2pnP9062941; Mon, 16 Jun 2025 02:51:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pnEN062938; Mon, 16 Jun 2025 02:51:49 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:49 GMT Message-Id: <202506160251.55G2pnEN062938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 70371c7959df - main - openssh: Support building with MIT KRB5 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70371c7959df8bcba9b5ee62d976c1e74991e0a9 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=70371c7959df8bcba9b5ee62d976c1e74991e0a9 commit 70371c7959df8bcba9b5ee62d976c1e74991e0a9 Author: Cy Schubert AuthorDate: 2025-06-10 19:46:35 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:36 +0000 openssh: Support building with MIT KRB5 Remove HEIMDAL=1 from openssh/krb5_config.h and move the definition to the Makefile in order to control whether we're building under Heimdal or MIT. Add MIT KRB5 LIBS and INCLUDES to the openssh build. Sponsored by: The FreeBSD Foundation Reviewed by: markj Differential revision: https://reviews.freebsd.org/D50782 --- crypto/openssh/krb5_config.h | 1 - secure/libexec/sshd-session/Makefile | 9 +++++++++ secure/ssh.mk | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/krb5_config.h b/crypto/openssh/krb5_config.h index 2a6d35fbe3fd..e27774a7e0aa 100644 --- a/crypto/openssh/krb5_config.h +++ b/crypto/openssh/krb5_config.h @@ -6,5 +6,4 @@ #define HAVE_KRB5_CC_NEW_UNIQUE 1 #define HAVE_KRB5_FREE_ERROR_MESSAGE 1 #define HAVE_KRB5_GET_ERROR_MESSAGE 1 -#define HEIMDAL 1 #define KRB5 1 diff --git a/secure/libexec/sshd-session/Makefile b/secure/libexec/sshd-session/Makefile index e9e106fe90bd..8841cace5239 100644 --- a/secure/libexec/sshd-session/Makefile +++ b/secure/libexec/sshd-session/Makefile @@ -40,6 +40,15 @@ LDFLAGS+=-L${LIBBLACKLISTDIR} .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" LIBADD+= gssapi_krb5 gssapi krb5 +.if ${MK_MITKRB5} != "no" +.include "../../krb5/Makefile.inc" +CFLAGS+= -I${KRB5_DIR}/include \ + -I${KRB5_SRCTOP}/include \ + -I${KRB5_OBJTOP}/lib \ + -I${KRB5_DIR}/lib/gssapi/generic \ + -I${KRB5_DIR}/lib/gssapi/krb5 \ + -I${KRB5_DIR}/lib/gssapi/mechglue +.endif .endif .if ${MK_TCP_WRAPPERS} != "no" diff --git a/secure/ssh.mk b/secure/ssh.mk index 84d9a7f57032..bb6dd9b748e4 100644 --- a/secure/ssh.mk +++ b/secure/ssh.mk @@ -11,6 +11,10 @@ CFLAGS+= -I${SSHDIR} -include ssh_namespace.h .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h +.if ${MK_MITKRB5} == "no" +CFLAGS+= -DHEIMDAL=1 +.endif + .endif CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE:U/usr/local}/bin/xauth\" From nobody Mon Jun 16 02:51:51 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 4bLDzq5NB0z5yMsb; Mon, 16 Jun 2025 02:51:51 +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 4bLDzq3fTCz3S4Q; Mon, 16 Jun 2025 02:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042311; 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=g7J/yR5xIyQXXjc9RAn2MUPB0uINs+vM5gcVriPtsEE=; b=gn+W9rLCJwuYw/MtW7tmGmEtJdPTZwopY58xoiWPviMSh6epXigoohWn7uht/smeBSG12U 9cIhuneI3kzJdtCNtzdvuxkFFGj3qjfrGtibzUn3ghTjpjhTcG/6UqLf2bDPJgLlAjMvGk cwuOUIHWFfBbUjWCN/fr6kRxZR7oipXEElKVCHD+eFHlIRTHLRz853npDdwMTDfEhI2Sdc 7pkkPH16gBW/HYKfKuI4zgok1jWP8EIi3Gnm8DidCasRsv179KSk+HKbO+qhwfOp7y6pAE BM+kAD+FjkuYgnv57cafGwaTmoHpAtyxer28r5HN8uS9k8ijvnju8liAyTHyPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042311; 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=g7J/yR5xIyQXXjc9RAn2MUPB0uINs+vM5gcVriPtsEE=; b=HYZWN+H6P7+AvII6hw/T/NN81wV3AKdSU3Np0aFyR6nvYpxl6SZDnPfhnGT7GznNpNjykV qeYnKlsjLdnc/HgYr+Lzw8SYWGr4G84IMsHoDpJQZxb4xsJKnWkuVoy7m9IT61Ta7oZXje JxwGqNHtvlnh6YbWMi1cPLY+Y9FxUY5Dbd1MXtrKdKkTCzBDnXlhYTgUVlrk8pSfdO0RJ2 ekNiLwHljaiNjRgxfd/Q0oOER50i9FKP6oCW6TVwi4YvlGm1QQBUFdbVD1AyUJzA/rhNow SkqQboI7TbPk8avixbQ2qejEoeK+2oPcuKtdqbxawL2nvWHQlmhURU+ajAkapA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042311; a=rsa-sha256; cv=none; b=miN1vIYPTd/ssfXecAcT5yZ83WBOiA4X0PwzSoliRR6Tn5veJfPCOt5Zn643PtXEuZrSyT cqhMyFfPc4clAFHiyZrbcyu3j6zv3IfKqsZ2K0YjS21WRp02X6KpdpS3oW/ghd3yETYdPE PD9bZm6MX8dHyf7RGXQg3xNHMVRFTUg1bfGlb2vZQjvaSLAp4gb9eGFdVq0OD5e979vLCk 609gAvXO3fGddhHsvUnP6sIk7+pMbyjoT8kRPlHhql1BOobj2cAx5HGzuak6X/YMjcVaAG EfuD00gYLed7AZC3XnJ6HwnHUpda4aAZS6GHJ/xwM4qxLhvu1dR/eK476XMEgA== 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 4bLDzq1LPrzgkH; Mon, 16 Jun 2025 02:51:51 +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 55G2ppxH062975; Mon, 16 Jun 2025 02:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2ppsj062972; Mon, 16 Jun 2025 02:51:51 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:51 GMT Message-Id: <202506160251.55G2ppsj062972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 0acf1dd7929b - main - lib: Only build libcom_err with Heimdal 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0acf1dd7929be653d303b3eef5f83a0b8ed1eb45 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0acf1dd7929be653d303b3eef5f83a0b8ed1eb45 commit 0acf1dd7929be653d303b3eef5f83a0b8ed1eb45 Author: Cy Schubert AuthorDate: 2025-06-10 20:05:49 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:36 +0000 lib: Only build libcom_err with Heimdal MIT KRB5 provides its own libcom_err. Sponsored by: The FreeBSD Foundation Reviewed by: markj, emaste Differential revision: https://reviews.freebsd.org/D50809 --- lib/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index 82d461fe0873..fcb4bd95fecb 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -175,7 +175,9 @@ SUBDIR.${MK_FILE}+= libmagic SUBDIR.${MK_GPIO}+= libgpio SUBDIR.${MK_GSSAPI}+= libgssapi librpcsec_gss SUBDIR.${MK_ICONV}+= libiconv_modules +.if ${MK_MITKRB5} == "no" SUBDIR.${MK_KERBEROS_SUPPORT}+= libcom_err +.endif SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats From nobody Mon Jun 16 02:51:53 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 4bLDzs5QVKz5yMxY; Mon, 16 Jun 2025 02:51:53 +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 4bLDzs41CTz3Rwr; Mon, 16 Jun 2025 02:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042313; 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=FqraYLTYQOzzILh6dWsnkEevYKhXQj0TOj+bKu1uL8s=; b=J8TEp8DG9BgRapyyQOUNeJX9jBd2oVeNLU8TCfIqr0eN86rNctkzY322sjgCD1BXzJyYP+ P+nB1B2vfKaNiYDXEFxAfESl8ommynRu4ML8ignEUTaFemQ6+qd3rQd9wzj01isRMOipjo wEjGlgqTCe1LqyNEhB/CPva+J7n3E1urcsqu92AxfJJhgtTu8Pbrk1PdEUmgJJzRQ/1lVf RmAroxZ905fnpgKEa7dUv0GsUxNUJQl9K55MPM82k4JCm/Ufsk6medIWIWAFqlt00++0hM IA2EcJwEn937yXY4knkxTooZm98mx+NjWh/GHgboab4YAE8fAar4Dd1Bg5kZ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042313; 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=FqraYLTYQOzzILh6dWsnkEevYKhXQj0TOj+bKu1uL8s=; b=Z9CjOcwDvJtoeBDJn4VwIIlF59Ir0MMkWxBVVdszh3gSPlerUPhqIrAUHZW2LzUdeboZ5W hTW5BkvkUdPezIWvjZAfnwam75i28NzTOLbBES+ImZbdR4cC6AQJ13LY+ELkQqESN7hsOZ MYUUT4ipaeI9QG8e5Z8ip6Am++Pn0hoiDgXEpJ1ZvqkfyWKHLlsj73eoZ9nq8ODe1Nu8vb 1+PFCQejtFs8NJxugDM3fW7nPobwmAdknCB24Mt15k/cPnnZLjnTPvyEnY7q8qwqgyS39g +sWUBaKr4AJFkF/+uqWxmLOg1RYAIhiM1ZEwmO98VakWyALEBdgAWKNiORDb1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042313; a=rsa-sha256; cv=none; b=uAA2ORTFTS1uIq7oXBpc4dr5ZMlLk+AXCFyBHDiUck8uwEDWIDRq+2SvNqkjInJ00zcFVR hnYPF90A+jR1nskYqB89HuSJVSs31wbvF8zefXMzdf1zHVWVeY9ApVmQ6kKerrS4a2yHIA GftITOMbUjV9tlHuo2g4XL2jr4WOfRMttGl/N1q5jhV8UTDMTNQRj7mvFQt6mtzr+aBPXo pp0VS+k+9+Se8Oz8FDETkhxDBL0CkdFpVIz1pBvOPeWdVN6r/VBZyaZwTfPB2MfGTtsE5U EmkRQRXne9Op8SZb3/o/YyabkPnlSNOAZpW+kddOGtoRuCkTHL1y3s1Cuh1AuQ== 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 4bLDzs3VJ6zgkK; Mon, 16 Jun 2025 02:51:53 +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 55G2prQh063055; Mon, 16 Jun 2025 02:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2prBb063050; Mon, 16 Jun 2025 02:51:53 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:53 GMT Message-Id: <202506160251.55G2prBb063050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 8f18d513c03a - main - gssd: Add support for MIT KRB5 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f18d513c03afd64e0fa7cf2bea382d4de24324f Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8f18d513c03afd64e0fa7cf2bea382d4de24324f commit 8f18d513c03afd64e0fa7cf2bea382d4de24324f Author: Cy Schubert AuthorDate: 2025-06-11 02:31:31 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:36 +0000 gssd: Add support for MIT KRB5 Fix gssd build when building with MIT KRB5. krb5_get_init_creds_opt_set_default_flags() is not an MIT KRB5 function. It is also not needed to resolve the default keytable. Sponsored by: The FreeBSD Foundation Reviewed by: rmacklem Differential revision: https://reviews.freebsd.org/D50810 --- usr.sbin/gssd/Makefile | 7 +++++++ usr.sbin/gssd/gssd.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/usr.sbin/gssd/Makefile b/usr.sbin/gssd/Makefile index e30463ddf50b..7ad1cae7eb55 100644 --- a/usr.sbin/gssd/Makefile +++ b/usr.sbin/gssd/Makefile @@ -11,7 +11,14 @@ WARNS?= 1 LIBADD= gssapi .if ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_MITKRB5} != "no" +# MIT KRB5 +LIBADD+= krb5 k5crypto krb5profile krb5support +CFLAGS+= -DMK_MITKRB5=yes +.else +# Heimdal LIBADD+= krb5 roken +.endif .else CFLAGS+= -DWITHOUT_KERBEROS .endif diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c index d1d5c2119ab5..c6d9f01131f7 100644 --- a/usr.sbin/gssd/gssd.c +++ b/usr.sbin/gssd/gssd.c @@ -1189,8 +1189,11 @@ gssd_get_cc_from_keytab(const char *name) if (ret == 0) ret = krb5_cc_initialize(context, ccache, principal); if (ret == 0) { +#ifndef MK_MITKRB5 + /* For Hemdal only */ krb5_get_init_creds_opt_set_default_flags(context, "gssd", krb5_principal_get_realm(context, principal), opt); +#endif kt_ret = ret = krb5_kt_default(context, &kt); } if (ret == 0) From nobody Mon Jun 16 02:51:52 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 4bLDzr680Cz5yN4Y; Mon, 16 Jun 2025 02:51:52 +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 4bLDzr3v5hz3S7G; Mon, 16 Jun 2025 02:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042312; 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=kV9ODr2EYeHpAo2z4SkisHSdk8Y1Isedm+xp53LOzmg=; b=OROyHys+kBoHLl0Mrg0jrS/pPxuXJiLvrGWygxP6ULKswUfcbQJwgNwBahS6ARJ4R2jj7T H/UmLIeFC0B4pj9bqhqBy5WShNSHzUEBZqpPvwNXDpeQf6ld8O0bA8806j3ew5Fv3N6YW4 7t9kCs0PPAAnWtMJY/srozzFulr5Bi0CtZ1ubZ98yMexRictA0ygRh6+V+pbFDIZo0mnti b3zphe2pdiIKxcJEbBOy/Rtr1uEOsLxpOO3BKNzOl4MsK2psTafTvHsiQkNl4xwc3LvLOS gXo2G5HYvZPlpwP8TX+zrQt6nluqUKI2XZVIhNSyMTkFeBWkYhCLl1vHpPfCUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042312; 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=kV9ODr2EYeHpAo2z4SkisHSdk8Y1Isedm+xp53LOzmg=; b=MQ5DbzkR2V1wdoHV7ZQOWkB5Wg8DLpQyDRenzCmGUphlewG6lBBnI1tiVmpU3HBW3hGHsv Kkw4FwO84BYMtJ0USnIpl5d31s2jcgJQRztncspxbKVOBN+kjWebzTPll73e519bOLNLHm 4Zx2n4rvMD1Abo0PuPZboBJml04BvBh/25dA66xvMCM5dDYhbq7kF1HRb6JVxZuBFZ6Bni x5inqf3o+eNvjw7EgltwJS4nAGSCxHWHLEWHg5Tv/aCevRWXcogd3FEhxihM2D+/fFWDnM l6d/ThUQniHLGwrVAcM+ghwCaI7zvOJZZRTkQN2+cvDEA4q3Z8lJBY6egz454Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042312; a=rsa-sha256; cv=none; b=OuDXI+xAp7bedJxDl0yyTSvWM/UrOlQR/rBeJL32KCc/74eoikdASFBBsrcLw39C/OQfpy IjYHOAiCI/PlP+z6l0Wa6ylQmd1Xjsh01ZYkpfDp8ABz4hQjwwtpuPKWzQkBQxdHwdvi4Q JyBx89VJbfno65s6zbthY7pDVMMKFokC+R95ruAlxjd7SsHU5SDQ0UoWdW8fNs0Sgsibqk 9+YdAnrzTvn/bS1EkIDO4r0SfsYI70TRpAqGR/cbqtggGH2EIjdgi7pKNgTUQEweN55bbX UaZvVhXHyf9+4ggWUKLCkDA3oxHoKoQo7D5ht0Gv57gvhVeQKZ5E9BmuxW5TsA== 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 4bLDzr2XhszgkJ; Mon, 16 Jun 2025 02:51:52 +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 55G2pqfo063015; Mon, 16 Jun 2025 02:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pqQO063012; Mon, 16 Jun 2025 02:51:52 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:52 GMT Message-Id: <202506160251.55G2pqQO063012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 78d4557a9b6d - main - telnet: Add Support for MIT KRB5 build 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78d4557a9b6d13ce6040255ec5f8875db351e9a0 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=78d4557a9b6d13ce6040255ec5f8875db351e9a0 commit 78d4557a9b6d13ce6040255ec5f8875db351e9a0 Author: Cy Schubert AuthorDate: 2025-06-10 20:07:32 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:36 +0000 telnet: Add Support for MIT KRB5 build MIT KRB5 does not support telnet. This is because telnet uses 3DES encryption, which requires 3DES encrypted keys in the KDC database. As MIT had deprecated and removed 3DES support about a decade ago, telnet is not supported. Sponsored by: The FreeBSD Foundation Reviewed by: markj Differential revision: https://reviews.freebsd.org/D50785 --- lib/libtelnet/Makefile | 3 ++- usr.bin/telnet/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 69e63af4e272..6bc2f5a51de0 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -19,7 +19,8 @@ CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .endif -.if ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" && ${MK_MITKRB5} != "yes" +# MIT KRB5 deprecated and removed 3DES. Therefore no telnet support. SRCS+= kerberos5.c CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write .endif diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 930d70faa8ba..9197d44db94c 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -30,7 +30,8 @@ CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC LIBADD+= mp crypto ipsec pam .endif -.if ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_KERBEROS_SUPPORT} != "no" && ${MK_MITKRB5} != "yes" +# MIT KRB5 deprecated and removed 3DES. Therefore no telnet support. CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write LIBADD+= krb5 roken .endif From nobody Mon Jun 16 02:51:54 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 4bLDzt6kq4z5yMV5; Mon, 16 Jun 2025 02:51:54 +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 4bLDzt4KC3z3S2y; Mon, 16 Jun 2025 02:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042314; 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=YjAxJKuPO9tGBOsELVXp4WeFlYQMvRnFoQh67vDqjEw=; b=K5vtyiGMyMT/r+wSE16UvuiL9BuC4/C2dnQU1w4DH3GGmT2nbXRJ0vzKAX5nQ1NrHKAFwV mFg2q1/gnNYM3a3VJC63JPjz8DUzONVT/0wTKv5mbtqUlFGDRhljwF0MRayKdwBJbzQ/Be aCEzQvSvdqlo0jLqQJXN8xxDULER0e4ZnQQCw3rfgUo660jvhZWdZzuZMczs30XyJyymAW 6IT+bUr4YKM+lbfiRCkSi3CDTbiU/7IivTOFG+ZZ1LfS9peMt+AerxPtS8Oia3HMubdV1v fzpTDla0bldotrUaYQ+/Qpn+CG0sdlRfTo5NxAsvFAMIl8bCzwoUNxERaWMA9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042314; 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=YjAxJKuPO9tGBOsELVXp4WeFlYQMvRnFoQh67vDqjEw=; b=JUIOse9kWm3O5iDcKIGW+VoQI+eBg6cRQVO1zxZOOARAsVUJmeeeWy6f8FJlcpDeb0xKx+ pLIgKFJHqp5B0QCPcDMNijXuA/p7FhKyvvOHR8OAzSTHL5Vbpg9nH46XRtUxjZwaWROEyW 2lS340atIExGsy0RE03lCD4BEnWxC/Sv9DQpVa37EpuBddFOpe5HyClVSiTzobid6TzWmi 77UxCgyFQky1xiWdnuXIntRMilixkOEmAFGAOeYlTgPGobzyVVLbfo1sACmR7oEq1nfhNF v+UeOg5O/Ed4jWG1GzVzy2wdluDlwdvOlS5UurwCKVTsLlFHbpUc2p44I/33Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042314; a=rsa-sha256; cv=none; b=KZg6WyNZk/X/nSI1lkQS7//pK554whdezvcTCqVX2FiLmY3bPX3eclrQ9NE+69ndaXE5Ln ZMGzW0YlRN+x91O6w7ruCovnMPvTeh1z55SUAiiJM4MjFDUhlZT7sjVzWANYBMatTREcKI 1k+vKTH9PqYwoHewa13ib8oYLT0Bg22V9Or7sPd1ki/hMe/zVfNjjXEIFzzIbsIMS29bBv usq41EHd5ZOQFoOa79Ypu/+/1vPFpG8n5IdC5H4Hb8VgYibFYruQL17TZX2PSbcM2hqdH0 uY/St/GEk+jgxEqbwtOWWMu1jSnpR/U3FgAhOD5R9Jty+pYZW/bQ87Az8k/0Pw== 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 4bLDzt3vppzgR3; Mon, 16 Jun 2025 02:51:54 +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 55G2psSk063090; Mon, 16 Jun 2025 02:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2psGN063087; Mon, 16 Jun 2025 02:51:54 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:54 GMT Message-Id: <202506160251.55G2psGN063087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: a5a550c64f05 - main - etc/mtree: Add MIT KRB5 directories 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5a550c64f05aa4137187a2861a4254b405c896e Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a5a550c64f05aa4137187a2861a4254b405c896e commit a5a550c64f05aa4137187a2861a4254b405c896e Author: Cy Schubert AuthorDate: 2025-06-11 02:43:30 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:37 +0000 etc/mtree: Add MIT KRB5 directories Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50811 --- etc/mtree/BSD.include.dist | 8 ++++++++ etc/mtree/BSD.usr.dist | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index ad1b8a5f7413..0e9f739425a1 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -258,6 +258,12 @@ .. gssapi .. + gssapi_krb5 + gssapi + .. + .. + gssrpc + .. infiniband complib .. @@ -274,6 +280,8 @@ .. kadm5 .. + kdb5 + .. krb5 .. lib80211 diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 91500c99271c..a6b5e4bed274 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -81,6 +81,18 @@ .. i18n .. + krb5 + kdb + .. + plugins + kdb + .. + preauth + .. + tls + .. + .. + .. libxo encoder .. @@ -253,6 +265,8 @@ .. dtrace .. + et + .. examples BSD_daemon .. From nobody Mon Jun 16 02:51:55 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 4bLDzw4btJz5yMsr; Mon, 16 Jun 2025 02:51:56 +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 4bLDzv5JZ3z3S7q; Mon, 16 Jun 2025 02:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042315; 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=o7tbuPTlplKAIEQoF0YyOPvrHMV6dtrSX60Twi73nCM=; b=Qwt75Tt4uKO6bwZMaAr9b9EO1fJGbLTHHvBsjXTZlWonq1WKXBwYwQ/BdMFnGGMZw1xqho tOvI4LilfeZ2TQOGF4DVtOms5+nupFOmhBDxliomQJN2ND6uwikt+oHBTxM9ztqE0K9S7a 3XD3ZJZBRe05A2PN8Z4grW3yxLOFUsLSm5ZEymEwQK36KO5VjnxSdHqQy20tsEN87rgOVL toGrl4whby7QCjbrW0MXlOMeC7JETgTPNYA48tWYm6q/VOB4sRiBBkKJZfdeuedfN16J7b x8lVGdgZ3SCPOx/Y9z7T3eRC0aeng8MLvgLDW4z/xg+Ozytv2Ulhjo6Q9VCeEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042315; 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=o7tbuPTlplKAIEQoF0YyOPvrHMV6dtrSX60Twi73nCM=; b=UDK5eyB6LibWO3uymsTzZem6omVC3QNWhG1dkO4GVUFDB+Eh6BYee2JcGqX+4yZ2Ycj3wg rHU5Mdq9jQDuAG3MBBo3eipz0Ev1DQeapibctJ/VmZZDkZtQInFDK0VFAUqCQhAQuK+AFS AmVk6LI69KKyUnhqHxNfGvmokwf7DxfEQjBeSH2Bzg9hB71UfiImUbv5gPU1rvShMxPB7s TN7TekAo6ftAKuWTMUnPYNQJHggWV8U7ukts6PPV+n09n2xacYaux965a5vh/wFcpFDbwS X75PEOTFNO7xrYecrMVmPJ2ee6PmKt3fR0xgN5qswR0tKMRruO8b/pn/jQ4Knw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042315; a=rsa-sha256; cv=none; b=c594bmJXv/h4wKUprj3uBWY1l0MZTRFhcL1EllEg5I2zTkGdWl7k7n1LPmA7HWhy5tceZo qVWWTMvBJ5Yv/qhXu1qSsOe3cBdwhulNC24C1vW4ABGWUDQalSVMMl4BZ8B8auV1wK3AAB vu7rAfOaZ3jYOdkT4S1tggG70Vxg2Pzq6EKDnEi3F6x6S0KCn8rmpCe7kvHHDrMV2Jt5kx naL417jJV2+3VqpNF3x9QqNs++uJHv0TrtxU6y5V46FcJKUWjYnkvhX7PXnJBzMlQguNS+ Tj/KtSfoywk9PEMj2LUWUd9j8mfOvPOF/OYSzznXS96iEu2VJ9vdjhX/Uu1e4Q== 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 4bLDzv4VjKzggg; Mon, 16 Jun 2025 02:51:55 +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 55G2ptkj063125; Mon, 16 Jun 2025 02:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2ptHj063122; Mon, 16 Jun 2025 02:51:55 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:55 GMT Message-Id: <202506160251.55G2ptHj063122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 1b735665f45a - main - etc/gss: Add MIT GSS glue 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b735665f45a3a1ca8661c54e22d540fb1c4d673 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1b735665f45a3a1ca8661c54e22d540fb1c4d673 commit 1b735665f45a3a1ca8661c54e22d540fb1c4d673 Author: Cy Schubert AuthorDate: 2025-06-11 02:45:02 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:37 +0000 etc/gss: Add MIT GSS glue The MIT GSS uses different library names. And MIT KRB5 supports more OIDs than our ancient Heimdal does. The intention is to remove etc/gss when Heimdal is finally retired and rename etc/gss-krb5 to etc/gss. Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50812 --- etc/Makefile | 10 ++++++++++ etc/gss-krb5/Makefile | 5 +++++ etc/gss-krb5/mech | 10 ++++++++++ etc/gss-krb5/qop | 1 + 4 files changed, 26 insertions(+) diff --git a/etc/Makefile b/etc/Makefile index 4e387e8543d0..da9288bddaae 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -15,6 +15,12 @@ SUBDIR+=termcap SUBDIR+=sendmail .endif +.if ${MK_MITKRB5} != "no" +SUBDIR+=gss-krb5 +.else +SUBDIR+=gss +.endif + # NB: keep these sorted by MK_* knobs ETCMAIL=aliases @@ -53,7 +59,11 @@ distribution: @echo "set DESTDIR before running \"make ${.TARGET}\"" @false .endif +.if ${MK_MITKRB5} != "no" + ${_+_}cd ${.CURDIR}/gss-krb5; ${MAKE} install +.else ${_+_}cd ${.CURDIR}/gss; ${MAKE} install +.endif ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt diff --git a/etc/gss-krb5/Makefile b/etc/gss-krb5/Makefile new file mode 100644 index 000000000000..301a8e074e8c --- /dev/null +++ b/etc/gss-krb5/Makefile @@ -0,0 +1,5 @@ +FILES= mech qop +NO_OBJ= +FILESDIR= /etc/gss + +.include diff --git a/etc/gss-krb5/mech b/etc/gss-krb5/mech new file mode 100644 index 000000000000..94fed68a24eb --- /dev/null +++ b/etc/gss-krb5/mech @@ -0,0 +1,10 @@ +# +# Name OID Library name Kernel module +kerberosv5 1.2.840.113554.1.2.2 /usr/lib/libgssapi_krb5.so.121 kgssapi_krb5 +kerberosv5 1.2.840.113554.1.2.3 /usr/lib/libgssapi_krb5.so.121 kgssapi_krb5 +kerberosv5 1.3.6.1.5.5.2 /usr/lib/libgssapi_krb5.so.121 kgssapi_krb5 +kerberosv5 1.2.840.48018.1.2.2.1 /usr/lib/libgssapi_krb5.so.121 kgssapi_krb5 +kerberosv5 1.2.840.48018.1.2.2.2 /usr/lib/libgssapi_krb5.so.121 kgssapi_krb5 +kerberosv5 1.2.840.48018.1.2.2.4 /usr/lib/libgssapi_krb5.so.121 kgssapi_krb5 +kerberosv5 1.2.840.48018.1.2.2.5 /usr/lib/libgssapi_krb5.so.121 kgssapi_krb5 +kerberosv5 1.3.5.1.5.2 /usr/lib/libgssapi_krb5.so.121 kgssapi_krb5 diff --git a/etc/gss-krb5/qop b/etc/gss-krb5/qop new file mode 100644 index 000000000000..7d5b6b8f33dd --- /dev/null +++ b/etc/gss-krb5/qop @@ -0,0 +1 @@ +GSS_KRB5_CONF_C_QOP_DES3_KD 0x0200 kerberosv5 From nobody Mon Jun 16 02:51:57 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 4bLDzy11NXz5yMxh; Mon, 16 Jun 2025 02:51:58 +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 4bLDzx6r82z3SP1; Mon, 16 Jun 2025 02:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042317; 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=walULwPEysjXdBJ4I2kntp5m16v1fpl0+AirCGEFLwc=; b=LjejGCCLPrFtwuran6HCDyisZ8GgCNpAciyb/IfaEC2T+P/pe8I4WZC3WXgCczWtnXd/z3 9TrfvMenRNQeJ5saaxFbU9c9eBrCyRyRJwY7t03Kk/nChgwY6Dno1WNxGZWb2z9tg+6eqW h5mM/HPtu35BHv6q+NapbCrR9jynjUdMIqLtApSDLYtvW0ws/ckaQ550bZedXo0JzhW99J QxixpgcD+moBiWgSXSAnzqCXsGh6aKsC+88nLdxAwA9traue/Q4rxSDc7V1NSjVt4aEQH8 twD6B6csEw32E5y0aZxKWfJATm4YNDE1Zsr7rMY5gCh4aMZKngexgSA2kjcXCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042317; 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=walULwPEysjXdBJ4I2kntp5m16v1fpl0+AirCGEFLwc=; b=hEo6GDiZ4rbdkSxPjU/7dO/b7Q2wKUVKLPA2k0KAYX/K+vSNY+kcGL9uGQOb/BRiM0ysHM QlGbAiDLZWndoA3g5yNxs7bz07CybsRcGxa4LwcrjuyDn8j3Qvsq9xbonj0xiBQeuRaMFA xNZkUT3rc5xEc24RWcclHXtadbaXiLeXNOZRfhpY6RFTetKAG5RSgV5pER8zSI3P+ikp2S GUcMcF7cWZEZBg4DE72oBZDOQGZtrc68Um/2opNnndEfhZhk2nbNNoqWXrpoak1sqO4CCh X922WrlfFtuJhpbDiDAR4AAF8YgJjq6JleMGXx10rwxzkOUq/kahM7rEgIzHgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042317; a=rsa-sha256; cv=none; b=XBXdL0oiuvni/959YjDt2opQGKsd09fs2G0aNzTZ/kx7DEefK5/EZRFjV8V0+BtcE3BEv0 lrAtw0bqHiI2eIm+Tdt6M+c0cbkb9J6TUja5ld5MdMkCCjrSsFR3IEkHUruGSy6R7ywsu3 RRWHK2hPm8v3FsAC2AeBxyA+BWb0JJReNLrojGowaq9DOeDIvUWWXLVb+kfJvrTdz6k6Xf Fd01Z4j+fYrLS2pag7z/SniEXK+WoKf0xXhsp5sRJZegF1NS0TJqwOHgaEU8oE+uhplxcv 5VwKLSvvFIO+Ifp68HnO2A69TysM9Nhft2h7WCGQe6rbz/2PDU5CWfsVgluWPw== 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 4bLDzx6PjFzgkL; Mon, 16 Jun 2025 02:51:57 +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 55G2pv93063198; Mon, 16 Jun 2025 02:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pvSW063193; Mon, 16 Jun 2025 02:51:57 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:57 GMT Message-Id: <202506160251.55G2pvSW063193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: af2593e3212c - main - OptionalObsoleteFiles: Support MIT KRB5 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af2593e3212ce68d9eb5e5f20d2f0c11f6ee69bd Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=af2593e3212ce68d9eb5e5f20d2f0c11f6ee69bd commit af2593e3212ce68d9eb5e5f20d2f0c11f6ee69bd Author: Cy Schubert AuthorDate: 2025-06-11 02:54:37 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:37 +0000 OptionalObsoleteFiles: Support MIT KRB5 If no Kerberos is wanted (MK_KERBEROS == no) remove whatever kerberos is installed. If MIT KRB5 is wanted (MK_MITKRB5 == yes) remove the Heimdal files. If Heimdal is wanted (MK_MITKRB5 == no) remove the MIT KRB5 files. Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50814 --- tools/build/mk/OptionalObsoleteFiles.inc | 3257 +++++++++++++++++++++++++++++- 1 file changed, 3251 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 91f7154d892f..d692b5307198 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2705,6 +2705,8 @@ OLD_FILES+=usr/share/man/man1/truss.1.gz .endif .if ${MK_KERBEROS} == no +.if ${MK_MITKRB5} == no +# Remove Heimdal because we do not want Kerberos OLD_FILES+=etc/rc.d/ipropd_master OLD_FILES+=etc/rc.d/ipropd_slave OLD_FILES+=usr/bin/asn1_compile @@ -2860,10 +2862,6 @@ OLD_FILES+=usr/lib/libwind.a OLD_FILES+=usr/lib/libwind.so OLD_LIBS+=usr/lib/libwind.so.11 OLD_FILES+=usr/lib/libwind_p.a -OLD_FILES+=usr/lib/pam_krb5.so -OLD_LIBS+=usr/lib/pam_krb5.so.6 -OLD_FILES+=usr/lib/pam_ksu.so -OLD_LIBS+=usr/lib/pam_ksu.so.6 OLD_FILES+=usr/lib/libprivateheimipcc.a OLD_FILES+=usr/lib/libprivateheimipcc.so OLD_LIBS+=usr/lib/libprivateheimipcc.so.11 @@ -3599,13 +3597,3259 @@ OLD_FILES+=usr/share/man/man8/kimpersonate.8.gz OLD_FILES+=usr/share/man/man8/kpasswdd.8.gz OLD_FILES+=usr/share/man/man8/kstash.8.gz OLD_FILES+=usr/share/man/man8/ktutil.8.gz -OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz -OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz OLD_FILES+=usr/share/man/man8/string2key.8.gz OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz +.else +# Remove MIT KRB5 because we do not want Kerberos +OLD_FILES+=usr/bin/compile_et +OLD_FILES+=usr/bin/gss-client +OLD_FILES+=usr/bin/k5srvutil +OLD_FILES+=usr/bin/kadmin +OLD_FILES+=usr/bin/kdestroy +OLD_FILES+=usr/bin/kinit +OLD_FILES+=usr/bin/klist +OLD_FILES+=usr/bin/kpasswd +OLD_FILES+=usr/bin/krb5-config +OLD_FILES+=usr/bin/ksu +OLD_FILES+=usr/bin/kswitch +OLD_FILES+=usr/bin/ktutil +OLD_FILES+=usr/bin/kvno +OLD_FILES+=usr/bin/sclient +OLD_FILES+=usr/bin/sim_client +OLD_FILES+=usr/bin/uuclient +OLD_FILES+=etc/rc.d/kpropd +OLD_FILES+=usr/include/com_err.h +OLD_FILES+=usr/include/gssapi.h +OLD_FILES+=usr/include/gssapi/gssapi.h +OLD_FILES+=usr/include/gssapi/gssapi_alloc.h +OLD_FILES+=usr/include/gssapi/gssapi_ext.h +OLD_FILES+=usr/include/gssapi/gssapi_generic.h +OLD_FILES+=usr/include/gssapi/gssapi_krb5.h +OLD_FILES+=usr/include/gssapi/mechglue.h +OLD_FILES+=usr/include/gssrpc/auth.h +OLD_FILES+=usr/include/gssrpc/auth_gss.h +OLD_FILES+=usr/include/gssrpc/auth_gssapi.h +OLD_FILES+=usr/include/gssrpc/auth_unix.h +OLD_FILES+=usr/include/gssrpc/clnt.h +OLD_FILES+=usr/include/gssrpc/netdb.h +OLD_FILES+=usr/include/gssrpc/pmap_clnt.h +OLD_FILES+=usr/include/gssrpc/pmap_prot.h +OLD_FILES+=usr/include/gssrpc/pmap_rmt.h +OLD_FILES+=usr/include/gssrpc/rename.h +OLD_FILES+=usr/include/gssrpc/rpc.h +OLD_FILES+=usr/include/gssrpc/rpc_msg.h +OLD_FILES+=usr/include/gssrpc/svc.h +OLD_FILES+=usr/include/gssrpc/svc_auth.h +OLD_FILES+=usr/include/gssrpc/types.h +OLD_FILES+=usr/include/gssrpc/xdr.h +OLD_FILES+=usr/include/kadm5/admin.h +OLD_FILES+=usr/include/kadm5/chpass_util_strings.h +OLD_FILES+=usr/include/kadm5/kadm_err.h +OLD_FILES+=usr/include/kdb.h +OLD_FILES+=usr/include/krad.h +OLD_FILES+=usr/include/krb5.h +OLD_FILES+=usr/include/krb5/ccselect_plugin.h +OLD_FILES+=usr/include/krb5/certauth_plugin.h +OLD_FILES+=usr/include/krb5/clpreauth_plugin.h +OLD_FILES+=usr/include/krb5/hostrealm_plugin.h +OLD_FILES+=usr/include/krb5/kadm5_auth_plugin.h +OLD_FILES+=usr/include/krb5/kadm5_hook_plugin.h +OLD_FILES+=usr/include/krb5/kdcpolicy_plugin.h +OLD_FILES+=usr/include/krb5/kdcpreauth_plugin.h +OLD_FILES+=usr/include/krb5/krb5.h +OLD_FILES+=usr/include/krb5/localauth_plugin.h +OLD_FILES+=usr/include/krb5/locate_plugin.h +OLD_FILES+=usr/include/krb5/plugin.h +OLD_FILES+=usr/include/krb5/preauth_plugin.h +OLD_FILES+=usr/include/krb5/pwqual_plugin.h +OLD_FILES+=usr/include/profile.h +OLD_FILES+=usr/include/verto-module.h +OLD_FILES+=usr/include/verto.h +OLD_FILES+=usr/lib/krb5/plugins/kdb/db2.so +OLD_FILES+=usr/lib/krb5/plugins/preauth/otp.so +OLD_FILES+=usr/lib/krb5/plugins/preauth/pkinit.so +OLD_FILES+=usr/lib/krb5/plugins/preauth/spake.so +OLD_FILES+=usr/lib/krb5/plugins/preauth/test.so +OLD_FILES+=usr/lib/krb5/plugins/tls/k5tls.so +OLD_FILES+=usr/lib/libcom_err.a +OLD_LIBS+=usr/lib/libcom_err.so +OLD_LIBS+=usr/lib/libcom_err.so.121 +OLD_FILES+=usr/lib/libgssapi_krb5.so +OLD_LIBS+=usr/lib/libgssapi_krb5.so.121 +OLD_FILES+=usr/lib/libgssrpc.so +OLD_LIBS+=usr/lib/libgssrpc.so.121 +OLD_FILES+=usr/lib/libk5crypto.so +OLD_LIBS+=usr/lib/libk5crypto.so.121 +OLD_FILES+=usr/lib/libkadm5clnt.so +OLD_FILES+=usr/lib/libkadm5clnt_mit.so +OLD_LIBS+=usr/lib/libkadm5clnt_mit.so.121 +OLD_FILES+=usr/lib/libkadm5srv.so +OLD_FILES+=usr/lib/libkadm5srv_mit.so +OLD_LIBS+=usr/lib/libkadm5srv_mit.so.121 +OLD_FILES+=usr/lib/libkdb5.so +OLD_LIBS+=usr/lib/libkdb5.so.121 +OLD_FILES+=usr/lib/libkrad.so +OLD_LIBS+=usr/lib/libkrad.so.121 +OLD_FILES+=usr/lib/libkrb5.so +OLD_LIBS+=usr/lib/libkrb5.so.121 +OLD_FILES+=usr/lib/libkrb5profile.a +OLD_FILES+=usr/lib/libkrb5profile.so +OLD_LIBS+=usr/lib/libkrb5profile.so.121 +OLD_FILES+=usr/lib/libkrb5support.a +OLD_FILES+=usr/lib/libkrb5support.so +OLD_LIBS+=usr/lib/libkrb5support.so.121 +OLD_FILES+=usr/lib/libverto.so +OLD_LIBS+=usr/lib/libverto.so.121 +OLD_FILES+=usr/libdata/pkgconfig/gssrpc.pc +OLD_FILES+=usr/libdata/pkgconfig/kadm-client.pc +OLD_FILES+=usr/libdata/pkgconfig/kadm-server.pc +OLD_FILES+=usr/libdata/pkgconfig/kdb.pc +OLD_FILES+=usr/libdata/pkgconfig/krb5-gssapi.pc +OLD_FILES+=usr/libdata/pkgconfig/krb5.pc +OLD_FILES+=usr/libdata/pkgconfig/mit-krb5-gssapi.pc +OLD_FILES+=usr/libdata/pkgconfig/mit-krb5.pc +OLD_FILES+=usr/libexec/krb5kdc +OLD_FILES+=usr/libexec/kadmind +OLD_FILES+=usr/libexec/kprop +OLD_FILES+=usr/libexec/kpropd +OLD_FILES+=usr/sbin/gss-server +OLD_FILES+=usr/sbin/kadmin.local +OLD_FILES+=usr/sbin/kdb5_util +OLD_FILES+=usr/sbin/kproplog +OLD_FILES+=usr/sbin/krb5-send-pr +OLD_FILES+=usr/sbin/sim_server +OLD_FILES+=usr/sbin/sserver +OLD_FILES+=usr/sbin/uuserver +OLD_FILES+=usr/share/doc/krb5/doc/html/.buildinfo +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/agogo.css +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/basic.css +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/bgfooter.png +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/bgtop.png +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/doctools.js +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/documentation_options.js +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/file.png +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/jquery.js +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/kerb.css +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/language_data.js +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/minus.png +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/plus.png +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/pygments.css +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/searchtools.js +OLD_FILES+=usr/share/doc/krb5/doc/html/_static/underscore.js +OLD_FILES+=usr/share/doc/krb5/doc/html/about.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/index.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/k5srvutil.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kadmin_local.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kadmind.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kdb5_ldap_util.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kdb5_util.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kprop.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kpropd.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/kproplog.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/krb5kdc.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/ktutil.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/admin_commands/sserver.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/advanced/index.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/advanced/retiring-des.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/appl_servers.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/auth_indicator.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/backup_host.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_files/index.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_files/kadm5_acl.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_files/kdc_conf.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_files/krb5_conf.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/conf_ldap.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/database.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/dbtypes.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/dictionary.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/enctypes.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/env_variables.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/host_config.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/https.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/index.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/install.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/install_appl_srv.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/install_clients.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/install_kdc.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/lockout.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/otp.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/pkinit.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/princ_dns.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/realm_config.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/spake.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/troubleshoot.html +OLD_FILES+=usr/share/doc/krb5/doc/html/admin/various_envs.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/gssapi.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/h5l_mit_apidiff.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/index.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/init_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/princ_handle.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/index.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_425_conv_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_524_conv_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_524_convert_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_address_compare.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_address_order.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_address_search.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_allow_weak_crypto.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_aname_to_localname.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_anonymous_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_anonymous_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_appdefault_boolean.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_appdefault_string.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_free.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_genaddrs.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_get_checksum_func.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getaddrs.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getauthenticator.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getflags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getkey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getkey_k.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getlocalseqnumber.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getlocalsubkey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getrcache.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getrecvsubkey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getrecvsubkey_k.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getremoteseqnumber.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getremotesubkey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getsendsubkey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_getsendsubkey_k.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_init.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_initivector.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_set_checksum_func.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_set_req_cksumtype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setaddrs.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setflags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setports.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setrcache.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setrecvsubkey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setrecvsubkey_k.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setsendsubkey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setsendsubkey_k.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_auth_con_setuseruserkey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_build_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_build_principal_alloc_va.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_build_principal_ext.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_build_principal_va.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_block_size.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_checksum_length.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_crypto_length.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_crypto_length_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_decrypt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_decrypt_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_derive_prfplus.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_encrypt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_encrypt_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_encrypt_length.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_enctype_compare.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_free_state.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_fx_cf2_simple.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_init_state.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_is_coll_proof_cksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_is_keyed_cksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_keyed_checksum_types.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_keylengths.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_make_checksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_make_checksum_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_make_random_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_padding_length.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_prf.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_prf_length.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_prfplus.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_add_entropy.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_make_octets.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_os_entropy.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_seed.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_random_to_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_string_to_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_string_to_key_with_params.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_valid_cksumtype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_valid_enctype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_verify_checksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_c_verify_checksum_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_calculate_checksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_cache_match.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_close.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_copy_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_default.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_default_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_destroy.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_dup.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_end_seq_get.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_gen_new.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_config.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_flags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_full_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_get_type.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_initialize.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_move.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_new_unique.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_next_cred.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_remove_cred.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_resolve.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_retrieve_cred.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_select.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_set_config.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_set_default_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_set_flags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_start_seq_get.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_store_cred.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_support_switch.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cc_switch.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cccol_cursor_free.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cccol_cursor_new.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cccol_cursor_next.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cccol_have_content.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_change_password.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_check_clockskew.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_checksum_size.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_chpw_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_cksumtype_to_string.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_clear_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_addresses.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_authdata.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_authenticator.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_checksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_context.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_data.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_keyblock.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_keyblock_contents.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_copy_ticket.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_decode_authdata_container.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_decode_ticket.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_decrypt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_deltat_to_string.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_eblock_enctype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_encode_authdata_container.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_encrypt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_encrypt_size.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_enctype_to_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_enctype_to_string.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_expand_hostname.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_find_authdata.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_finish_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_finish_random_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_addresses.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_ap_rep_enc_part.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_authdata.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_authenticator.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_checksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_checksum_contents.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_cksumtypes.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_context.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_cred_contents.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_data.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_data_contents.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_default_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_enctypes.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_error.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_host_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_keyblock.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_keyblock_contents.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_keytab_entry_contents.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_string.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_tgt_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_ticket.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_free_unparsed_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_fwd_tgt_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_credentials.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_credentials_renew.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_credentials_validate.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_default_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_etype_info.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_fallback_host_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_host_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_in_tkt_with_keytab.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_in_tkt_with_password.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_in_tkt_with_skey.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_keytab.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_alloc.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_free.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_get_fast_flags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_init.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_address_list.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_anonymous.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_canonicalize.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_change_password_prompt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_etype_list.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_expire_callback.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_fast_ccache_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_fast_flags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_forwardable.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_in_ccache.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_out_ccache.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_pa.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_pac_request.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_preauth_list.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_proxiable.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_renew_life.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_responder.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_salt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_opt_set_tkt_life.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_init_creds_password.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_permitted_enctypes.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_profile.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_prompt_types.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_renewed_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_server_rcache.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_time_offsets.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_get_validated_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_context.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_context_profile.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_free.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_get.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_get_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_get_error.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_get_times.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_init.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_set_keytab.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_set_password.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_set_service.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_creds_step.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_keyblock.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_random_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_init_secure_context.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_is_config_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_is_referral_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_is_thread_safe.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_create_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_decrypt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_decrypt_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_encrypt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_encrypt_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_free_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_key_enctype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_key_keyblock.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_make_checksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_make_checksum_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_prf.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_reference_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_verify_checksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_k_verify_checksum_iov.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kdc_sign_ticket.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kdc_verify_ticket.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_add_entry.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_client_default.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_close.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_default.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_default_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_dup.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_end_seq_get.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_free_entry.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_get_entry.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_get_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_get_type.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_have_content.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_next_entry.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_read_service_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_remove_entry.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_resolve.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kt_start_seq_get.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_kuserok.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_make_authdata_kdc_issued.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_marshal_credentials.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_merge_authdata.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_1cred.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_error.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_ncred.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_priv.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_rep.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_rep_dce.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_req.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_req_extended.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_mk_safe.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_os_localaddr.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_add_buffer.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_free.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_get_buffer.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_get_client_info.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_get_types.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_init.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_parse.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_sign.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_sign_ext.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_verify.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_pac_verify_ext.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_parse_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_parse_name_flags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_prepend_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_principal2salt.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_principal_compare.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_principal_compare_any_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_principal_compare_flags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_process_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_prompter_posix.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_random_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_cred.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_error.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_priv.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_rep.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_rep_dce.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_req.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_rd_safe.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_read_password.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_realm_compare.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_recvauth.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_recvauth_version.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_get_challenge.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_list_questions.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_otp_challenge_free.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_otp_get_challenge.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_otp_set_answer.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_pkinit_challenge_free.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_pkinit_get_challenge.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_pkinit_set_answer.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_responder_set_answer.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_salttype_to_string.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_sendauth.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_server_decrypt_ticket_keytab.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_default_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_default_tgs_enctypes.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_kdc_recv_hook.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_kdc_send_hook.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_password.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_password_using_ccache.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_principal_realm.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_real_time.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_trace_callback.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_set_trace_filename.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_sname_match.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_sname_to_principal.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_string_to_cksumtype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_string_to_deltat.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_string_to_enctype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_string_to_key.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_string_to_salttype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_string_to_timestamp.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_timeofday.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_timestamp_to_sfstring.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_timestamp_to_string.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_tkt_creds_free.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_tkt_creds_get.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_tkt_creds_get_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_tkt_creds_get_times.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_tkt_creds_init.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_tkt_creds_step.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_unmarshal_credentials.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_unparse_name.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_unparse_name_ext.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_unparse_name_flags.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_unparse_name_flags_ext.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_us_timeofday.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_use_enctype.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_verify_authdata_kdc_issued.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_verify_checksum.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_verify_init_creds.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_verify_init_creds_opt_init.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_verify_init_creds_opt_set_ap_req_nofail.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_vprepend_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_vset_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_vwrap_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/api/krb5_wrap_error_message.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/index.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_ADDRPORT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_CHAOS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_DDP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_INET.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_INET6.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_IPPORT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_ISO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_IS_LOCAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_NETBIOS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ADDRTYPE_XNS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AD_TYPE_EXTERNAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AD_TYPE_FIELD_TYPE_MASK.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AD_TYPE_REGISTERED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AD_TYPE_RESERVED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AP_OPTS_ETYPE_NEGOTIATION.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AP_OPTS_MUTUAL_REQUIRED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AP_OPTS_RESERVED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AP_OPTS_USE_SESSION_KEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AP_OPTS_USE_SUBKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/AP_OPTS_WIRE_MASK.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA128.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_CMAC_CAMELLIA256.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_CRC32.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_DESCBC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_HMAC_MD5_ARCFOUR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES128.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_96_AES256.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_HMAC_SHA1_DES3.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_HMAC_SHA256_128_AES128.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_HMAC_SHA384_192_AES256.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_MD5_HMAC_ARCFOUR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_NIST_SHA.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_RSA_MD4.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_RSA_MD4_DES.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_RSA_MD5.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_RSA_MD5_DES.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/CKSUMTYPE_SHA1.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA1_96.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_AES128_CTS_HMAC_SHA256_128.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA1_96.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_AES256_CTS_HMAC_SHA384_192.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_ARCFOUR_HMAC_EXP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_CAMELLIA128_CTS_CMAC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_CAMELLIA256_CTS_CMAC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES3_CBC_ENV.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES3_CBC_RAW.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES3_CBC_SHA1.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES_CBC_CRC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES_CBC_MD4.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES_CBC_MD5.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES_CBC_RAW.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DES_HMAC_SHA1.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_DSA_SHA1_CMS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_MD5_RSA_CMS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_NULL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_RC2_CBC_ENV.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_RSA_ENV.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_RSA_ES_OAEP_ENV.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_SHA1_RSA_CMS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/ENCTYPE_UNKNOWN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_ALLOW_POSTDATE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_CANONICALIZE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_CNAME_IN_ADDL_TKT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_DISABLE_TRANSITED_CHECK.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_ENC_TKT_IN_SKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_FORWARDABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_FORWARDED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_POSTDATED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_PROXIABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_PROXY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_RENEW.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_RENEWABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_RENEWABLE_OK.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_REQUEST_ANONYMOUS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_OPT_VALIDATE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KDC_TKT_COMMON_MASK.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_ALTAUTH_ATT_CHALLENGE_RESPONSE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_ANONYMOUS_PRINCSTR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_ANONYMOUS_REALMSTR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AP_REP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AP_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AS_REP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AS_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_AND_OR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_AP_OPTIONS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_AUTH_INDICATOR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_CAMMAC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_ETYPE_NEGOTIATION.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_FX_ARMOR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_IF_RELEVANT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_INITIAL_VERIFIED_CAS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_KDC_ISSUED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_MANDATORY_FOR_KDC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_OSF_DCE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_SESAME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_SIGNTICKET.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTHDATA_WIN2K_PAC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_SEQUENCE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_DO_TIME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_PERMIT_ALL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_SEQUENCE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_RET_TIME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_AUTH_CONTEXT_USE_SUBKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRYPTO_TYPE_CHECKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRYPTO_TYPE_DATA.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRYPTO_TYPE_EMPTY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRYPTO_TYPE_HEADER.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRYPTO_TYPE_PADDING.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRYPTO_TYPE_SIGN_ONLY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRYPTO_TYPE_STREAM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CRYPTO_TYPE_TRAILER.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_CYBERSAFE_SECUREID.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_DOMAIN_X500_COMPRESS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_ENCPADATA_REQ_ENC_PA_REP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_ERROR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_FAST_REQUIRED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GC_CACHED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GC_CANONICALIZE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GC_CONSTRAINED_DELEGATION.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GC_FORWARDABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GC_NO_STORE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GC_NO_TRANSIT_CHECK.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GC_USER_USER.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ANONYMOUS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CANONICALIZE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_ETYPE_LIST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_FORWARDABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PREAUTH_LIST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_PROXIABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_SALT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_GET_INIT_CREDS_OPT_TKT_LIFE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_INIT_CONTEXT_KDC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_INIT_CONTEXT_SECURE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_INIT_CREDS_STEP_FLAG_CONTINUE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_INT16_MAX.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_INT16_MIN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_INT32_MAX.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_INT32_MIN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AD_ITE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AD_KDCISSUED_CKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AD_MTE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AD_SIGNEDPATH.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_CKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_APP_DATA_ENCRYPT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AP_REP_ENCPART.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AP_REQ_AUTH_CKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AS_REP_ENCPART.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_AS_REQ_PA_ENC_TS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_CAMMAC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_ENC_CHALLENGE_KDC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_FAST_ENC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_FAST_FINISHED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_FAST_REQ_CHKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_MIC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_INTEG.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_GSS_TOK_WRAP_PRIV.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_IAKERB_FINISHED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_KDC_REP_TICKET.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_KRB_CRED_ENCPART.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_KRB_ERROR_CKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_KRB_PRIV_ENCPART.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_KRB_SAFE_CKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_AS_FRESHNESS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_FX_COOKIE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_OTP_REQUEST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_PKINIT_KX.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REPLY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_S4U_X509_USER_REQUEST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_CKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_CHALLENGE_TRACKID.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_PA_SAM_RESPONSE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_SPAKE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SESSKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REP_ENCPART_SUBKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SESSKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AD_SUBKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KPASSWD_ACCESSDENIED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KPASSWD_AUTHERROR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KPASSWD_BAD_VERSION.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KPASSWD_HARDERROR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KPASSWD_INITIAL_FLAG_NEEDED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KPASSWD_MALFORMED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KPASSWD_SOFTERROR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_KPASSWD_SUCCESS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ALL_ACCT_EXPTIME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ALL_LAST_INITIAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ALL_LAST_RENEWAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ALL_LAST_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ALL_LAST_TGT_ISSUED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ALL_PW_EXPTIME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_NONE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ONE_ACCT_EXPTIME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ONE_LAST_INITIAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ONE_LAST_RENEWAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ONE_LAST_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ONE_LAST_TGT_ISSUED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_LRQ_ONE_PW_EXPTIME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_ENTERPRISE_PRINCIPAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_ENT_PRINCIPAL_AND_ID.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_MS_PRINCIPAL_AND_ID.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_PRINCIPAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_SMTP_NAME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_SRV_HST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_SRV_INST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_SRV_XHST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_UID.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_UNKNOWN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_WELLKNOWN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_NT_X500_PRINCIPAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_ATTRIBUTES_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_CLIENT_CLAIMS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_CLIENT_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_CREDENTIALS_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_DELEGATION_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_DEVICE_CLAIMS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_DEVICE_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_FULL_CHECKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_LOGON_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_PRIVSVR_CHECKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_REQUESTOR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_SERVER_CHECKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_TICKET_CHECKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PAC_UPN_DNS_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_AFS3_SALT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_AP_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_AS_CHECKSUM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_AS_FRESHNESS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_ENCRYPTED_CHALLENGE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_ENC_SANDIA_SECURID.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_ENC_TIMESTAMP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_ENC_UNIX_TIME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_ETYPE_INFO2.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_FOR_USER.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_FX_COOKIE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_FX_ERROR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_FX_FAST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_GET_FROM_TYPED_DATA.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_NONE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_OSF_DCE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_OTP_CHALLENGE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_OTP_PIN_CHANGE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_OTP_REQUEST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_PAC_OPTIONS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_PAC_REQUEST.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_PKINIT_KX.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_PK_AS_REP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_PK_AS_REP_OLD.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_PK_AS_REQ_OLD.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_PW_SALT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_REDHAT_IDP_OAUTH2.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_REDHAT_PASSKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_REFERRAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_S4U_X509_USER.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_SAM_CHALLENGE_2.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_SAM_REDIRECT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_SAM_RESPONSE_2.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_SESAME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_SPAKE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_SVR_REFERRAL_INFO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_TGS_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PADATA_USE_SPECIFIED_KVNO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_CASEFOLD.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_ENTERPRISE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_IGNORE_REALM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_COMPARE_UTF8.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_ENTERPRISE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_IGNORE_REALM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_DEF_REALM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_NO_REALM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_PARSE_REQUIRE_REALM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_DISPLAY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_NO_REALM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRINCIPAL_UNPARSE_SHORT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PRIV.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PROMPT_TYPE_PASSWORD.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PROMPT_TYPE_PREAUTH.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_PVNO.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_REALM_BRANCH_CHAR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RECVAUTH_BADAUTHVERS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RECVAUTH_SKIP_VERSION.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_REFERRAL_REALM.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_PIN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_COLLECT_TOKEN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_NEXTOTP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_OTP_FLAGS_SEPARATE_PIN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_ALPHANUMERIC.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_DECIMAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_OTP_FORMAT_HEXADECIMAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_COUNT_LOW.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_FINAL_TRY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_PKINIT_FLAGS_TOKEN_USER_PIN_LOCKED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_QUESTION_OTP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PASSWORD.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_RESPONDER_QUESTION_PKINIT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_SAFE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_SAM_MUST_PK_ENCRYPT_SAD.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_SAM_SEND_ENCRYPTED_SAD.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_SAM_USE_SAD_AS_KEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_2ND_TKT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_AUTHDATA.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_FLAGS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_FLAGS_EXACT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_IS_SKEY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_KTYPE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_SRV_NAMEONLY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_TIMES.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_MATCH_TIMES_EXACT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_NOTICKET.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_OPENCLOSE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TC_SUPPORTED_KTYPES.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TGS_NAME.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TGS_NAME_SIZE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TGS_REP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TGS_REQ.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_TKT_CREDS_STEP_FLAG_CONTINUE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_VERIFY_INIT_CREDS_OPT_AP_REQ_NOFAIL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/KRB5_WELLKNOWN_NAMESTR.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/LR_TYPE_INTERPRETATION_MASK.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/LR_TYPE_THIS_SERVER_ONLY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/MAX_KEYTAB_NAME_LEN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/MSEC_DIRBIT.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/MSEC_VAL_MASK.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/SALT_TYPE_AFS_LENGTH.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/SALT_TYPE_NO_LENGTH.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/THREEPARAMOPEN.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_ANONYMOUS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_ENC_PA_REP.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_FORWARDABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_FORWARDED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_HW_AUTH.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_INITIAL.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_INVALID.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_MAY_POSTDATE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_OK_AS_DELEGATE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_POSTDATED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_PRE_AUTH.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_PROXIABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_PROXY.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_RENEWABLE.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/TKT_FLG_TRANSIT_POLICY_CHECKED.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/VALID_INT_BITS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/VALID_UINT_BITS.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/index.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/krb524_convert_creds_kdc.html +OLD_FILES+=usr/share/doc/krb5/doc/html/appdev/refs/macros/krb524_init_ets.html *** 2333 LINES SKIPPED *** From nobody Mon Jun 16 02:51:56 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 4bLDzx0q7dz5yNCT; Mon, 16 Jun 2025 02:51:57 +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 4bLDzw66Lcz3SLQ; Mon, 16 Jun 2025 02:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042316; 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=+5YYLrwO3BDxOjsJvp5NgLxaKoiEGxVZ2pbmUrM4ocM=; b=xilHpKilv/IxqmZt59Xpxju+VUpKZSdFTA9XDyXjYXDAR6jMvWXJtkMBhqSRrntU6j9jB0 BRg5zq1eS3QJp/5l04N38aS9hfwMaIPjNClY6nGqgW9HQutkciwAo8WUM4k2TdoqZazBWN wC4N7T/B9D0EaMMojLR7L3GqmCKBAdxju2l0mpRgL5PI+pk/FbwlVjrlE0zGBPKx/A/nXt 6AKPk97xOt7Qoj53hfEnR/aMV/OOtNfxQGgY+0wW4m4KQ2D4gLuAaJTH0GcXA508XcbHQv E9sUh2lCXRDm6pBg6yqXzFYcXT1B3D5goJB0aBXLdE8Muab662kaMs1ymKmuiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042316; 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=+5YYLrwO3BDxOjsJvp5NgLxaKoiEGxVZ2pbmUrM4ocM=; b=pUPFE52fjkfC/bwWifqJNL2iploA8f7svzRF3CJbxJFpAktAwG1POzTT9Uwfmx9mDwaxWo SXGDAsC6kj4hbdgiRdsr06rvrnkzocmUXE+ADYuthMDrkIlw/352SD3txHn+reqzF6744I BtT+DvI1Syt6+X0SNg8UuRFZC/u/RHys6P/kKq5ZquxA+TMKodVNC4/YYJ662JX1JtV6yT u5w7hFD+bR6t6It8UfbdxHbsvT+tqrLd4O/4akMcDzFsOZ8fR5RTLpiOA9PWACM5cNSnlh /+pMTnNCvfwb4riTpDnJLDBXA6tqCxB24lC8/QGv9rVEwMfrQim+PsNw4zT7Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042316; a=rsa-sha256; cv=none; b=qoDBTbeeue7TD2iDtKjzEjEFxSSz6MYeWDgovmaJQqEqVnG1R5PL01z0XFjoAHdPCL0ZbV nnfRbhrtQJroD/biD3c9V4y6YgNABV2dIPeHfKQFYXFGs7XY7Wf7jYinLvSHXm7g5lzQgJ NFDZqCCXtZShYo964zI/W/j82PGRpGyQaucct2RwLVEHxt1zvIYo5D1EMdQxamMpJtLtCp lIGu2TiOXkCARzcomlBf6pYFQMK9jkAaGt083m5DwcAXvVFVDhHRpS8CNX+zZQDVxUew/J G2vlKqqT6tfV6jywUUDHFClIdBDmiILwInfvYcJCcRmvgSv6U3cFjfhtMPx3CQ== 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 4bLDzw5Tr7zgln; Mon, 16 Jun 2025 02:51:56 +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 55G2puTH063160; Mon, 16 Jun 2025 02:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pupj063157; Mon, 16 Jun 2025 02:51:56 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:56 GMT Message-Id: <202506160251.55G2pupj063157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 4103f8dd57b2 - main - rc.d: Add MIT KRB5 krb5kdc support 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4103f8dd57b2a4985ff547c879cc05684932a874 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4103f8dd57b2a4985ff547c879cc05684932a874 commit 4103f8dd57b2a4985ff547c879cc05684932a874 Author: Cy Schubert AuthorDate: 2025-06-11 02:48:06 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:37 +0000 rc.d: Add MIT KRB5 krb5kdc support MIT KRB5 krb5kdc differs from the Heimdal kdc. - The MIT kdc is named krb5kdc while the Heimdal one is named kdc. - krb5kdc -d flag has a different meaning. krb5kdc -d specifies a database name. While the Heimdal kdc uses the -d flag to daemonize it. krb5kdc automaticially daemonizes itself unless the -n flag is specified. We do this by looking at the name of the kdc program to determine if we assume it's a Heimdal kdc or the MIT krb5kdc. Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50813 --- libexec/rc/rc.conf | 2 +- libexec/rc/rc.d/kdc | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index f88bd3919f8b..00f4b718bfad 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -326,7 +326,7 @@ resolv_enable="YES" # Enable resolv / resolvconf # kerberos. Do not run the admin daemons on slave servers # kdc_enable="NO" # Run a kerberos 5 KDC (or NO). -kdc_program="/usr/libexec/kdc" # path to kerberos 5 KDC +kdc_program="" # path to kerberos 5 KDC kdc_flags="" # Additional flags to the kerberos 5 KDC kdc_restart="NO" # Auto restart kdc on abnormal termination kdc_restart_delay="" # Auto restart delay seconds diff --git a/libexec/rc/rc.d/kdc b/libexec/rc/rc.d/kdc index 621129b20164..204b08f1e99c 100755 --- a/libexec/rc/rc.d/kdc +++ b/libexec/rc/rc.d/kdc @@ -20,7 +20,22 @@ set_rcvar_obsolete kerberos5_server_enable kdc_enable set_rcvar_obsolete kerberos5_server kdc_program set_rcvar_obsolete kerberos5_server_flags kdc_flags +default_kdc_programs='/usr/libexec/kdc /usr/libexec/kdc /usr/libexec/krb5kdc /usr/local/sbin/krb5kdc' + load_rc_config $name + +# XXX Remove the following block of code when Heimdal is removed +if [ -z "${kdc_program}" ]; then + for i in ${default_kdc_programs}; do + if [ -x "${i}" ]; then + kdc_program=${i} + break + fi + done +fi + +command="${kdc_program}" + if [ "${kdc_program}" = /usr/libexec/kdc -o \ "${kdc_program}" = /usr/local/libexec/kdc ]; then detach="--detach" From nobody Mon Jun 16 02:51:58 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 4bLDzz4Jx6z5yMxn; Mon, 16 Jun 2025 02:51:59 +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 4bLDzz0wrpz3SM0; Mon, 16 Jun 2025 02:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042319; 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=ZjuNhZSnhUyxeYxfsURil3dEeBE4vra4pj+lh9JkJPQ=; b=m1VQSlFAV+zOlZ7k6YCzJmdJWW0/75g/gkXL4zf/0CBoKqW3DnYyQrIFyO/RC0HCOVk/x8 ytuYxAv/bKndp523yvWTD0r933Y/BnlUxcu9bF7zF4BT7vLBukucwSvsO53ebnHn8qMUNY WhVgIBvw18OV/p8vF4JWQId4TTUucX2b4WRc/zmhGWn2uqLRvnjM67r2Z1zfyW3tfTW8dw kodBpAX10x7t8g2/5+s8jGS9F6ZSZGYqPRScwhnsg4fT2+4JTteSm4AvPYgOz02s2nYJOo Yq6JmO1uHrZpxFYrJNaHmljme6SrAVLMwdI+ZI11rhWCPeiUi+mQsJx3x3W+GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042319; 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=ZjuNhZSnhUyxeYxfsURil3dEeBE4vra4pj+lh9JkJPQ=; b=lF894XEbVq2C9Yi6E8Yu2YGF9jGPSr2n+VipBdnlLviOz1vS82YGOEHwi5nLS07A0dVr3f lCfAobfWVNs6qo31gi6YOtcBCdAkNRC2nCHGhCXfozCewNMmsJlmrfj4kAyWA8QXWbD3j+ TlK/cYGRLPrVTJ3j+lNHkg1V2E27g5RMYVkrEUMoarhXPJzSEHKECV77+7qb1aWAq9uGd3 kFbd61bzEp1l+vgKU/OYI9tl8k8+YfMDnvT8Um20XMNfVgvdyVCW3R5yl5AUIk9jBBWJT2 RuAZNrQiubAnbdSObuvNfZl6pEiMVZt3ttG/5PwUB2ceDXHICfOIRn/fx9ln8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042319; a=rsa-sha256; cv=none; b=rhBcRIOD6rfqmeXQgxTfvIbzu9oDuvO/XmegTsfs8py1GsjpfL/2vxalOyG7h9Z9eypvKo sS+JyxJW0IDlyod9y6LRny4aLJjrWbm2IovGySDhR9V4nMQBTwyJbi7P444AXzuWChamEd 6oTazZWpXwdX8PNh6iUpW8cNxiCgA/rWc/SmP+EM3Bz+2VhyH4Ga8weYLcVJ1OSOYIBqxn A2nQIkxkmNp9SblFqrZVT2MNwYbAEcuZLVunJRPAv3mK9euDGf/zueUUvbQEK+t5oBz53Z m6w2jcJdyO5jEcPkHyBiddadeL4WCvJcZfk9R26D2QaUEdB/FtuJjF0ZhVn35A== 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 4bLDzz0Drnzglp; Mon, 16 Jun 2025 02:51:59 +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 55G2pwOl063234; Mon, 16 Jun 2025 02:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pwx4063231; Mon, 16 Jun 2025 02:51:58 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:58 GMT Message-Id: <202506160251.55G2pwx4063231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 7e35117eb07f - main - Makefile: Hook MIT KRB5 into the build 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e35117eb07f86c385656ecc6a2a92093be98131 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7e35117eb07f86c385656ecc6a2a92093be98131 commit 7e35117eb07f86c385656ecc6a2a92093be98131 Author: Cy Schubert AuthorDate: 2025-06-11 02:57:54 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:37 +0000 Makefile: Hook MIT KRB5 into the build Add tests for MK_MITKRB5. If "yes" build MIT KRB5. If "no" build Heimdal. The default is MK_MITKRB5 = no, added by "krb5: Add build plumbing". At some point we will change the default to MK_MITKRB5 = yes. A ports exp-run will need to be successfully run first. Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50815 --- Makefile.inc1 | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.libcompat | 4 +++ tools/build/Makefile | 64 +++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 588f95654e99..97bd81f3263f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -429,8 +429,12 @@ SUBDIR+=cddl .endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" +.if ${MK_MITKRB5} != "no" +SUBDIR+=krb5 +.else SUBDIR+=kerberos5 .endif +.endif .if ${MK_RESCUE} != "no" SUBDIR+=rescue .endif @@ -2611,6 +2615,22 @@ ${_bt}-usr.bin/mkcsmapper: ${_bt}-usr.bin/yacc ${_bt_lex_depend} .endif .if ${MK_KERBEROS} != "no" +.if ${MK_MITKRB5} != "no" +_kerberos5_bootstrap_tools= \ + krb5/util/build-tools \ + krb5/util/compile_et \ + krb5/util/support \ + krb5/util/et \ + lib/ncurses/tinfo \ + lib/libedit \ + krb5/util/ss \ + krb5/util/profile \ + krb5/util/verto +# krb5/include \ +# krb5/lib/crypto \ +# krb5/lib/krb5 \ +# krb5/lib/gssapi +.else _kerberos5_bootstrap_tools= \ kerberos5/tools/make-roken \ kerberos5/lib/libroken \ @@ -2619,6 +2639,7 @@ _kerberos5_bootstrap_tools= \ kerberos5/tools/slc \ usr.bin/compile_et +.endif .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} .for _tool in ${_kerberos5_bootstrap_tools} ${_bt}-${_tool}: ${_bt}-usr.bin/yacc ${_bt_lex_depend} @@ -3185,6 +3206,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ + ${_krb5_util_et} \ + ${_krb5_util_profile} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libc++ \ lib/libelf lib/libexpat \ @@ -3197,6 +3220,18 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_lib_casper} \ lib/ncurses/tinfo \ lib/ncurses/ncurses \ + lib/libedit \ + ${_krb5_util_ss} \ + ${_krb5_util_support} \ + ${_krb5_util_verto} \ + ${_krb5_lib_krb5} \ + ${_krb5_lib_crypto} \ + ${_krb5_lib_gssapikrb5} \ + ${_krb5_lib_gssrpc} \ + ${_krb5_lib_kdb5} \ + ${_krb5_lib_krad} \ + ${_krb5_lib_kadm5srvmit} \ + ${_krb5_lib_kadm5clntmit} \ lib/libpam/libpam lib/libthr \ ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ @@ -3236,6 +3271,8 @@ _lib_libradius= lib/libradius lib/ncurses/ncurses__L: lib/ncurses/tinfo__L +lib/libedit__L: lib/ncurses/ncurses__L + .if ${MK_OFED} != "no" _prebuild_libs+= \ lib/ofed/libibverbs \ @@ -3335,17 +3372,45 @@ secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_LDNS} != "no" secure/lib/libssh__L: lib/libldns__L .endif + .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_MITKRB5} != "no" +secure/lib/libssh__L: lib/libgssapi__L krb5/lib/krb5__L \ + krb5/util/et__L lib/libmd__L krb5/util/support__L +.else secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L .endif .endif .endif +.endif _secure_lib= secure/lib .endif .if ${MK_KERBEROS} != "no" +.if ${MK_MITKRB5} != "no" +krb5/util/et__L: krb5/util/support__L +krb5/util/profile__L: krb5/util/et__L krb5/util/support__L +krb5/lib/crypto__L: krb5/util/et__L krb5/util/support__L \ + secure/lib/libcrypto__L +krb5/lib/gssapi__L: krb5/lib/krb5__L krb5/lib/crypto__L krb5/util/et__L \ + krb5/util/support__L +krb5/lib/kadm5clnt__L: krb5/util/profile__L krb5/lib/rpc__L \ + krb5/lib/gssapi__L krb5/lib/krb5__L krb5/lib/crypto__L \ + krb5/util/support__L krb5/util/et__L +krb5/lib/kadm5srv__L: krb5/util/profile__L krb5/lib/rpc__L \ + krb5/lib/gssapi__L krb5/lib/kdb__L krb5/lib/krb5 krb5/lib/crypto__L \ + krb5/util/support__L krb5/util/et__L +krb5/lib/kdb__L: krb5/util/profile__L krb5/lib/rpc__L krb5/lib/krb5__L \ + krb5/lib/crypto__L krb5/util/et__L krb5/util/support__L krb5/lib/gssapi__L +krb5/lib/krad__L: krb5/lib/krb5__L krb5/lib/crypto__L krb5/util/et__L \ + krb5/util/support__L krb5/util/verto__L +krb5/lib/krb5__L: krb5/util/profile__L krb5/lib/crypto__L krb5/util/et__L \ + krb5/util/support__L +krb5/lib/rpc__L: krb5/lib/gssapi__L krb5/lib/krb5__L krb5/lib/crypto__L \ + krb5/util/et__L krb5/util/support__L +.else kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \ @@ -3363,6 +3428,7 @@ kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L kerberos5/lib/libheimbase__L: lib/libthr__L kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L .endif +.endif lib/libsqlite3__L: lib/libthr__L @@ -3371,6 +3437,28 @@ _lib_libgssapi= lib/libgssapi .endif .if ${MK_KERBEROS} != "no" +.if ${MK_MITKRB5} != "no" +_krb5_util= krb5/util +_krb5_util_build_tools= krb5/util/build-tools +_krb5_util_compileet= krb5/util/compile_et +_krb5_util_et= krb5/util/et +_krb5_util_profile= krb5/util/profile +_krb5_util_ss= krb5/util/ss +_krb5_util_support= krb5/util/support +_krb5_util_verto= krb5/util/verto +_krb5_lib= krb5/lib +_krb5_lib_krb5= krb5/lib/krb5 +_krb5_lib_kdb5= krb5/lib/kdb +_krb5_lib_crypto= krb5/lib/crypto +_krb5_lib_gssapikrb5= krb5/lib/gssapi +_krb5_lib_gssrpc= krb5/lib/rpc +_krb5_lib_apputils= krb5/lib/apputils +_krb5_lib_kadm5clntmit= krb5/lib/kadm5clnt +_krb5_lib_kadm5srvmit= krb5/lib/kadm5srv +_krb5_lib_kadm_common= krb5/lib/kadm_common +_krb5_lib_kproputil= krb5/lib/kprop_util +_krb5_lib_krad= krb5/lib/krad +.else _kerberos5_lib= kerberos5/lib _kerberos5_lib_libasn1= kerberos5/lib/libasn1 _kerberos5_lib_libhdb= kerberos5/lib/libhdb @@ -3384,6 +3472,7 @@ _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libwind= kerberos5/lib/libwind _libcom_err= lib/libcom_err .endif +.endif .if ${MK_NIS} != "no" _lib_libypclnt= lib/libypclnt diff --git a/Makefile.libcompat b/Makefile.libcompat index 5675fa5eaff2..82ef4e9df0ac 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -91,7 +91,11 @@ _LC_LIBDIRS.yes= lib _LC_LIBDIRS.yes+= gnu/lib _LC_LIBDIRS.${MK_CDDL:tl}+= cddl/lib _LC_LIBDIRS.${MK_CRYPT:tl}+= secure/lib +.if ${MK_MITKRB5} != "no" +_LC_LIBDIRS.${MK_KERBEROS:tl}+= krb5/lib +.else _LC_LIBDIRS.${MK_KERBEROS:tl}+= kerberos5/lib +.endif .if ${MK_FILE} != "no" _libmagic= lib/libmagic diff --git a/tools/build/Makefile b/tools/build/Makefile index a9f4a84e6f7c..40ac498bfbb4 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -1,9 +1,18 @@ .PATH: ${.CURDIR}/../../include +# XXX We need to include this to avoid installing MIT KRB5 includes on +# XXX Heimdal systems. Remove the following line when Heimdal is finally +# XXX removed. +.include + LIB= egacy SRC= INCSGROUPS= INCS SYSINCS CASPERINC UFSINCS FFSINCS MSDOSFSINCS DISKINCS INCSGROUPS+= MACHINESYSINCS RPCINCS +.if ${MK_MITKRB5} != "no" +INCSGROUPS+= EDITINC K5GSSRPCINC GSSAPIINC +INCSGROUPS+= K5GSSAPIINC K52GSSAPIINC KRB5INC +.endif INCS= SYSINCSDIR= ${INCLUDEDIR}/sys @@ -15,6 +24,16 @@ MSDOSFSINCSDIR= ${INCLUDEDIR}/fs/msdosfs DISKINCSDIR= ${INCLUDEDIR}/sys/disk MACHINESYSINCSDIR= ${INCLUDEDIR}/machine RPCINCSDIR= ${INCLUDEDIR}/rpc +.if ${MK_MITKRB5} != "no" +EDITINCDIR= ${INCLUDEDIR}/edit/readline +K5GSSRPCINCDIR= ${INCLUDEDIR}/gssrpc +GSSAPIINCDIR= ${INCLUDEDIR}/gssapi +K5GSSAPIINCDIR= ${INCLUDEDIR}/gssapi_krb5 +K52GSSAPIINCDIR=${INCLUDEDIR}/gssapi_krb5/gssapi +KRB5INCDIR= ${INCLUDEDIR}/krb5 +KDB5INCDIR= ${INCLUDEDIR}/kdb5 +KADM5INCDIR= ${INCLUDEDIR}/kadm5 +.endif BOOTSTRAPPING?= 0 @@ -256,6 +275,51 @@ CLEANFILES+= subr_capability.c CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_net/cap_net.h +.if ${MK_MITKRB5} != "no" +EDITINC+= ${SRCTOP}/contrib/libedit/readline/readline.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/auth.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/auth_gss.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/auth_gssapi.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/auth_unix.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/clnt.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/netdb.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/pmap_clnt.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/pmap_prot.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/pmap_rmt.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/rpc_msg.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/rpc.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/svc_auth.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/svc.h +K5GSSRPCINC+= ${SRCTOP}/krb5/include/gssrpc/types.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/xdr.h +K5GSSRPCINC+= ${SRCTOP}/crypto/krb5/src/include/gssrpc/xdr.h +GSSAPIINC+= ${SRCTOP}/crypto/krb5/src/lib/gssapi/krb5/gssapi_krb5.h +GSSAPIINC+= ${SRCTOP}/crypto/krb5/src/lib/gssapi/generic/gssapi_alloc.h +GSSAPIINC+= ${SRCTOP}/crypto/krb5/src/lib/gssapi/generic/gssapi_generic.h +GSSAPIINC+= ${SRCTOP}/crypto/krb5/src/lib/gssapi/generic/gssapi_ext.h +K5GSSAPIINC+= ${SRCTOP}/crypto/krb5/src/include/gssapi.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/ccselect_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/certauth_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/clpreauth_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/hostrealm_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/kadm5_auth_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/kadm5_hook_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/kdcpolicy_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/kdcpreauth_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/localauth_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/locate_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/preauth_plugin.h +KRB5INC+= ${SRCTOP}/crypto/krb5/src/include/krb5/pwqual_plugin.h +INCS+= ${SRCTOP}/crypto/krb5/src/include/gssapi.h +INCS+= ${SRCTOP}/crypto/krb5/src/include/kdb.h +INCS+= ${SRCTOP}/crypto/krb5/src/include/krb5.h +INCS+= ${SRCTOP}/crypto/krb5/src/include/krad.h +INCS+= ${SRCTOP}/crypto/krb5/src/util/et/com_err.h +INCS+= ${SRCTOP}/crypto/krb5/src/util/verto/verto-module.h +INCS+= ${SRCTOP}/crypto/krb5/src/util/verto/verto.h +.endif + .if empty(SRCS) SRCS= dummy.c .endif From nobody Mon Jun 16 02:52:00 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 4bLF0041JVz5yNDt; Mon, 16 Jun 2025 02:52:00 +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 4bLF001Rcyz3SVB; Mon, 16 Jun 2025 02:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042320; 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=5hRQxAGtdfPnQPMTNJWdIoVLOfUF5+tu1QslQNxXfsI=; b=AhvDE3MS6deSqgzpPdraPBMY4FCtHrsE3wN+NGy5SCkvzYd1N8pI7nN5d+cci/2T4uO4hH Wz5FnZosiYANoCFDuHbZ31J41JUbiAnCcg0gslK5K0oBLcc/B3ayV2E4WPNlqYxVy0JsQF s9LB2eCDo1PDpa8WPApVkX6cUGDplRb3x5na/iQW5Ov8RhReWMbTzxWzKBbXO2w2cUG8sa yXqRaJOKNUaept+Mxs/1KbQnlDEeV7qfOBDdTbIwsBfWrtJEGjGq6JbUvIvnme76cqyiYD GZpCzlh4MXhwyYc3QH4i7JjYWpgjC+6+/wKsSsqmy4Z6Xz41zo7XIO2CQlsjAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042320; 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=5hRQxAGtdfPnQPMTNJWdIoVLOfUF5+tu1QslQNxXfsI=; b=w4Ggj+k6WfamwX5k3tS9qNB/PGLy6heQDcl1sefqPLBm/7huUa/tqPGcR+5D5si6CHGtAT lj+sjsILEgItQ9lcwUz0tU+McWRZ9y/QLJ03HFGQSonbnpQbH72w4p/LyQglbmD5g3pAte /w2JnbI1kO/w6A5IQCo0nZEAbHEa55XgmNg+ti9GU+XU3Be67mfEJE6y3blO+/UTUozkS4 LniMyABoTumAtpfuYQ2tvs7e/6xE3MFTPOr8fQuFiriN1fUNdaonnuBVmHs/mgjmNuYxXP dRqUvrNpl24zWnp7y70hiE3vyT5LHG963FEB2jL9TgsQlETs3pieW7X3YA3P2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042320; a=rsa-sha256; cv=none; b=IweF6v/QG1IWyOcxkr4rsm7XJ7QVEzquJ031eD9iM28D/x0OnZit7zcaoeMRaAdSv53hJH 9J0zuxjMncuqgvu/c++c6/fvfUhZURSOAw0cBjm8YLYpL04kKaaWRWY/bNslNdTwZSgBxX eEKrfrYCJgK3EQgzoudeE/f3TU0xGDccGVDh1w57LjYAiax1SV5dsHDLxn0UNXA+QdXR6a UsjCkbtuOilyO6qvXiPqwKrqFeAKp1QmZnYvQdLW6pHSaMEiMnRbYIFp690QzVYYfwDIQp JfAuIKNG28mC94kuBPQgMDv8QFzQksq77aUs7iACXvcFomwl/JXdVUR+c9N4ag== 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 4bLF000vvwzglq; Mon, 16 Jun 2025 02:52:00 +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 55G2q0Gl063275; Mon, 16 Jun 2025 02:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2q0m7063272; Mon, 16 Jun 2025 02:52:00 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:52:00 GMT Message-Id: <202506160252.55G2q0m7063272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 29d0bcfd07e3 - main - UPDATING: Add an updating entry for MIT KRB5 MIT KRB5 is not default. People may wish to play with it before it does become default. Add an UPDATING entry to discuss the anything required to update. 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29d0bcfd07e366bb5cf55b63419c3976f0a80bd6 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=29d0bcfd07e366bb5cf55b63419c3976f0a80bd6 commit 29d0bcfd07e366bb5cf55b63419c3976f0a80bd6 Author: Cy Schubert AuthorDate: 2025-06-15 04:58:35 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:38 +0000 UPDATING: Add an updating entry for MIT KRB5 MIT KRB5 is not default. People may wish to play with it before it does become default. Add an UPDATING entry to discuss the anything required to update. Bump __FreeBSD_version to indicate that MIT KRB5 has been imported. We will see an another __FreeBSD_version bump when MIT KRB5 becomes the default Kerberos. --- UPDATING | 17 +++++++++++++++++ sys/sys/param.h | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index b12d31f4bec9..80f9318d85d6 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250614: + MIT KRB5 (MIT Kerberos5) has been imported into 15-CURRENT. To + and install MIT KRB5, add WITH_MITKRB5=yes to /etc/src.conf. This + will build and install MIT KRB5 1.21.3. And it will remove Heimdal + 1.5.2 when delete-old and delete-old-libs are run. To revert back + simply buildworld/installworld again with delete-old-libs and + delete-old. + + At the moment we only know of a couple of ports that might be + affected. Adjusting libmap.conf does not circumvent runtime issues. + The few affected ports must be rebuilt. A successful exp-run will be + run before MIT KRB5 becomes default. + + Those using the KDC in FreeBSD base may wish to wait. The Heimdal + HDB is incompatible with the MIT KRB5 KDC. The migration procedure + is a little involved. + 20250603: LinuxKPI dma-mapping.h were pulled into the tree from drm-kmod. Bump _FreeBSD_version to 1500045 to be able to detect this change. diff --git a/sys/sys/param.h b/sys/sys/param.h index e167c96cf9f8..77e62439aad4 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500046 +#define __FreeBSD_version 1500047 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Mon Jun 16 06:09:09 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 4bLKMd73t3z5Vd8S; Mon, 16 Jun 2025 06:09:17 +0000 (UTC) (envelope-from herbert@skuhra.net) Received: from mail.bsd4all.net (mail.bsd4all.net [IPv6:2a01:4f8:13b:240c::25]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4bLKMd3wRsz3SBg; Mon, 16 Jun 2025 06:09:17 +0000 (UTC) (envelope-from herbert@skuhra.net) Authentication-Results: mx1.freebsd.org; none Date: Mon, 16 Jun 2025 08:09:09 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=skuhra.net; s=mail202005; t=1750054149; bh=Wv5wLb/8vbBQH+qXdaBBmSbAE1QVzH1mapideMAnJ0E=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=ijj+t5CRxZfgtuPTTzjRiOM3wc+SYBcgumDKoMYOZXwzr8zDN6fVrWmimnaUGd5Eb BipE5zLzZ8H+8Hw5Ezq6c+OJ52qvv72ohWl7rNHCESDcvY7rN7RoINEAtWuXWsbtvf BFxLzXficuCaIWh2ip0nTnoLwSMVNZ2iAhI/9LHCJzuDr9rxLa94MtHv2BZH/xtIrO UOQrGLVudif+oZa5F8Ku6pxnM1xsJiedXz2ssn38DUzosa9xJx1Yo+/JQp/apIS8Fm 1fAv6U65qibq3Q471zMzRM7Dw/JM2V5b2XIg6rLsQgR39Epvp8J2sJPCNC8iEk850x SSC2MWziCLmlw== From: "Herbert J. Skuhra" To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: af2593e3212c - main - OptionalObsoleteFiles: Support MIT KRB5 Message-ID: References: <202506160251.55G2pvSW063193@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202506160251.55G2pvSW063193@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4bLKMd3wRsz3SBg X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE] On Mon, Jun 16, 2025 at 02:51:57AM +0000, Cy Schubert wrote: > The branch main has been updated by cy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=af2593e3212ce68d9eb5e5f20d2f0c11f6ee69bd > > commit af2593e3212ce68d9eb5e5f20d2f0c11f6ee69bd > Author: Cy Schubert > AuthorDate: 2025-06-11 02:54:37 +0000 > Commit: Cy Schubert > CommitDate: 2025-06-16 02:49:37 +0000 > > OptionalObsoleteFiles: Support MIT KRB5 > > If no Kerberos is wanted (MK_KERBEROS == no) remove whatever kerberos > is installed. > > If MIT KRB5 is wanted (MK_MITKRB5 == yes) remove the Heimdal files. > > If Heimdal is wanted (MK_MITKRB5 == no) remove the MIT KRB5 files. > > Sponsored by: The FreeBSD Foundation > Differential revision: https://reviews.freebsd.org/D50814 > --- > tools/build/mk/OptionalObsoleteFiles.inc | 3257 +++++++++++++++++++++++++++++- > 1 file changed, 3251 insertions(+), 6 deletions(-) 'make delete-old' fails to remove the directories /usr/include/krb5 and /usr/include/kadm5. The leftover files are: -r--r--r-- 1 root wheel 8150 Jan 29 2022 /usr/include/kadm5/admin.h -r--r--r-- 1 root wheel 2420 Jan 29 2022 /usr/include/krb5/locate_plugin.h Should they be added to OptionalObsoleteFiles? From nobody Mon Jun 16 06:43:02 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 4bLL6k23fGz5VgPT; Mon, 16 Jun 2025 06:43:10 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [IPv6:2a01:4f8:13b:240c::25]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4bLL6j0hbHz3nfs; Mon, 16 Jun 2025 06:43:08 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=kkvqoUgF; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 2a01:4f8:13b:240c::25 as permitted sender) smtp.mailfrom=herbert@gojira.at; dmarc=none Date: Mon, 16 Jun 2025 08:43:02 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1750056182; bh=Cqqa4N/v15wu6AO9CMbsBDRF4K8/EldvKcaXN64bWZ8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=kkvqoUgFGEESF1iPNIykKzHk+m63rzdYtT1m3esotFm1fsnXK1+NBNf6lUuAcJ7GB YC7/yC2Dd1Vf4tG8CYp8w+1M3BVZ26ofs7gfHtPY13D+vrLaDjempcZ8VvBTM6KW0O YOX+1GHpOBrHniYB7/G9af94ZHZMvMK3RoQ0xFFoKbkevQNmM6TpTpb9SDPsT7KBx9 ae0zvSzDLCgUjSdaZiCq/cmYQ9i8o+FqfQA5ePbXZhYdILC2/kbgIOo7m901oJmtgm po/2bc881pv+6ruxUc8JEKHceKa87XHC3HqF21Umg79t+QzH1KWK5zY0cuxr8PlTcz 2Az7/TyA/QcHg== From: "Herbert J. Skuhra" To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: af2593e3212c - main - OptionalObsoleteFiles: Support MIT KRB5 Message-ID: References: <202506160251.55G2pvSW063193@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Result: default: False [-3.22 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.987]; NEURAL_HAM_LONG(-0.93)[-0.928]; NEURAL_HAM_SHORT(-0.80)[-0.805]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:13b:240c::25]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[gojira.at]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; DKIM_TRACE(0.00)[gojira.at:+] X-Rspamd-Queue-Id: 4bLL6j0hbHz3nfs X-Spamd-Bar: --- On Mon, Jun 16, 2025 at 08:09:09AM +0200, Herbert J. Skuhra wrote: > On Mon, Jun 16, 2025 at 02:51:57AM +0000, Cy Schubert wrote: > > The branch main has been updated by cy: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=af2593e3212ce68d9eb5e5f20d2f0c11f6ee69bd > > > > commit af2593e3212ce68d9eb5e5f20d2f0c11f6ee69bd > > Author: Cy Schubert > > AuthorDate: 2025-06-11 02:54:37 +0000 > > Commit: Cy Schubert > > CommitDate: 2025-06-16 02:49:37 +0000 > > > > OptionalObsoleteFiles: Support MIT KRB5 > > > > If no Kerberos is wanted (MK_KERBEROS == no) remove whatever kerberos > > is installed. > > > > If MIT KRB5 is wanted (MK_MITKRB5 == yes) remove the Heimdal files. > > > > If Heimdal is wanted (MK_MITKRB5 == no) remove the MIT KRB5 files. > > > > Sponsored by: The FreeBSD Foundation > > Differential revision: https://reviews.freebsd.org/D50814 > > --- > > tools/build/mk/OptionalObsoleteFiles.inc | 3257 +++++++++++++++++++++++++++++- > > 1 file changed, 3251 insertions(+), 6 deletions(-) > > 'make delete-old' fails to remove the directories /usr/include/krb5 and > /usr/include/kadm5. The leftover files are: > > -r--r--r-- 1 root wheel 8150 Jan 29 2022 /usr/include/kadm5/admin.h > -r--r--r-- 1 root wheel 2420 Jan 29 2022 > /usr/include/krb5/locate_plugin.h > > Should they be added to OptionalObsoleteFiles? Sorry, the files are already listed (three times). So it must be a different issue. From nobody Mon Jun 16 08:13:16 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 4bLN7P2wMDz5VmZX; Mon, 16 Jun 2025 08:13:53 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [IPv6:2a01:4f8:13b:240c::25]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4bLN7N6pHSz3YW3; Mon, 16 Jun 2025 08:13:52 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Date: Mon, 16 Jun 2025 10:13:16 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1750061626; bh=KIUWY8TVpPOW9WswjgTbcfnRv8GmO+LEqaI/dHOk0qk=; h=Date:Message-ID:From:To:Cc:Subject:MIME-Version:Content-Type; b=SsWpxFjA/Cz8mCyPL4u7T5rYfM0NHlG09jBIStratKPdkNk/2ueVvN0PAjFH+yyje ZQQKhrl7HzO1fTmdOYRwKilNZQTSRUP+92o/p+OboP9xsQ0xzHFKQSUX3GXDtCvj7d fvJl1hR/eyxkZm+oqn+RsuNysjR2QX2jYPVFfsh/66L7UoJN5o/q+6gMS7dFsmFeAk r4khCCtZ2Ov9wsnXJlZO65SzoG5XLKWtPyHMRbbNyrIuI9zpmqqR/GV/YkhPFOnAdq VQAm26y1VXmUzFBfpgEGp2tb9LpDRXMrUlXTfkyg3RKReEBVzddkmnSo6Q/4EJvXHd UU/wQ+b6zAcgQ== Message-ID: <87ldpsumsj.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 29d0bcfd07e3 - main - UPDATING: Add an updating entry for MIT KRB5 MIT KRB5 is not default. People may wish to play with it before it does become default. Add an UPDATING entry to discuss the anything required to update. In-Reply-To: <202506160252.55G2q0m7063272@gitrepo.freebsd.org> References: <202506160252.55G2q0m7063272@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 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 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4bLN7N6pHSz3YW3 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE] Hi. Sorry, me again!=20 On Mon, 16 Jun 2025 04:52:00 +0200, Cy Schubert wrote: >=20 > The branch main has been updated by cy: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D29d0bcfd07e366bb5cf55b6341= 9c3976f0a80bd6 >=20 > commit 29d0bcfd07e366bb5cf55b63419c3976f0a80bd6 > Author: Cy Schubert > AuthorDate: 2025-06-15 04:58:35 +0000 > Commit: Cy Schubert > CommitDate: 2025-06-16 02:49:38 +0000 >=20 > UPDATING: Add an updating entry for MIT KRB5 MIT KRB5 is not default. > People may wish to play with it before it does become default. Add an > UPDATING entry to discuss the anything required to update. > =20 > Bump __FreeBSD_version to indicate that MIT KRB5 has been imported. > =20 > We will see an another __FreeBSD_version bump when MIT KRB5 becomes > the default Kerberos. > --- > UPDATING | 17 +++++++++++++++++ > sys/sys/param.h | 2 +- > 2 files changed, 18 insertions(+), 1 deletion(-) >=20 > diff --git a/UPDATING b/UPDATING > index b12d31f4bec9..80f9318d85d6 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -27,6 +27,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: > world, or to merely disable the most expensive debugging functionality > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > =20 > +20250614: > + MIT KRB5 (MIT Kerberos5) has been imported into 15-CURRENT. To > + and install MIT KRB5, add WITH_MITKRB5=3Dyes to /etc/src.conf. This ^^^ Remove? > + will build and install MIT KRB5 1.21.3. And it will remove Heimdal > + 1.5.2 when delete-old and delete-old-libs are run. To revert back > + simply buildworld/installworld again with delete-old-libs and > + delete-old. > + > + At the moment we only know of a couple of ports that might be > + affected. Adjusting libmap.conf does not circumvent runtime issues. > + The few affected ports must be rebuilt. A successful exp-run will be > + run before MIT KRB5 becomes default. > + > + Those using the KDC in FreeBSD base may wish to wait. The Heimdal > + HDB is incompatible with the MIT KRB5 KDC. The migration procedure > + is a little involved. > + I've followed the steps and after running make delete-old I still have heimdal files (executables, headers, etc.) on my system, e.g: $ hxtool --version hxtool (Heimdal 1.5.2) Copyright 1995-2011 Kungliga Tekniska H=F6gskolan Send bug-reports to heimdal-bugs@h5l.org $ kcc --version kcc (Heimdal 1.5.2) Copyright 1995-2011 Kungliga Tekniska H=F6gskolan Send bug-reports to heimdal-bugs@h5l.org $ ls -l /usr/include/heim* -r--r--r-- 1 root wheel 2384 Nov 29 2024 /usr/include/heim_asn1.h -r--r--r-- 1 root wheel 1494 Nov 29 2024 /usr/include/heim_err.h -r--r--r-- 1 root wheel 7078 Nov 29 2024 /usr/include/heim_threads.h -r--r--r-- 1 root wheel 5226 Nov 29 2024 /usr/include/heimbase.h -r--r--r-- 1 root wheel 3870 Nov 29 2024 /usr/include/heimntlm-protos.h -r--r--r-- 1 root wheel 4970 Nov 29 2024 /usr/include/heimntlm.h From nobody Mon Jun 16 08:29:23 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 4bLNTH5pHNz5Vn3b; Mon, 16 Jun 2025 08:29:23 +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 4bLNTH3FM2z3dkl; Mon, 16 Jun 2025 08:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750062563; 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=sYPcA/7Y07W3m6iBM3z/B7Z/B5XXDSPjpMn5BRjXOfQ=; b=XooCch7txp+lZ7v/ixobCAneZYOCuwsl3VT1pD4Pi4V0j8SSIzERSZ2oOSOSt8H3iVWQbc NpdN5jdphu5Drz5FLido4zoooKUqlJAzv4+BqigrghtnxfX7Uv3MNdvEKJWn64zzaMmgi1 4KB5kypNTdMBMlrI/hDZFHlKHqNtNY7kww2ZPp7YIoWfCEUvmgDdyA+DTv5fX43zj/sCjV cP06D9myQw/Z5u/+ejP+KVSg1D8e0+ox2324PsN07nIyogwM/06Q2TUrirOy0xytPBsigE D2euhaqxK+oTnVmR1IkleIb5hs+TS+4bGp4YMkkJf55NmxW92wodhcuQJa834g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750062563; 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=sYPcA/7Y07W3m6iBM3z/B7Z/B5XXDSPjpMn5BRjXOfQ=; b=Wxhcuzcbi98eG1FWXbuub7KUEHjBTGeVC/rpBCAD+cyJ8XjondoVL00zbOt8BrtzAzyW1i 1pS2aNw/IlNXFhtM8rxnSQFTdFwNA6pTB/ZggzJJsj8VHHzCIk3R6GCU6p6Yu3+wMVinvV m0ybY72UsL3WAWqTQM2JTLb08Pd4zpfM8LdliRnwL9JBXin/5XQsK1N2Nwb9R42M9CUBmi bEepoAL86XgmuSbBEH8y5EUCdnmSeC2E5zV7GKLljtSIXVyVK6thmmlHWD4qpJIjKUVf8f 0Jp7TsDwDHGKmMvWwQKSmIVdus2P47QKMmoRWDEc0DDnARCD4AJNRfEY8DM0DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750062563; a=rsa-sha256; cv=none; b=jChB7MFoGXqNUolqyNMWTK6clZeH3RZVJUiqtNm1IvriJgBCYn2fTwnzwAl/YksWtSJlWy 4ar/2kZ9qQ4doa6eGKyzUoDz47S83KHgzdqTg+HUEAnKBCeFoW8kzK48E2NU6zhonv2pRL bnc+jfKxw4Dw0T0z1Y+G9Z5KkTz9zTHk4vCTvfVCdrp+qHWSPgUDhq5oz/dLwMQyIBoUPZ y2DS8YmxiI/5XASRA4k6bmzZFzx9a81zjh1UBQL3r4zeXflhKc2kaGWmv8p0VouemcmajV S4baBabRFBfXpx/N8lVuiU8972MlylbtfSjbCRqiCEpI9gdgcC+NwwWZoiXyhQ== 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 4bLNTH2BFlzqsV; Mon, 16 Jun 2025 08:29:23 +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 55G8TNar088404; Mon, 16 Jun 2025 08:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G8TN0p088401; Mon, 16 Jun 2025 08:29:23 GMT (envelope-from git) Date: Mon, 16 Jun 2025 08:29:23 GMT Message-Id: <202506160829.55G8TN0p088401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2a05d577ab30 - main - nuageinit: add a post network script 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a05d577ab30dcefcf51def4c65a64af30610c85 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2a05d577ab30dcefcf51def4c65a64af30610c85 commit 2a05d577ab30dcefcf51def4c65a64af30610c85 Author: Baptiste Daroussin AuthorDate: 2025-06-16 08:23:27 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-16 08:29:19 +0000 nuageinit: add a post network script refactor nuageinit to allow a 3rd execution point during boot: 1. nuageinit is invoked before NETWORKING with a minimalistic network setup for openstrack and potentially other network config setup. it tries to configure everything which is not requiring any network. 2. nuageinit is invoked again post NETWORKING but pre SERVERS, in the phase it does all that requires network, like dealing with packages. Note that creating users have been moved to this phase to allow the installation of shells like bash or zsh prior the creation of the users, before that the user creation was failing if a non installed shell was requested. 3. nuageinit will execute at the rc.local time all the specified scripts and commands. MFC After: 1 week --- libexec/nuageinit/nuageinit | 399 ++++++++++++++++++++--------------- libexec/nuageinit/tests/nuageinit.sh | 34 +-- libexec/rc/rc.d/Makefile | 1 + libexec/rc/rc.d/nuageinit_post_net | 25 +++ 4 files changed, 275 insertions(+), 184 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index d8aa734cb122..ecad3feb7ad4 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -69,6 +69,109 @@ local function get_ifaces() return myifaces end +local function sethostname(obj) + -- always prefer fqdn is specified over hostname + if obj.fqdn then + nuage.sethostname(obj.fqdn) + elseif obj.hostname then + nuage.sethostname(obj.hostname) + end +end + +local function groups(obj) + if obj.groups == nil then return end + + for n, g in pairs(obj.groups) do + if (type(g) == "string") then + local r = nuage.addgroup({name = g}) + if not r then + nuage.warn("failed to add group: " .. g) + end + elseif type(g) == "table" then + for k, v in pairs(g) do + nuage.addgroup({name = k, members = v}) + end + else + nuage.warn("invalid type: " .. type(g) .. " for users entry number " .. n) + end + end +end + +local function create_default_user(obj) + if not obj.users then + -- default user if none are defined + nuage.adduser(default_user) + end +end + +local function users(obj) + if obj.users == nil then return end + + for n, u in pairs(obj.users) do + if type(u) == "string" then + if u == "default" then + nuage.adduser(default_user) + else + nuage.adduser({name = u}) + end + elseif type(u) == "table" then + -- ignore users without a username + if u.name == nil then + goto unext + end + local homedir = nuage.adduser(u) + if u.ssh_authorized_keys then + for _, v in ipairs(u.ssh_authorized_keys) do + nuage.addsshkey(homedir, v) + end + end + if u.sudo then + nuage.addsudo(u) + end + else + nuage.warn("invalid type : " .. type(u) .. " for users entry number " .. n) + end + ::unext:: + end +end + +local function ssh_keys(obj) + if obj.ssh_keys == nil then return end + if type(obj.ssh_keys) ~= "table" then + nuage.warn("Invalid type for ssh_keys") + return + end + + for key, val in pairs(obj.ssh_keys) do + for keyname, keytype in key:gmatch("(%w+)_(%w+)") do + local sshkn = nil + if keytype == "public" then + sshkn = "ssh_host_" .. keyname .. "_key.pub" + elseif keytype == "private" then + sshkn = "ssh_host_" .. keyname .. "_key" + end + if sshkn then + local sshkey, path = open_ssh_key(sshkn) + if sshkey then + sshkey:write(val .. "\n") + sshkey:close() + end + if keytype == "private" then + sys_stat.chmod(path, 384) + end + end + end + end +end + +local function ssh_authorized_keys(obj) + if obj.ssh_authorized_keys == nil then return end + local homedir = nuage.adduser(default_user) + for _, k in ipairs(obj.ssh_authorized_keys) do + nuage.addsshkey(homedir, k) + end +end + local function install_packages(packages) if not nuage.pkg_bootstrap() then nuage.warn("Failed to bootstrap pkg, skip installing packages") @@ -80,11 +183,106 @@ local function install_packages(packages) nuage.warn("Failed to install : " .. p) end else - nuage.warn("Invalid type : " .. type(p) .. " for packages entry number " .. n) + nuage.warn("Invalid type: " .. type(p) .. " for packages entry number " .. n) end end end +-- Set network configuration from user_data +local function network_config(obj) + if obj.network == nil then return end + + local ifaces = get_ifaces() + local network = open_config("network") + local routing = open_config("routing") + local ipv6 = {} + for _, v in pairs(obj.network.ethernets) do + if not v.match then + goto next + end + if not v.match.macaddress then + goto next + end + if not ifaces[v.match.macaddress] then + nuage.warn("not interface matching: " .. v.match.macaddress) + goto next + end + local interface = ifaces[v.match.macaddress] + if v.dhcp4 then + network:write("ifconfig_" .. interface .. '="DHCP"\n') + elseif v.addresses then + for _, a in pairs(v.addresses) do + if a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then + network:write("ifconfig_" .. interface .. '="inet ' .. a .. '"\n') + else + network:write("ifconfig_" .. interface .. '_ipv6="inet6 ' .. a .. '"\n') + ipv6[#ipv6 + 1] = interface + end + end + end + if v.gateway4 then + routing:write('defaultrouter="' .. v.gateway4 .. '"\n') + end + if v.gateway6 then + routing:write('ipv6_defaultrouter="' .. v.gateway6 .. '"\n') + routing:write("ipv6_route_" .. interface .. '="' .. v.gateway6) + routing:write(" -prefixlen 128 -interface " .. interface .. '"\n') + end + ::next:: + end + if #ipv6 > 0 then + network:write('ipv6_network_interfaces="') + network:write(table.concat(ipv6, " ") .. '"\n') + network:write('ipv6_default_interface="' .. ipv6[1] .. '"\n') + end + network:close() + routing:close() +end + +local function ssh_pwauth(obj) + if obj.ssh_pwauth == nil then return end + + local value = "no" + if obj.ssh_pwauth then + value = "yes" + end + nuage.update_sshd_config("PasswordAuthentication", value) +end + +local function runcmd(obj) + if obj.runcmd == nil then return end + local f = nil + for _, c in ipairs(obj.runcmd) do + if f == nil then + nuage.mkdir_p(root .. "/var/cache/nuageinit") + f = assert(io.open(root .. "/var/cache/nuageinit/runcmds", "w")) + f:write("#!/bin/sh\n") + end + f:write(c .. "\n") + end + if f ~= nil then + f:close() + sys_stat.chmod(root .. "/var/cache/nuageinit/runcmds", 493) + end +end + +local function packages(obj) + if obj.package_update then + nuage.update_packages() + end + if obj.package_upgrade then + nuage.upgrade_packages() + end + if obj.packages then + install_packages(obj.packages) + end +end + +local function chpasswd(obj) + if obj.chpasswd == nil then return end + nuage.chpasswd(obj.chpasswd) +end + local function config2_network(p) local parser = ucl.parser() local f = io.open(p .. "/network_data.json") @@ -222,7 +420,7 @@ elseif citype == "nocloud" then if hostname then nuage.sethostname(hostname) end -else +elseif citype ~= "postnet" then nuage.err("Unknown cloud init type: " .. citype) end @@ -241,185 +439,48 @@ if not f then os.exit(0) end local line = f:read("*l") +if citype ~= "postnet" then + local content = f:read("*a") + nuage.mkdir_p(root .. "/var/cache/nuageinit") + local tof = assert(io.open(root .. "/var/cache/nuageinit/user_data", "w")) + tof:write(line .. "\n" .. content) + tof:close() +end f:close() if line == "#cloud-config" then + local pre_network_calls = { + sethostname, + groups, + create_default_user, + ssh_keys, + ssh_authorized_keys, + network_config, + ssh_pwauth, + runcmd + } + + local post_network_calls = { + packages, + users, + chpasswd + } + f = io.open(ni_path .. "/" .. ud) local obj = yaml.eval(f:read("*a")) f:close() if not obj then nuage.err("error parsing cloud-config file: " .. ud) end - -- always prefer fqdn is specified over hostname - if obj.fqdn then - nuage.sethostname(obj.fqdn) - elseif obj.hostname then - nuage.sethostname(obj.hostname) - end - if obj.groups then - for n, g in pairs(obj.groups) do - if (type(g) == "string") then - local r = nuage.addgroup({name = g}) - if not r then - nuage.warn("failed to add group: " .. g) - end - elseif type(g) == "table" then - for k, v in pairs(g) do - nuage.addgroup({name = k, members = v}) - end - else - nuage.warn("invalid type: " .. type(g) .. " for users entry number " .. n) - end - end - end - if obj.users then - for n, u in pairs(obj.users) do - if type(u) == "string" then - if u == "default" then - nuage.adduser(default_user) - else - nuage.adduser({name = u}) - end - elseif type(u) == "table" then - -- ignore users without a username - if u.name == nil then - goto unext - end - local homedir = nuage.adduser(u) - if u.ssh_authorized_keys then - for _, v in ipairs(u.ssh_authorized_keys) do - nuage.addsshkey(homedir, v) - end - end - if u.sudo then - nuage.addsudo(u) - end - else - nuage.warn("invalid type : " .. type(u) .. " for users entry number " .. n) - end - ::unext:: - end - else - -- default user if none are defined - nuage.adduser(default_user) - end - if obj.ssh_keys and type(obj.ssh_keys) == "table" then - for key, val in pairs(obj.ssh_keys) do - for keyname, keytype in key:gmatch("(%w+)_(%w+)") do - local sshkn = nil - if keytype == "public" then - sshkn = "ssh_host_" .. keyname .. "_key.pub" - elseif keytype == "private" then - sshkn = "ssh_host_" .. keyname .. "_key" - end - if sshkn then - local sshkey, path = open_ssh_key(sshkn) - if sshkey then - sshkey:write(val .. "\n") - sshkey:close() - end - if keytype == "private" then - sys_stat.chmod(path, 384) - end - end - end - end - end - if obj.ssh_authorized_keys then - local homedir = nuage.adduser(default_user) - for _, k in ipairs(obj.ssh_authorized_keys) do - nuage.addsshkey(homedir, k) - end - end - if obj.network then - local ifaces = get_ifaces() - local network = open_config("network") - local routing = open_config("routing") - local ipv6 = {} - for _, v in pairs(obj.network.ethernets) do - if not v.match then - goto next - end - if not v.match.macaddress then - goto next - end - if not ifaces[v.match.macaddress] then - nuage.warn("not interface matching: " .. v.match.macaddress) - goto next - end - local interface = ifaces[v.match.macaddress] - if v.dhcp4 then - network:write("ifconfig_" .. interface .. '="DHCP"\n') - elseif v.addresses then - for _, a in pairs(v.addresses) do - if a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then - network:write("ifconfig_" .. interface .. '="inet ' .. a .. '"\n') - else - network:write("ifconfig_" .. interface .. '_ipv6="inet6 ' .. a .. '"\n') - ipv6[#ipv6 + 1] = interface - end - end - end - if v.gateway4 then - routing:write('defaultrouter="' .. v.gateway4 .. '"\n') - end - if v.gateway6 then - routing:write('ipv6_defaultrouter="' .. v.gateway6 .. '"\n') - routing:write("ipv6_route_" .. interface .. '="' .. v.gateway6) - routing:write(" -prefixlen 128 -interface " .. interface .. '"\n') - end - ::next:: - end - if #ipv6 > 0 then - network:write('ipv6_network_interfaces="') - network:write(table.concat(ipv6, " ") .. '"\n') - network:write('ipv6_default_interface="' .. ipv6[1] .. '"\n') - end - network:close() - routing:close() - end - if obj.ssh_pwauth ~= nil then - local value = "no" - if obj.ssh_pwauth then - value = "yes" - end - nuage.update_sshd_config("PasswordAuthentication", value) - end - if obj.chpasswd ~= nil then - nuage.chpasswd(obj.chpasswd) - end - if obj.runcmd then - f = nil - for _, c in ipairs(obj.runcmd) do - if f == nil then - nuage.mkdir_p(root .. "/var/cache/nuageinit") - f = assert(io.open(root .. "/var/cache/nuageinit/runcmds", "w")) - f:write("#!/bin/sh\n") - end - f:write(c .. "\n") - end - if f ~= nil then - f:close() - sys_stat.chmod(root .. "/var/cache/nuageinit/runcmds", 493) - end - end - if obj.packages then - install_packages(obj.packages) - end - if obj.package_update then - nuage.update_packages() + local calls_table = pre_network_calls + if citype == "postnet" then + calls_table = post_network_calls end - if obj.package_upgrade then - nuage.upgrade_packages() + + for i = 1, #calls_table do + calls_table[i](obj) end elseif line:sub(1, 2) == "#!" then -- delay for execution at rc.local time -- - f = io.open(ni_path .. "/" .. ud) - local content = f:read("*a") - f:close() - nuage.mkdir_p(root .. "/var/cache/nuageinit") - f = assert(io.open(root .. "/var/cache/nuageinit/user_data", "w")) - f:write(content) - f:close() sys_stat.chmod(root .. "/var/cache/nuageinit/user_data", 493) end diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index fe799a2227f3..0e6335a382d2 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -122,6 +122,7 @@ users: passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > expectedgroup << EOF wheel:*:0:root,freebsd users:*:1:foobar @@ -568,7 +569,8 @@ chpasswd: - { user: "sys", password: RANDOM } EOF - atf_check -o empty -e inline:"nuageinit: Invalid entry for chpasswd.users: missing 'name'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e inline:"nuageinit: Invalid entry for chpasswd.users: missing 'name'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet # nothing modified atf_check -o inline:"sys:*:1:0::0:0:Sys:/home/sys:/bin/sh\n" pw -R $(pwd) usershow sys @@ -579,7 +581,7 @@ chpasswd: users: - { name: "sys", pwd: RANDOM } EOF - atf_check -o empty -e inline:"nuageinit: Invalid entry for chpasswd.users: missing 'password'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e inline:"nuageinit: Invalid entry for chpasswd.users: missing 'password'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet # nothing modified atf_check -o inline:"sys:*:1:0::0:0:Sys:/home/sys:/bin/sh\n" pw -R $(pwd) usershow sys @@ -591,7 +593,7 @@ chpasswd: - { name: "sys", password: RANDOM } EOF # not empty because the password is printed to stdout - atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys cat > media/nuageinit/user-data << 'EOF' @@ -602,7 +604,7 @@ chpasswd: - { name: "sys", password: RANDOM } EOF # not empty because the password is printed to stdout - atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys cat > media/nuageinit/user-data << 'EOF' @@ -613,7 +615,7 @@ chpasswd: - { name: "user", password: "$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/" } EOF # not empty because the password is printed to stdout - atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::1:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user } @@ -645,7 +647,8 @@ chpasswd: sys:RANDOM EOF - atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated consider using chpasswd.users\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated consider using chpasswd.users\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys cat > media/nuageinit/user-data << 'EOF' @@ -658,7 +661,7 @@ chpasswd: root:R EOF - atf_check -o empty -e ignore /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e ignore /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::0:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user atf_check -o match:'root:\$.*:0:0::0:0:Charlie &:/root:/bin/sh$' pw -R $(pwd) usershow root @@ -691,7 +694,8 @@ chpasswd: - sys:RANDOM EOF - atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated consider using chpasswd.users\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e inline:"nuageinit: chpasswd.list is deprecated consider using chpasswd.users\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet atf_check -o match:'sys:\$.*:1:0::1:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys cat > media/nuageinit/user-data << 'EOF' @@ -704,7 +708,7 @@ chpasswd: - root:R EOF - atf_check -o empty -e ignore /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud + atf_check -o empty -e ignore /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet atf_check -o match:'sys:\$.*:1:0::0:0:Sys:/home/sys:/bin/sh$' pw -R $(pwd) usershow sys atf_check -o inline:'user:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1:0::0:0:Sys:/home/sys:/bin/sh\n' pw -R $(pwd) usershow user atf_check -o match:'root:\$.*:0:0::0:0:Charlie &:/root:/bin/sh$' pw -R $(pwd) usershow root @@ -763,14 +767,14 @@ config2_userdata_packages_body() packages: EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:1 -e match:"attempt to index a nil value" /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -s exit:1 -e match:"attempt to index a nil value" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config packages: - yeah/plop EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -778,7 +782,7 @@ packages: - curl EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -787,7 +791,7 @@ packages: - meh: bla EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e inline:"nuageinit: Invalid type : table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e inline:"nuageinit: Invalid type : table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_update_packages_body() @@ -801,7 +805,7 @@ config2_userdata_update_packages_body() package_update: true EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg update -y\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -o inline:"pkg update -y\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_upgrade_packages_body() @@ -815,7 +819,7 @@ config2_userdata_upgrade_packages_body() package_upgrade: true EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg upgrade -y\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check -o inline:"pkg upgrade -y\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_shebang_body() diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index b505d33c68f3..8199779e5772 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -368,6 +368,7 @@ SMRCDPACKAGE= sendmail .if ${MK_NUAGEINIT} != "no" CONFGROUPS+= NIUAGEINIT NIUAGEINIT= nuageinit \ + nuageinit_post_net \ nuageinit_user_data_script NIUAGEINITPACKAGE= nuageinit .endif diff --git a/libexec/rc/rc.d/nuageinit_post_net b/libexec/rc/rc.d/nuageinit_post_net new file mode 100755 index 000000000000..bea4c5e37c5f --- /dev/null +++ b/libexec/rc/rc.d/nuageinit_post_net @@ -0,0 +1,25 @@ +#!/bin/sh +# + +# PROVIDE: nuageinit_post_net +# REQUIRE: NETWORKING devfs +# BEFORE: SERVERS +# KEYWORD: firstboot + +. /etc/rc.subr + +name="nuageinit_post_net" +desc="Post Network Cloud Init configuration" +start_cmd="execute_post_net" +stop_cmd=":" +rcvar="nuageinit_enable" + +execute_post_net() +{ + test -f /var/cache/nuageinit/post_network_config || return + /usr/libexec/nuageinit /var/cache/nuageinit/post_network_config | tee -a /var/log/nuageinit.log +} + +# Share the same config as nuageinit +load_rc_config nuageinit +run_rc_command "$1" From nobody Mon Jun 16 11:23:37 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 4bLSLL32jXz5ppty; Mon, 16 Jun 2025 11:23:38 +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 4bLSLL0V1Zz3DrK; Mon, 16 Jun 2025 11:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750073018; 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=SYgGXwXf1NrMZw4D6hTa8FYpaW0BsgBNGHlet9IbYqM=; b=H1u5Ai1X/jPAkoxqVM3GTKGGtVki+jvseG4jG7R9R2u2JLMZQft5hIhGueGR8Ol6/k3nE0 IVu2Rfd5Sj4ImfuYh4llaxfkvj+uEKy4eyfg/UV+9338aK4+f/WhZPQtsi8XSrk6VCWilS 74dABccL/0alDtMekCqvH8hvRJ7W8dvz5GWqjHqR5mlgU8UTuXsn/effHfVyr9yQoEX2+D bOeF2XJqSPznPWUSBB9rmBsjb/ixBSwMmpgvH9FfxbDnmaBiw5PoxjSk9YsqW1BXD37d1e pbGNKnJXjWrCL+5ZRYVhkEO0lpYlr33m620HVsUm4+SqipkzX/FCXnW+pCSWlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750073018; 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=SYgGXwXf1NrMZw4D6hTa8FYpaW0BsgBNGHlet9IbYqM=; b=NSvdRk8jxwKohD2R7Nz6JGUU9Am/In1gQglDB3h6STDnUv5yxCZvcusWxeM/ZyOMoRcVYc hOq3lg0iBpRIwiEQje8aaqtGpQEt0s4+L9BcOjIaVjlraVBzlBsMi5m+TXYs2/oHXUDHS/ pZEWNoVeVK/YpI6GlgNiORhh1uxyeff9DGt6jqY01YfeLgrOTlUKQTXrwFRvNxEWpA/YG/ tN6cPX/xG1gTBF7KPjldZOUX+hxXf7sEj1rorMITvgAe2wq1jRwFr68J83MiWYfwqP+y3t bIpOUxiOhb1KcA4oeULmaYuHaGDHbz6We5RJH+4fcUG9xnvd4bwgvNXeqfHn7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750073018; a=rsa-sha256; cv=none; b=kZ124aQFfAf/R0kCtk5MSFa6mAH4CpPSmu5qmjB7drM6GGiaXiEdcauLLwbtlpsziBxV7h ypYwMMjUjO6/TJQx6/TyoDfrsi5kiZfioOozsJxDP26cRf9qqu1UxKOCaq+g6Kgchy+JFX hW5o8v2P9qRVEKvYCKlTwQpu2u6LV2wyqlreQBNlhxQvRsvAtdkWNU02x6XKzeO6/xHOqC Df1QnzqRfj0eimzc1YJfVSQ3mzutHNBCX8roBchChWMJkECNF4RDLwTzcX+EmgvqnQkDrf dUoWgnKlMTHFYKJKCcv5YdmhouzwwxcDnJrbLPotK+lkIg+o0VWOwvjeNgIPhA== 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 4bLSLL01Rgzw8D; Mon, 16 Jun 2025 11:23:38 +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 55GBNb4U025065; Mon, 16 Jun 2025 11:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GBNbpU025062; Mon, 16 Jun 2025 11:23:37 GMT (envelope-from git) Date: Mon, 16 Jun 2025 11:23:37 GMT Message-Id: <202506161123.55GBNbpU025062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 968e6d3855ef - main - Makefile.inc1: attempt to fix pkgbase building 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 968e6d3855ef8bba37075677c0ea8123862d4524 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=968e6d3855ef8bba37075677c0ea8123862d4524 commit 968e6d3855ef8bba37075677c0ea8123862d4524 Author: Baptiste Daroussin AuthorDate: 2025-06-16 11:20:47 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-16 11:20:47 +0000 Makefile.inc1: attempt to fix pkgbase building After b44147bb12450bdf851a519d1cdc85402f89ed1f there is no dependence relationshop between create-packages and real-update-packages, which results on the package building cluster in a race condition real-update-packages tries to open a package which is being created by the create-packages target and make the whole build fail. Ensure create-packages and real-update-packages is sequential --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 97bd81f3263f..cff150668083 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2048,7 +2048,7 @@ package-pkg: .PHONY real-packages: stage-packages create-packages sign-packages .PHONY -real-update-packages: .PHONY +real-update-packages: .PHONY create-packages .if defined(PKG_VERSION_FROM_DIR) @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ From nobody Mon Jun 16 13:22:31 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 4bLVzX0kppz5py3c; Mon, 16 Jun 2025 13:22:32 +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 4bLVzX0CR0z46d9; Mon, 16 Jun 2025 13:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750080152; 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=LWx6puzrvioHSte4wTawyHjrtmGtMn66cLz12u320RE=; b=IQ8MSoNawZeiCqDX/MVnYVoH6BJ7J0N/PQjnMXI+FzK+C+gl+rSRfjRcebbEMGHgG0bvpc gL4Xk50CCCiFEdluvLGdRknq/JcvoPFs1zyFC8RaPoptJPagJK3dpmxI0aFZX7NfkEUtCh RLhRVElL2EXAzWBVMMT1A/PJX5P5K38HEoICcpbcd6wB4p787xGf00UcP9uTtFPiP73gf+ BlP40CLqCU1A5GP86RVb7YornGs87FFwxU0LjVgdnou+HJisr7AienJLfxcYXmmdT3VaC/ lF3jXgI/takBUdL6a/0hjK6+1SSkep9FcDFsTuxl5IrMaDDEUpd9l72ys4OxLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750080152; 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=LWx6puzrvioHSte4wTawyHjrtmGtMn66cLz12u320RE=; b=Gdu+X4PlLZSXQF/dOskynSFOCg+lo5XlB//vhPrhP+3rL9CX2jZRI40ERwHIgE4Tp6nq4M wkd0FGcUnw60z247m4zg51zoOhfFZwnCmCjyzPk4YhW1QTR6/hcnCcY8n+obfsV1Fnt5EJ xI1SKnIndYIPT1f5U0mxkXJGiD4YvVgslLAQ37E4sm4oS0AajNLgHmpJVWyTaQnciWT83B 12UrgN5kF3DbRoDCcb5o2LacJqFT50XbcJlltzQ2Y159rCaa54tBkxsm+JVqh7svOyYemD wuPCGWbcrwk79A1hlzGGp23AtTrUfekdGIP0uxqyMWwJdJAdS+cowc54wcfG3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750080152; a=rsa-sha256; cv=none; b=xHyqRi8zdWy1B+ORfIhWSX/aCC/k+3PemnvfVFS/EhYwK2udz6uvaOms3uaPQtebfiyR2l KI1SQQmAJ1cc48jB8R1C37cLJAX0F1RTOaP1LsqdOm8vUgkDS4YBSIKMctQNW8zggwOBYT f3moH17MXFwVw6fcuHEEo5nV+1oMW4iOeSyLOXD8G3s0Y59U8CQVNYoRGcmB94OsmV0kPn kbUtj9xgPylCDAwLI2nGXl4U1V6ygg0MNtnVajTzUY+HRoJpUThHWBp2+NquFDM/ck0AYe h7KEBiiKYVS7gDhnPRQbf18/ASgmMD26ty3EitWvNdk0is6fG2aEe8LNeqMunw== 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 4bLVzW6vkFz10Sk; Mon, 16 Jun 2025 13:22:31 +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 55GDMVku049677; Mon, 16 Jun 2025 13:22:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GDMVow049674; Mon, 16 Jun 2025 13:22:31 GMT (envelope-from git) Date: Mon, 16 Jun 2025 13:22:31 GMT Message-Id: <202506161322.55GDMVow049674@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ee609560ad2a - main - ptrace: Rename the internal command range constants 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee609560ad2a5fa7cacf06a3879987e118588625 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee609560ad2a5fa7cacf06a3879987e118588625 commit ee609560ad2a5fa7cacf06a3879987e118588625 Author: Mark Johnston AuthorDate: 2025-06-16 01:53:57 +0000 Commit: Mark Johnston CommitDate: 2025-06-16 13:22:15 +0000 ptrace: Rename the internal command range constants No functional change intended. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50866 --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- sys/kern/sys_process.c | 2 +- sys/sys/ptrace.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 75fdb1f544ca..e62c76924d22 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -1177,7 +1177,7 @@ freebsd32_ptrace(struct thread *td, struct freebsd32_ptrace_args *uap) pscr_args[i] = pscr_args32[i]; r.sr.pscr_args = pscr_args; break; - case PTLINUX_FIRST ... PTLINUX_LAST: + case PTINTERNAL_FIRST ... PTINTERNAL_LAST: error = EINVAL; break; default: diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 821c537065b3..70f48adc2be8 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -690,7 +690,7 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap) break; r.sr.pscr_args = pscr_args; break; - case PTLINUX_FIRST ... PTLINUX_LAST: + case PTINTERNAL_FIRST ... PTINTERNAL_LAST: error = EINVAL; break; default: diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index 13291cd31cf5..cdde142d0487 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -91,10 +91,10 @@ #include /* machine-specific requests, if any */ #ifdef _KERNEL -/* Space for Linux ptrace emulation. */ -#define PTLINUX_FIRST 128 -#define PTLINUX_LAST 191 -#define PTLINUX_GET_SC_ARGS (PTLINUX_FIRST + 0) +/* Space for ptrace commands not exposed directly to userspace. */ +#define PTINTERNAL_FIRST 128 +#define PTINTERNAL_LAST 191 +#define PTLINUX_GET_SC_ARGS (PTINTERNAL_FIRST + 0) #endif /* Events used with PT_GET_EVENT_MASK and PT_SET_EVENT_MASK */ From nobody Mon Jun 16 13:45:58 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 4bLWVh1Yglz5q1j7; Mon, 16 Jun 2025 13:46:04 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLWVf6xt5z4GQy; Mon, 16 Jun 2025 13:46:02 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=gEFrC+BB; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::734 as permitted sender) smtp.mailfrom=markjdb@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none) Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-7c5f720c717so595444185a.0; Mon, 16 Jun 2025 06:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750081561; x=1750686361; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=rtnyJJZ+w952TZ33rZMoOOIZsr89NL9wCDkFVmWg0Sw=; b=gEFrC+BB+MdXaJlpUPnSMdmhlB/Uz7MzprQwxsmXTQTxUafiJwT7ESc6p0zrGzhD4r g3Uc7LUAXWtsY8xgBTAoF0yToNvoHWm/uSM5hKe7snmozARQQ7ddpVFbSjGCASf3jpeR BLcBnjAEzcEZzPjun06iIb9b11+xLGtov3niDiNO5Mbh0XokECwUl3gWqCw2amIu988M VKp+0qwruMrtoAqCFTy+NufIEOQ550q8Va8mU8aIbrBhPBbglzKGCqCMQcEjdQINBjq6 RKv2+IdzI6xwcQwNnPFtZJI6rJ/E7vnwjb8/qytkhng0ZyuMr8JaugD7Bem3j/Xd/TRl VQgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750081561; x=1750686361; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rtnyJJZ+w952TZ33rZMoOOIZsr89NL9wCDkFVmWg0Sw=; b=O8iiA5rM6DcjSe66TK9awLFRqL5gpmgZk3jYcGRy8M8GQyFmyQWm6FvtNJ76nrwftg ETVCussEdp9FrakumWvCBijLeDJBd30JeAq+3/OHGtPgL92zuLo293a8MFlIR7tLNmu0 Ee0cFEAXK5ivMOaPkJxN5prKuHqwbPv00tZ/dHPYnZ41qQe9ueeljd1nDL8n0mQ8gVUH jzfqCszIekgukhxPJ3FJVx4CpRjXPIA3y1HIZQwg6EXkOL2/vOmCLGusQoqAH9YY13Sh NiBswLJFNZqKTxv445ZpPdkBxniOquWlQhdm3TGiCZYXuX9pOPhcGshhgA7QRNazNrTi cw1Q== X-Forwarded-Encrypted: i=1; AJvYcCWjYoU4pV3zWSZpMaUpUkMMaZ/2b3MCLCrq5dWF6B8aUGt6jiyNnzNsVgay8oS7rilPqYm/Zpk4ZQg+/Gk2Z0VvDppi@freebsd.org, AJvYcCXmlo1ClhosoO1fDGHLE++5j3UcfLxC/8Uz9kksHOacImWz1kM3ExU0JMaM0xstInbCSFogydE6xCyItjBtsYxA5fz7qxQ=@freebsd.org X-Gm-Message-State: AOJu0YyRxuPSowot4wva0SivsewYgintxRCFWhgyzux1g70ENj55+W3g aUJmZlG9DZ7vKbmtHGEgm0bZh7MtPCuNxKr6wnl6DeRZFE5oB/58qm+aoysdfR6t X-Gm-Gg: ASbGncs9PuWFCpwKRBN9DeCFEhA3t1uO+II86RQ287jEaIJLt7hXYW5ogX1VdxoOKyV Md5qKE1gd2YdZnWw37wWq5rNT3t/68+ReSABcMtm5tJr+M1SOq1p83vYrYIn+DIZ4+lng8TBIGJ 4tU8QyU1VQ8txWehfM4SXG8Gvea5QgpxkpU7kKM9WcjKUObWrItr7BSL/XyXSoYXgV4Q2Vilrl0 WJ+AKJIquAfS/4GuKiRcGc9qkR2KI8dUSGflJbArN4TcypVhyRSzxFNhdebk6rLVgy4DeNq10a0 LYCR5LV8xAMH6H8IGGSt9D9wuV31eSCvMM/w2v99H0U6vwKT2dMq6PlSt5pAJx2dNYX9L/INxBc u X-Google-Smtp-Source: AGHT+IH1fWf4gmQTyQbrzGcgQuRYbR/mhffUGfAGoDvVX4PSnrxpsvoMWuYBTevY/pHdwgc2tLdp4g== X-Received: by 2002:a05:622a:44:b0:4a6:fa1f:46a5 with SMTP id d75a77b69052e-4a73b69e837mr162702181cf.2.1750081560910; Mon, 16 Jun 2025 06:46:00 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4a72a4b148esm50218131cf.40.2025.06.16.06.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 06:46:00 -0700 (PDT) Date: Mon, 16 Jun 2025 09:45:58 -0400 From: Mark Johnston To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 7b7ba7857ce8 - main - Implement CLOCK_TAI Message-ID: References: <202506121825.55CIPemP006355@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202506121825.55CIPemP006355@gitrepo.freebsd.org> X-Spamd-Result: default: False [-1.88 / 15.00]; NEURAL_HAM_SHORT(-0.98)[-0.977]; NEURAL_HAM_MEDIUM(-0.84)[-0.844]; MID_RHS_NOT_FQDN(0.50)[]; NEURAL_HAM_LONG(-0.45)[-0.455]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; RSPAMD_URIBL_FAIL(0.00)[syzkaller.appspot.com:server fail]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; ASN_FAIL(0.00)[4.3.7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.asn6.rspamd.com:server fail]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RSPAMD_EMAILBL_FAIL(0.00)[imp.freebsd.org:server fail,nwhitehorn.freebsd.org:server fail]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::734:from]; RCPT_COUNT_THREE(0.00)[4]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4bLWVf6xt5z4GQy X-Spamd-Bar: - On Thu, Jun 12, 2025 at 06:25:40PM +0000, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7b7ba7857ce8be0bf6ab905d936d8ba1363e4ec2 > > commit 7b7ba7857ce8be0bf6ab905d936d8ba1363e4ec2 > Author: Nathan Whitehorn > AuthorDate: 2025-06-12 17:52:30 +0000 > Commit: Warner Losh > CommitDate: 2025-06-12 18:25:31 +0000 > > Implement CLOCK_TAI > > Provide a clock through clock_gettime() that returns the current TAI > time (UTC without leap seconds) as a complement to CLOCK_REALTIME. This > provides compatibility with Linux, which also provides a CLOCK_TAI since > kernel 2.6.26, and this seems to be becoming the standard way to acquire > TAI time. Unlike Linux, this code will return EINVAL if the TAI offset > (set by ntpd, ptpd, etc.) is not known since it seems pathological for > CLOCK_TAI to silently give the wrong (UTC) time if the offset is not > known as it does on Linux. kern_clock_nanosleep() asserts that kern_clock_gettime() never returns an error, and this new case breaks that: https://syzkaller.appspot.com/bug?extid=e17e46b1f0b65027b005 From nobody Mon Jun 16 13:52:58 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 4bLWff4xRcz5q1XR; Mon, 16 Jun 2025 13:52:58 +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 4bLWff3sk4z4K4L; Mon, 16 Jun 2025 13:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750081978; 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=WoXazgWTM8Xh9lLfv/itj/7pwpSB7XyfeaNyinoY6po=; b=NLGW4NqDKHJkbhmid48LGWzQEOAblOKXVe92O0Ed3WlJqu2wE1+WEbmrKczWiJku2w6GU0 48Pjr4r4R+ABn33Fwrhi4qO6u//1fMTCj3ixJuOwFS5Mv3xz63/ewQYB0qvYJAFFzZzrAi ckOix+96zCxQLkXATtpiniQO6qQKAGYODGnZVi0Mdp4mdystiy8gXbKcApqPecFX40OTxT 0OEog9oXPsVTkfcSbT+GaMXMhVTNZVK9wxNXzsXFrjRLbN2RQy+1zBe6Gg6FZhbtA/w6cf vRoHjlESa6Wl8VxxmBLaXhiKO0GaEZaRNoX0VmNoY9DsQ6xXojUcSKXrAmvUJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750081978; 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=WoXazgWTM8Xh9lLfv/itj/7pwpSB7XyfeaNyinoY6po=; b=wZ54abe4z0+MLP4RM7zcZHjhM94O2MdiceZWANk71AOktNCi2w1QpgqYDWPYCebvT8yvoj hLWEj8tlyrwKwVuJY5mEZyh2y1Oa2zVxZBy4rEkz8pInuayO1BYMqXofqvfIOjax/QhZtm KpJbb+bR2vgkt7TA0vfNW7zutSPX8lUzf6ekHb+86Xp4pk/I2EIEuOnkbsv6Zx0jPLFTS4 /jcLLUjzTwU7TFEN3ZI1KMPRMPxWFOw65DazUSwv8R2JR3hR+jT9PngsFlsFmyy20l52Jo cdeBYBTcruTZjgchEp53zK9hW8Y776ogcrpLQ5AYAONIDIsRvOB+q/Dp34aIig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750081978; a=rsa-sha256; cv=none; b=u+0ZZ9GXfFA8tvs1UDOAdRM9wRTM5iaXRhpoaQr5T3j9263G0hCqgYxbGl763gYjUih+Rq MJfRGrZISK7ajKGMh/Eti9v1N92fDZnQl9rC+iHi7ApniBLdoOTrnVP3tGoOnVjUG5Qxv0 qEvIy/usREPPc+JQmRvBHiVZzikZI+YIQSR84SbcNCEr802SfL5yiXUOayhZofjIHhyGEk P6wktjryIVKkpd4vYS1vGfgdnCdK4Nr4OHQ3aKMunxUquuhaGVmD9On04SKEAYd8olnWvH 5+0c3kzstY99KdNYAfaPApuAZMkYuvLw3P1CObcitUjQIB/kWh90axmlDI5iVQ== 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 4bLWff3Thtz11Lw; Mon, 16 Jun 2025 13:52:58 +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 55GDqwuZ005324; Mon, 16 Jun 2025 13:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GDqwSn005321; Mon, 16 Jun 2025 13:52:58 GMT (envelope-from git) Date: Mon, 16 Jun 2025 13:52:58 GMT Message-Id: <202506161352.55GDqwSn005321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: dba559e80664 - main - nuageinit: fix typo 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dba559e8066457fbb5105dcc09616ba6eb766345 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=dba559e8066457fbb5105dcc09616ba6eb766345 commit dba559e8066457fbb5105dcc09616ba6eb766345 Author: Baptiste Daroussin AuthorDate: 2025-06-16 13:52:37 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-16 13:52:47 +0000 nuageinit: fix typo --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index ecad3feb7ad4..1550440940df 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -70,7 +70,7 @@ local function get_ifaces() end local function sethostname(obj) - -- always prefer fqdn is specified over hostname + -- always prefer fqdn if specified over hostname if obj.fqdn then nuage.sethostname(obj.fqdn) elseif obj.hostname then From nobody Mon Jun 16 14:13:14 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 4bLX634ycrz5q3FB; Mon, 16 Jun 2025 14:13:15 +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 4bLX633m4Mz3Cy4; Mon, 16 Jun 2025 14:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750083195; 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=x1Ze9pu3EH9qF/eDi02KzpOJwRy36qw4UnEdDEhLn0g=; b=BYLUIERc4k43TdziKAFFbtmHLAW7fa09OLTj9q32ygqo9fC9qGNrhLVcNRgcocER1VlmoY PoPFdZYyf6J/Z2oJX7lPmOS6Vl0kJuSehSdufbPBImGH5MB7vIPr2TSCWVgtRybr0dINFT gHCGo/wCTYIfdO+RVIYK6yIfk/fplqoJOVdRB/dzEEZWmExTD2sJq0caBx5tn8PblWVdVt 0MkSqHNHsZxFFtK8kxalpxj3Nhv6IQtB7fec/GML5FBKF80U8K8JyeMXFQ8NAGGZSMxwuX Mm8aSN41NtNX//dfhBUfI/qqD3rixhLFvT8N9TJ7Dl5T8cONw4Lyx3v7/XMdVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750083195; 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=x1Ze9pu3EH9qF/eDi02KzpOJwRy36qw4UnEdDEhLn0g=; b=I+4bCnOMWYKWHmIYpA2gqvCDpRhIZx3Y3qNdIYOviHpyxLg9moKoYR+37noXYAYVbBsn2a V3AJKL2NIQuDxZgcbLOAaE8OemEitOZ0D3ue2ProBsoHsO2rYD5/DNEKiM1b5+3weWo0Cv HbyQ6Ndn76F6TFNdJ6mjVwcajZrrXgDbAHCzwjQ3Wcaj71A+ag2onC1lgOfCT5sM2Dinj3 L6Wk8rTplFrcvB6TTnX9zdGvJDjVoikFZIDeDD07cuE+zkOMxQBwPqwRS041ZIUI6yawxx wSOh+XozAOZJZQf8pG/RA6wnQ747IHlwTcD6rl1H0HSFn5iXvF6LmNdQEesoHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750083195; a=rsa-sha256; cv=none; b=CUUwK2wp3VaEhWD0eQ4SENpFNXwL09NGnAAbdowrtErbC2A9D6gJI2CEMzhOK4ntS3D9+p WZQS5fdhvsoYwQ9k7H+0TNFM/2vjJ0+VhBIH8WWTg8jHJa6InARQNI6+H8Hb7EjuZdzOtv ugy/0PmI1b04aCRHHS7qHtHzcBdrqamq8SgArtsgl48Dqvwb9r0X5lgpXSA8MXJ3RTfTl8 3wdBrVxe58eYs+eJuKfVHdodCo4FMnwKxF+6b12LkSWzFgwyOWGlva4UbkkBHjPnNftMCh kYCaGmn0HMfwYtrjjd27CUTIzS23OU3xZJ2upUXE2y/2DEeBJGWixA7pPjE/ow== 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 4bLX633K5wz11m5; Mon, 16 Jun 2025 14:13:15 +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 55GEDEiN044186; Mon, 16 Jun 2025 14:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GEDEIe044183; Mon, 16 Jun 2025 14:13:14 GMT (envelope-from git) Date: Mon, 16 Jun 2025 14:13:14 GMT Message-Id: <202506161413.55GEDEIe044183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 48af70e7c821 - main - pfsync: Remove a redundant assignment of if_type 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48af70e7c82150942fd095a38131e454e47ad162 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=48af70e7c82150942fd095a38131e454e47ad162 commit 48af70e7c82150942fd095a38131e454e47ad162 Author: Zhenlei Huang AuthorDate: 2025-06-16 14:12:03 +0000 Commit: Zhenlei Huang CommitDate: 2025-06-16 14:12:03 +0000 pfsync: Remove a redundant assignment of if_type On initializing the interface, if_alloc(IFT_PFSYNC) has set if_type already. No functional change intended. MFC after: 1 week --- sys/netpfil/pf/if_pfsync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 0795c75e8de0..31b641b43fe3 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -403,7 +403,6 @@ pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param) ifp->if_softc = sc; ifp->if_ioctl = pfsyncioctl; ifp->if_output = pfsyncoutput; - ifp->if_type = IFT_PFSYNC; ifp->if_hdrlen = sizeof(struct pfsync_header); ifp->if_mtu = ETHERMTU; mtx_init(&sc->sc_mtx, pfsyncname, NULL, MTX_DEF); From nobody Mon Jun 16 14:46:15 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 4bLXr807D9z5q4xq; Mon, 16 Jun 2025 14:46:16 +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 4bLXr76NN9z3SNs; Mon, 16 Jun 2025 14:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750085175; 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=SfAhNN4SNrjZhQPmNI5DvV/2DBlwWPQWVPrcGCfJh+8=; b=kv4FQYUotINtZCh8VpCASZ9Mb909vg/WMtzgcRzV56dGayHhds2jfA3czpRg7NFnxeJ9p9 pvi3Ku9xmc+5jf6AuRzXzqE2/eCXgWAqUFE1eKX0tzVSIuJpEM81e2ArID3xGPG74OpFwa lDaJXSz1Rnmt8LtjzakNrcENkkUkDv0CfnbqzbzK55j04UtUtpuvsWXsrsXpzopOOxl6HU 9fR0abLGnYR4VRInfH3iDlobSkCwvznXvkkWRE/sdX3okSkF2MxLIrpkc4U6GwXuZQjBnz bWeVFRP6+j5s734IR0NwUkukDRqOkHIjig/pI7ePucKz8DGatoWuBAYb26PecA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750085175; 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=SfAhNN4SNrjZhQPmNI5DvV/2DBlwWPQWVPrcGCfJh+8=; b=gmq6TzKwWXZ0YESisDv7nflZQRP+6UupvUJPLKJOJdO8sxuEnANUzdZokchFO9V6NLDEC2 KV/itRReEYVBBPOqs+zKy2tT3gnJvOItHnAB+A82+IIFS7nRop9fUHKKUYXNwavbaJgEr0 kWGTryB/w9neDvBoz5NUz0+VhKC/FoCqTLkEdmYI4t6JhSuEvBdmGOghlZAcBfdROF/IUj q4m6jkCgbuyI/7SRr/yEha60bV6A/IDaLVSl40ztfsyNnRJKcAJ57p0KNSEawhHh5Dmtw2 wXGqeFWUAQc72jIdRN5KfrdooU9lINhMWQjUHop1Dz3daJQ2f7g3tkm6OKftqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750085175; a=rsa-sha256; cv=none; b=Q94mYed91y78fcyEOzYCH7UX09c63xwjY6jC0q9rE2Js54PWyAI44kbDV1+NXgPV3GIon4 toSbk9jqZ59lSRXp9/WUXuiRyqjvo9wjcgNW6VwwjGgKgrX9ydLQHAhSt1J4Hv9gUhZjMw NKN0FZyLJ1FWp4c8Qfkimp2rbivcLmQHRLOeHGyFGldZBmzEnB6VX5akaRVOK00boLFxeR O3MNeh6E8TZg+ZYjoE+Z208pu1jHCal+cpwhLZJKuuu94bhzZbkfw76e6mQpm/9lG4V7ra IRbFvIzTDb4t7CaZfHdH8WCxE4qwnKM8GEu6rFSIDKulFKNj1tvfgpIymuDFaA== 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 4bLXr75gqpz12Lr; Mon, 16 Jun 2025 14:46:15 +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 55GEkF42001166; Mon, 16 Jun 2025 14:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GEkFVa001163; Mon, 16 Jun 2025 14:46:15 GMT (envelope-from git) Date: Mon, 16 Jun 2025 14:46:15 GMT Message-Id: <202506161446.55GEkFVa001163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: a07604e6264b - main - bridge: Remove a redundant assignment of if_type 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a07604e6264b88222941fa61c6f989bad5490765 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a07604e6264b88222941fa61c6f989bad5490765 commit a07604e6264b88222941fa61c6f989bad5490765 Author: Zhenlei Huang AuthorDate: 2025-06-16 14:35:40 +0000 Commit: Zhenlei Huang CommitDate: 2025-06-16 14:35:40 +0000 bridge: Remove a redundant assignment of if_type ether_ifattach() no longer sets if_type to IFT_ETHER and keeps it as is since the change [1]. [1] fc74a9f93a5f Stop embedding struct ifnet at the top of driver softcs No functional change intended. MFC after: 1 week --- sys/net/if_bridge.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 82a530042413..bc421a8e156d 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -852,7 +852,6 @@ bridge_clone_create(struct if_clone *ifc, char *name, size_t len, ether_ifattach(ifp, sc->sc_defaddr.octet); /* Now undo some of the damage... */ ifp->if_baudrate = 0; - ifp->if_type = IFT_BRIDGE; #ifdef VIMAGE ifp->if_reassign = bridge_reassign; #endif From nobody Mon Jun 16 14:48:34 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 4bLXtp5v4Cz5q4Fm; Mon, 16 Jun 2025 14:48:34 +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 4bLXtp5CDMz3T60; Mon, 16 Jun 2025 14:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750085314; 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=44W45Bt3IlrbMeQv5OHvhKSuNib278Asi5vSHQpwH5M=; b=tuNorH0h1p7KTc1DawSmdkEj8zxueWWUAEDd5VPSbHMVVEOCwGWkj4Iz7JD8UDJZVT7AZe zcTRTq5UxzgsndGyCS3yiczJ/wQfEPyYfPgIsrtwuK5hQ+sGei0DmZGFXwP9FU8odHei+1 OQ6oe0ggEvCXhjlyPmfkcR7Rq+wZxFhk/7VH0yxRvpostDSw2ZOvOr1aRrqUeMsuKwOSS/ jlPoV9ZjrAcpuBNsh+gE0bGDCbL/8Sf9Wj6xybLYFwNUv5SzfjCMbIaDmgfwgH/FrO92is 0QEtNrFQ5LCW2AZcRv3FovAiuHhqL1N19CE/ERNVjgQ25nZXB9p3GSgnvOfDiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750085314; 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=44W45Bt3IlrbMeQv5OHvhKSuNib278Asi5vSHQpwH5M=; b=xvoyxRmAVPifJj56t+4FmNFO8+lcj2hVonP/NNsIN18jn837j2HW+sbqS0x4xeaexY7A92 f2FWjlncB4Hz8Oa6/oE/Bp1uuA/KM7g/KLgYRTd6w/ENTVCnJty+h+mEMtg62PX55p3dO4 cGJ0s9S9A288N+/g3cSe2LhKhFxj8sd/werNb2PgR83ilvtMLV0yTwMLCCZzDJWAMLALRl ul+hahACy4VlnrWkH+4Tv/Cda2ET0Krl4zDifVvQxCpjw1PebOSZ+YAboVEGi5Fych/MW2 9OuxQ7pX+2RqcMJHg8gC/qbl2+3QiRYM4TBF3EX5dbPTHL73iccBMZMbi03HbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750085314; a=rsa-sha256; cv=none; b=fXvPArzE8N7QIag8zLU/ZZbQCNqSERWxhT0md079XSZcEdATkxdR5Ae1L12CQ/8U+3pXW9 aHSllvTZr7Y2LAZGIMBdftAvA/ekXmrMZfVF0lsyMz1Ex6hzVWIvJP38VwniE+/tdiOcAW 0H6QMFc+3joevdRWC3DWXhnZbLhI8QoLk9Ztob1kqpIkFp7cuIW9/5ZSTpOA5uRXBJ54k/ faHoz0DuRGbe5FezACPLP/IDcPGEhgrRDBUePiDJVmNxJyT4BPPdZDabKw0NrShq6A6fs5 +BoK4+S36slDYkrUmWs4IctrVpmeBuYAlDdNlIr58I/cPy2RDWFSLc405Urz7w== 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 4bLXtp49Gjz12cr; Mon, 16 Jun 2025 14:48:34 +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 55GEmY9b001996; Mon, 16 Jun 2025 14:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GEmYPB001993; Mon, 16 Jun 2025 14:48:34 GMT (envelope-from git) Date: Mon, 16 Jun 2025 14:48:34 GMT Message-Id: <202506161448.55GEmYPB001993@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: 6b70ffeb2a65 - main - ZFS: Fix tests build with FORTIFY_SOURCE 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: 6b70ffeb2a652ee76e763fb81ed777de2d97e873 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b70ffeb2a652ee76e763fb81ed777de2d97e873 commit 6b70ffeb2a652ee76e763fb81ed777de2d97e873 Author: Ed Maste AuthorDate: 2025-06-16 13:45:46 +0000 Commit: Ed Maste CommitDate: 2025-06-16 14:47:22 +0000 ZFS: Fix tests build with FORTIFY_SOURCE Reviewed by: kevans Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50876 --- cddl/lib/libtpool/tests/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/cddl/lib/libtpool/tests/Makefile b/cddl/lib/libtpool/tests/Makefile index d87f5fc86789..19e43cc18821 100644 --- a/cddl/lib/libtpool/tests/Makefile +++ b/cddl/lib/libtpool/tests/Makefile @@ -9,4 +9,5 @@ CFLAGS+= -I${ZFSTOP}/include \ LIBADD+= pthread tpool +.include "${SRCTOP}/cddl/Makefile.inc" .include From nobody Mon Jun 16 15:12:29 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 4bLYQP4HyYz5q6BW; Mon, 16 Jun 2025 15:12:29 +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 4bLYQP3H70z3cpx; Mon, 16 Jun 2025 15:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750086749; 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=w//WeyaeB08MDzOGHSLZp37Lo6KZxenub3hk+xpuiOk=; b=NgDAURJxi4cOME0p4hfeZDJka+bVt/9PwHSf6Lh5S/NlEW+HxebVtwSQjka1paW/QEgasr Y6lRnhdAf3nFAjVUqGxq2oCXY/DfLqRkupmZyp3rLyzsgZTTvly+Y8rEf2zDMCxVSVv5PB 04G8O1velMMx6DDCPsKJgiOH3FjvBSnrheapoKq+JfXe0hzhqhk4me1SjxuU7hgMcpPtxP j/CGD/VXnYsMAMFUJ6YIAi+Pcfyi4dfQODpt7FlMwXp4uFOaIleQCSVxixoKdjhnpDbwaE Lpng5LLqLMhj4JWOntY2RgjhZw9XD1OGIX0IEW0RIfVkkzgiqGw89wgf8fAR4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750086749; 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=w//WeyaeB08MDzOGHSLZp37Lo6KZxenub3hk+xpuiOk=; b=oeKk0ozxbLn22sFW3omPK9InaWS2/w0pTrZgrXniwsNU4Q9erWB5eDVMdwE25yw5dprGB6 8E57FALKZ3LSFHxkIKQ9CNBFxo5SyNJ7gd03Ap6TwXZWB29bKXRHi5bKk4LkNvP+ZnnDsQ XdExJm2q6jQfTXUsj4mN5CZV/aIPPTmIrTL4xZ5RLJUlPKDMmxs+Vp6JnYH8wPXU4lxXPr gpH11/yUbvAxzNmGUl203mlDaSSYnpgBXKFMa7E+DT925eeIDGQmuEv7kjMLaWoD9/PuoM jHepHK0h4HOBqVYYHrvht6JWsaWs9EhmHRVv2x4v2UW1rHD22KQv2LpATCdqgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750086749; a=rsa-sha256; cv=none; b=K8+QGYkl/WwdnIOEPrBQbOkNJVEHLY+h2YKcz5zqDdVN47XMLjWhmEepqRYiVurqfyDRSW dhkncTwyfffwzpn3Ik2xRq9XkYqcFjZROIyR2+OI3cMIjYpkAERYwnvwhqCk/TaQyARzuf uzyjizbjOjqJoYBjP0KuVaNmAznv74JT+/9fHECxr2rhoToa7Z9Z50BZKetPoCVT2+aNGh U9Oa1RruepDAHzKGwyobeBeo7dkyzG9kFc4ttsFRGWXeOgZkaTP3jtq0DPNHolQBWUMFi1 TeOw+wFYxxGZOj5vB0tUY43hC2ESh4xJe8E7HFjKh0uAWjeiuw5WsSoCRcIfnw== 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 4bLYQP2tBZz13K2; Mon, 16 Jun 2025 15:12:29 +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 55GFCTfX057545; Mon, 16 Jun 2025 15:12:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GFCTkg057542; Mon, 16 Jun 2025 15:12:29 GMT (envelope-from git) Date: Mon, 16 Jun 2025 15:12:29 GMT Message-Id: <202506161512.55GFCTkg057542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1025a1c090df - main - exterr: convert SET_ERRORX() to pseudo-variadic EXTERROR() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1025a1c090dfcaa13bb25d1d1e2e2fa7009d63ca Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1025a1c090dfcaa13bb25d1d1e2e2fa7009d63ca commit 1025a1c090dfcaa13bb25d1d1e2e2fa7009d63ca Author: Konstantin Belousov AuthorDate: 2025-06-14 13:53:33 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 15:11:58 +0000 exterr: convert SET_ERRORX() to pseudo-variadic EXTERROR() Stealed from the CTR() macro in sys/ktr.h. Suggested by: jhb Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50845 --- sys/sys/exterrvar.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h index d3c2c7c92d06..15557c614f88 100644 --- a/sys/sys/exterrvar.h +++ b/sys/sys/exterrvar.h @@ -36,11 +36,17 @@ #define SET_ERROR_MSG(mmsg) NULL #endif -#define SET_ERROR2(eerror, mmsg, pp1, pp2) \ +#define _SET_ERROR2(eerror, mmsg, pp1, pp2) \ exterr_set(eerror, EXTERR_CATEGORY, SET_ERROR_MSG(mmsg), \ (uintptr_t)(pp1), (uintptr_t)(pp2), __LINE__) -#define SET_ERROR0(eerror, mmsg) SET_ERROR2(eerror, mmsg, 0, 0) -#define SET_ERROR1(eerror, mmsg, pp1) SET_ERROR2(eerror, mmsg, pp1, 0) +#define _SET_ERROR0(eerror, mmsg) _SET_ERROR2(eerror, mmsg, 0, 0) +#define _SET_ERROR1(eerror, mmsg, pp1) _SET_ERROR2(eerror, mmsg, pp1, 0) + +#define _EXTERROR_MACRO(eerror, mmsg, _1, _2, NAME, ...) \ + NAME +#define EXTERROR(...) \ + _EXTERROR_MACRO(__VA_ARGS__, _SET_ERROR2, _SET_ERROR1, \ + _SET_ERROR0)(__VA_ARGS__) int exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1, uintptr_t pp2, int line); From nobody Mon Jun 16 15:12:30 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 4bLYQQ5Fk3z5q6Np; Mon, 16 Jun 2025 15:12:30 +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 4bLYQQ3x3Bz3cmd; Mon, 16 Jun 2025 15:12:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750086750; 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=NTYWCMu5m12RMkQrHbgbo9yPOJdOd5+w95Y8/eWz+90=; b=KyFz5TpYFZ2DMHBmwjDh23v41klndBJk5NCfoBOmnFb5a29zMuzU821TMVe/ee10RDkcH8 4zM5J+C03MmtuwQvLzM+357qeIDVlx03/aM+E5wI/Plh590own7jU9L8t3Q7NCtoTclexs z3How8+OOxlN6GJl4jTo2NHcGAOkO316F2UgN7l274IKM/pPgMqwHoHv/65R6LSEvbCJiu X/+M+d9LqZzx0lC+KYQQyMn7D2ujIK2UmwfmkkZF22W5eyaneXrDS0ft9zjMsAoXeLSb6Z lXsnr80MbBa9cCPJkUsaEa9oIU7T+uvddBVhWFUr16FCCgWaV0EnLaOtenchrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750086750; 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=NTYWCMu5m12RMkQrHbgbo9yPOJdOd5+w95Y8/eWz+90=; b=ASIrVPjcc9Vjp8FpVQ4WoYoqCj5OL6Wp0Un0vhQbttS3Q1ssa2RCe4/TxwA54x34d63ElO Xyeao6HtaMshwVjOY8UqLrc0mf3bL2BLa6O5ZnRO9iyQNSJ9qOxwXTa7xQc74UTF14ZGKA pOFy3XgGZJMvQzoXWr8I3WM6JVIAN2NuxVDK1mqauhJ3dyThmjPtWh9ilcBUR25ULgnZC2 rhdwnIRhqUS7Gx2N6zod9ZRByNGDZA0LlcNhrdqr+gC1I9qAVLoH6+0J7j5UZexUTKCrzq wVPasb1z648Gx3c5uO11Q79gMBikzmb8XvepNwlLQnaGdPwSdgY3iv7RVBbOOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750086750; a=rsa-sha256; cv=none; b=eQFlloLXAAFgY/tMqRpTBsZfhO2kFcGRcKYMTtXhoV+xPRtQJPcHbNJkrnBTJkikWv3TXX Y7vM7999x2ZeKwAEJg2kzZMrJFlP2NiZ+dc3xC0ZsscFYHWDgS6Vrobr5P53J1sGvlygVt qApCu3KCDcUciuNxXK1CnLD/nBxBZPvvIFdjvalWHk1hBlR4IiVI47TSn2y9eOc9/vBnow BOBmadvp23XDZQUzBX1PCj4lqt7GYsbZVgSRrZQHVfms6De2gk3rf4eppZFyrWhW8uIxbE yNhX7euXvM9s1vKUOeknaJL9L1zLcrV7Sj7OcbI5G1s2x8doKz8NwdJ74MEOxw== 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 4bLYQQ3WkNz12cR; Mon, 16 Jun 2025 15:12:30 +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 55GFCUtF057578; Mon, 16 Jun 2025 15:12:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GFCU3t057575; Mon, 16 Jun 2025 15:12:30 GMT (envelope-from git) Date: Mon, 16 Jun 2025 15:12:30 GMT Message-Id: <202506161512.55GFCU3t057575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3d8f65fbf8f5 - main - vm/vm_mmap.c: use EXTERROR() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d8f65fbf8f5922d369f1509863f9c9a1adca26f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d8f65fbf8f5922d369f1509863f9c9a1adca26f commit 3d8f65fbf8f5922d369f1509863f9c9a1adca26f Author: Konstantin Belousov AuthorDate: 2025-06-14 13:54:19 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 15:12:05 +0000 vm/vm_mmap.c: use EXTERROR() Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50845 --- sys/vm/vm_mmap.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 9ba2ec426d7f..46fd212df299 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -192,12 +192,12 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) check_fp_fn = mrp->mr_check_fp_fn; if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) { - return (SET_ERROR0(EINVAL, "unknown PROT bits")); + return (EXTERROR(EINVAL, "unknown PROT bits")); } max_prot = PROT_MAX_EXTRACT(prot); prot = PROT_EXTRACT(prot); if (max_prot != 0 && (max_prot & prot) != prot) { - return (SET_ERROR0(ENOTSUP, "prot is not subset of max_prot")); + return (EXTERROR(ENOTSUP, "prot is not subset of max_prot")); } p = td->td_proc; @@ -230,7 +230,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (!SV_CURPROC_FLAG(SV_AOUT)) { if ((len == 0 && p->p_osrel >= P_OSREL_MAP_ANON) || ((flags & MAP_ANON) != 0 && (fd != -1 || pos != 0))) { - return (SET_ERROR2(EINVAL, + return (EXTERROR(EINVAL, "offset not zero/fd not -1 for MAP_ANON", fd, pos)); } @@ -242,7 +242,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (flags & MAP_STACK) { if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) != (PROT_READ | PROT_WRITE))) { - return (SET_ERROR1(EINVAL, "MAP_STACK with prot < rw", + return (EXTERROR(EINVAL, "MAP_STACK with prot < rw", prot)); } flags |= MAP_ANON; @@ -252,23 +252,23 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) MAP_STACK | MAP_NOSYNC | MAP_ANON | MAP_EXCL | MAP_NOCORE | MAP_PREFAULT_READ | MAP_GUARD | MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0) { - return (SET_ERROR0(EINVAL, "reserved flag set")); + return (EXTERROR(EINVAL, "reserved flag set")); } if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL) { - return (SET_ERROR0(EINVAL, "EXCL without FIXED")); + return (EXTERROR(EINVAL, "EXCL without FIXED")); } if ((flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE)) { - return (SET_ERROR0(EINVAL, "both SHARED and PRIVATE set")); + return (EXTERROR(EINVAL, "both SHARED and PRIVATE set")); } if (prot != PROT_NONE && (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0) { - return (SET_ERROR1(EINVAL, "invalid prot", prot)); + return (EXTERROR(EINVAL, "invalid prot", prot)); } if ((flags & MAP_GUARD) != 0 && (prot != PROT_NONE || fd != -1 || pos != 0 || (flags & ~(MAP_FIXED | MAP_GUARD | MAP_EXCL | MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0)) { - return (SET_ERROR0(EINVAL, "GUARD with wrong parameters")); + return (EXTERROR(EINVAL, "GUARD with wrong parameters")); } /* @@ -290,7 +290,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (align != 0 && align != MAP_ALIGNED_SUPER && (align >> MAP_ALIGNMENT_SHIFT >= sizeof(void *) * NBBY || align >> MAP_ALIGNMENT_SHIFT < PAGE_SHIFT)) { - return (SET_ERROR1(EINVAL, "bad alignment", align)); + return (EXTERROR(EINVAL, "bad alignment", align)); } /* @@ -305,17 +305,17 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) */ addr -= pageoff; if ((addr & PAGE_MASK) != 0) { - return (SET_ERROR1(EINVAL, "fixed mapping not aligned", + return (EXTERROR(EINVAL, "fixed mapping not aligned", addr)); } /* Address range must be all in user VM space. */ if (!vm_map_range_valid(&vms->vm_map, addr, addr + size)) { - SET_ERROR0(EINVAL, "mapping outside vm_map"); + EXTERROR(EINVAL, "mapping outside vm_map"); return (EINVAL); } if (flags & MAP_32BIT && addr + size > MAP_32BIT_MAX_ADDR) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "fixed 32bit mapping does not fit into 4G")); } } else if (flags & MAP_32BIT) { @@ -384,7 +384,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) goto done; if ((flags & (MAP_SHARED | MAP_PRIVATE)) == 0 && p->p_osrel >= P_OSREL_MAP_FSTRICT) { - SET_ERROR0(EINVAL, "neither SHARED nor PRIVATE req"); + EXTERROR(EINVAL, "neither SHARED nor PRIVATE req"); error = EINVAL; goto done; } @@ -1314,7 +1314,7 @@ vm_mmap_vnode(struct thread *td, vm_size_t objsize, vm_pager_update_writecount(obj, 0, objsize); } } else { - error = SET_ERROR0(EINVAL, "non-reg file"); + error = EXTERROR(EINVAL, "non-reg file"); goto done; } if ((error = VOP_GETATTR(vp, &va, cred))) @@ -1405,7 +1405,7 @@ vm_mmap_cdev(struct thread *td, vm_size_t objsize, vm_prot_t prot, (prot & VM_PROT_WRITE) != 0) return (EACCES); if ((flags & (MAP_PRIVATE | MAP_COPY)) != 0) { - return (SET_ERROR0(EINVAL, "cdev mapping must be shared")); + return (EXTERROR(EINVAL, "cdev mapping must be shared")); } /* @@ -1432,7 +1432,7 @@ vm_mmap_cdev(struct thread *td, vm_size_t objsize, vm_prot_t prot, obj = vm_pager_allocate(OBJT_DEVICE, cdev, objsize, prot, *foff, td->td_ucred); if (obj == NULL) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "cdev driver does not support mmap")); } *objp = obj; @@ -1452,7 +1452,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, boolean_t writecounted; if (size == 0) { - return (SET_ERROR0(EINVAL, "zero-sized req")); + return (EXTERROR(EINVAL, "zero-sized req")); } size = round_page(size); @@ -1479,7 +1479,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, handle, &foff, &object, &writecounted); break; default: - error = SET_ERROR1(EINVAL, "unsupported backing obj type", + error = EXTERROR(EINVAL, "unsupported backing obj type", handle_type); break; } @@ -1562,7 +1562,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, * exec). */ if ((foff & PAGE_MASK) != 0) { - return (SET_ERROR1(EINVAL, "offset not page-aligned", foff)); + return (EXTERROR(EINVAL, "offset not page-aligned", foff)); } if ((flags & MAP_FIXED) == 0) { @@ -1570,7 +1570,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, *addr = round_page(*addr); } else { if (*addr != trunc_page(*addr)) { - return (SET_ERROR1(EINVAL, + return (EXTERROR(EINVAL, "non-fixed mapping address not aligned", *addr)); } fitit = false; @@ -1578,11 +1578,11 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, if (flags & MAP_ANON) { if (object != NULL) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "anon mapping backed by an object")); } if (foff != 0) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "anon mapping with non-zero offset")); } docow = 0; @@ -1604,7 +1604,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, docow |= MAP_WRITECOUNT; if (flags & MAP_STACK) { if (object != NULL) { - return (SET_ERROR0(EINVAL, + return (EXTERROR(EINVAL, "stack mapping backed by an object")); } docow |= MAP_STACK_AREA; @@ -1686,6 +1686,6 @@ vm_mmap_to_errno(int rv) } if ((curthread->td_pflags2 & (TDP2_UEXTERR | TDP2_EXTERR)) == TDP2_UEXTERR) - SET_ERROR1(error, "mach error", rv); + EXTERROR(error, "mach error", rv); return (error); } From nobody Mon Jun 16 16:31:54 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 4bLbB41KSWz5y6Vv; Mon, 16 Jun 2025 16:31:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLbB375nxz3CMV; Mon, 16 Jun 2025 16:31:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750091516; 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: in-reply-to:in-reply-to:references:references; bh=+sQWSNMM/q9TUUl2LIAbDCN+9Mqh3Vb8YPaOolvvYZ4=; b=skwToGh8AiXJBZA4QiPtAqMiy5iRrzu8gu9NOfhpJIJ6hKMTHtvprLvdQ3VP3zh5POn8tJ BUm9DCf6T90o7SYoig8amWv6FLharACsrbxtgptU+Ugbc0Ll+o0kLv44Pi4lcM75NT43R9 kRy4kJMxQRPOs2bG1oiZpxepm6RSAZkvX36eZOr/s7VrSIVumoxwRYu1yoN1lcruTMUig9 ietjBkDK0HkmhDSF2T/rZmKiF4iPROjN7zxO285+a/tbdsX5svaHrnxGD/FdHgZh48rrL7 95G9MO1YJyQKxC1zlAOuDH3O3Gjn7AKOgB+oDTEGHQZ0JPhh66nSL6v5nnIkbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750091516; 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: in-reply-to:in-reply-to:references:references; bh=+sQWSNMM/q9TUUl2LIAbDCN+9Mqh3Vb8YPaOolvvYZ4=; b=ToRadZvzZ8xBPRBqjBjVcjer5B/VDrMVUYoH8QYxeD7dnRDeKRxnSxihk8RXLdj2zOMWUn evdEk/EKssOypIB2pMDtdNh4zBroZI8fjZpsV96f6OcjJDlYFBvM4SQgaOelnFZTVv1v0y qx2WSDFvxatxSmUGtH7vZCrC2dLNYWj+ZsUStcTqOBvpC9J27v4pmVBB8C8Mp//lDOvFKc jcujGlAhzG7XbcKoZJqutGaaXHTP3EVE6HvjixZVJ7dNLzUhbpnC1SEtMdneSpxnnEpxyL ReGqOZ3CFfUGz5oR9AuYHR9Z0t4axouAvVN5iia/iW8KwwxV3Zb1BQeCRYcLaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750091516; a=rsa-sha256; cv=none; b=TGNsGF8I3CVSwXQPG+1Mb4QcPIbdLHX7p4igA2DXnuF/eAqRmIPFLTE8Ri79PSflHbCyMN e91IgYDVt+/p/Y0bLRLwcn1XDnwIXKar/th4yBS710lK2zovDzrIMP6g4viDS9lH29B5XC tp5hDIPmuO7VQHpZf4VMxYtm7kVMOqB8v4OcP6a3MJj7xPYR0TkbotILNLHC4n0EPBki2j mICJQm3zMPk3LKn7BivWrVik20VDyxQBb+7rkBzcL+yL1ivpuVAXHv4/JsBtXCyk/Wg/o/ wWItvdHoL5yaMJPg6ZskefIgOGskZUKh7rjkAbwWSjCa8hqQ9k92mOTcke+Rrw== Received: from [IPV6:2601:5c0:4200:b830:1556:8d92:a58f:7b21] (unknown [IPv6:2601:5c0:4200:b830:1556:8d92:a58f:7b21]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bLbB35RJ7zmx6; Mon, 16 Jun 2025 16:31:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org> Date: Mon, 16 Jun 2025 12:31:54 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: bafe0e7edaee - main - pam_ksu: Proactively address MIT KRB5 build failure Content-Language: en-US To: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202506160251.55G2plI3062868@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202506160251.55G2plI3062868@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 6/15/25 22:51, Cy Schubert wrote: > The branch main has been updated by cy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 > > commit bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 > Author: Cy Schubert > AuthorDate: 2025-06-05 17:09:57 +0000 > Commit: Cy Schubert > CommitDate: 2025-06-16 02:49:35 +0000 > > pam_ksu: Proactively address MIT KRB5 build failure > > MIT KRB5 does not provide a krb5_make_principal() function. We need to > provide this ourselves for now. We provide the function for now while > MIT and Heimdal are both in the tree. When Heimdal is removed we can > inline the calls to krb5_get_default_realm() and > krb5_build_principal_va(). krb5_build_principal_va() is > deprecated in MIT KRB5. Its replacement, krb5_build_principal_alloc_va() > will be used instead at that time. > > Sponsored by: The FreeBSD Foundation > Differential revision: https://reviews.freebsd.org/D50808 I still don't understand how this can work instead of instantly segfaulting as I said in the review. > diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c > index 47362c835c12..a6b3f043d3f4 100644 > --- a/lib/libpam/modules/pam_ksu/pam_ksu.c > +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c > @@ -48,6 +48,61 @@ static long get_su_principal(krb5_context, const char *, const char *, > static int auth_krb5(pam_handle_t *, krb5_context, const char *, > krb5_principal); > > +#ifdef MK_MITKRB5 > +/* For MIT KRB5 only. */ > + > +/* > + * XXX This entire module will need to be rewritten when heimdal > + * XXX compatidibility is no longer needed. > + */ > +#define KRB5_DEFAULT_CCFILE_ROOT "/tmp/krb5cc_" > +#define KRB5_DEFAULT_CCROOT "FILE:" KRB5_DEFAULT_CCFILE_ROOT > + > +/* > + * XXX We will replace krb5_build_principal_va() with > + * XXX krb5_build_principal_alloc_va() when Heimdal is finally > + * XXX removed. > + */ > +krb5_error_code KRB5_CALLCONV > +krb5_build_principal_va(krb5_context context, > + krb5_principal princ, > + unsigned int rlen, > + const char *realm, > + va_list ap); > +typedef char *heim_general_string; > +typedef heim_general_string Realm; > +typedef Realm krb5_realm; > +typedef const char *krb5_const_realm; > + > +static krb5_error_code > +krb5_make_principal(krb5_context context, krb5_principal principal, > + krb5_const_realm realm, ...) > +{ > + krb5_error_code rc; > + va_list ap; > + if (realm == NULL) { > + krb5_realm temp_realm = NULL; > + if ((rc = krb5_get_default_realm(context, &temp_realm))) > + return (rc); > + realm=temp_realm; > + if (temp_realm) > + free(temp_realm); > + } > + va_start(ap, realm); > + /* > + * XXX Ideally we should be using krb5_build_principal_alloc_va() > + * XXX here because krb5_build_principal_va() is deprecated. But, > + * XXX this would require changes elsewhere in the calling code > + * XXX to call krb5_free_principal() elsewhere to free the > + * XXX principal. We can do that after Heimdal is removed from > + * XXX our tree. > + */ > + rc = krb5_build_principal_va(context, principal, strlen(realm), realm, ap); > + va_end(ap); > + return (rc); > +} > +#endif > + > PAM_EXTERN int > pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, > int argc __unused, const char *argv[] __unused) > @@ -217,7 +272,13 @@ get_su_principal(krb5_context context, const char *target_user, const char *curr > if (rv != 0) > return (errno); > if (default_principal == NULL) { > +#ifdef MK_MITKRB5 > + /* For MIT KRB5. */ > + rv = krb5_make_principal(context, default_principal, NULL, current_user, NULL); > +#else > + /* For Heimdal. */ > rv = krb5_make_principal(context, &default_principal, NULL, current_user, NULL); > +#endif At this point default_principal is always NULL, so you pass in a NULL pointer to krb5_build_princpal_va. That will surely crash. Also, you then pass that NULL pointer to the following code which would also surely crash: /* Now that we have some principal, if the target account is * `root', then transform it into a `root' instance, e.g. * `user@REA.LM' -> `user/root@REA.LM'. */ rv = krb5_unparse_name(context, default_principal, &principal_name); krb5_free_principal(context, default_principal); This is why I said your comment seems wrong. The Heimdal version is clearly allocating a principal, so the MIT version should also be doing that, and you should already be using krb5_build_prinpcial_alloc_va() _now_. Your comment claims that the calling code isn't using krb5_free_principal(), but the calling code quoted above in get_su_principal() does call krb5_free_principal(). Have you tested this at runtime? -- John Baldwin From nobody Mon Jun 16 16:55:00 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 4bLbhh6DFsz5y7gj; Mon, 16 Jun 2025 16:55:00 +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 4bLbhh5nv4z3L9D; Mon, 16 Jun 2025 16:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750092900; 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=rkQVJiGeKS73aBQgk3VuQzfpS4vJGbimzOMUfkJivVk=; b=juKkU0Hb1hNpE84I8rNwEhjhFC0c6l0sU/bzmcQNZlIjnLbvUzAxGda5IunEYl1q854VJ3 PYTNnVn7AO1QpD5ndlvH1kwHC3OGrLpeMMpXsIrQScXqIGidTCQX2FtFa782laCaYZhbsk U08YfbYJyFybZophEm5FzFvr6XySk+HQAFRVUr3TxoNQ270/ZhGsAKFn3dvtWi12UDTVag L+eaDoZBbK1Rq94cT9JWRCSpUp53/kv1EirTxNc1eEQflSfV+L7/bWhGi6R0t6Qov2TLeA Ae3GKR0Rfp2L0uvE65YsNR/Zv2O4Ntmc1hwCHi2ZRywPQ5GFQkSoCjf2FXVWQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750092900; 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=rkQVJiGeKS73aBQgk3VuQzfpS4vJGbimzOMUfkJivVk=; b=PWLeuok6l/mwtfywG79dKCz4Jf3PtKvSVvFtI8+vzkA8cYR8lxwok/54dVoMs65oxMOEFn 5H7v713HG5Km0AvSrUkjltTc8rp9LmLc1y1vQBScPH9j4Tkz09AD19Enwy/yrErUYy2jLf +zhTwGtD4u5PoCDofCOfujWuBBi7F93hR6GMV3vcBYPi6Ql4+j290leWrV3X9SOEYjp1zJ 777yrSsmp8LfG78O1l4dD9qkQiq4qsnPzxxdc1guH7r7ctrsuxy3cqMdGtYB9hN7sDZrhY rssY3SHH/22QJVpsOhOZLIXxa4jv3CUKUHfZlr2zS4JYHLIeRuhSzPdn8OB2Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750092900; a=rsa-sha256; cv=none; b=QKZm3F2yfmVSQ/O2XSVL2BTeexESyIkHMsm/odetweZAPFay36bxN/7dDtfnhVOUdM/12J RFoatK+qtlUFmYbmPxUbgutMQXg5l7nxI7V6guGE451/hSKix6SBI+xpSHKIIeEAY978Iq mgkkWbrr8UE5Xi5+yMZ+Y00UBTm8SSZQGncEFdmSYOzSVI17CpSC4Z1xc44NODDjsmnjRd DlNKDQ+aRFhxq6j29ZhhjaGK55L04PPQRfUB5rwXIOoVKKOsE+cTEiugmTinFXg327Y7Mk PW2I1wUszqnzTzRPKCnwMPxNbNFfQa8z8fiLPoN++IA8ci37BSsAUIE+cI4JBA== 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 4bLbhh52YJz15sl; Mon, 16 Jun 2025 16:55:00 +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 55GGt00s046790; Mon, 16 Jun 2025 16:55:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GGt0xD046787; Mon, 16 Jun 2025 16:55:00 GMT (envelope-from git) Date: Mon, 16 Jun 2025 16:55:00 GMT Message-Id: <202506161655.55GGt0xD046787@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: a2f579635f67 - main - cc_cubic: sync to the new specification of RFC9438 for TCP CUBIC. 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: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2f579635f6726b2eb3e7f622985fde1abcd0d82 Auto-Submitted: auto-generated The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=a2f579635f6726b2eb3e7f622985fde1abcd0d82 commit a2f579635f6726b2eb3e7f622985fde1abcd0d82 Author: Cheng Cui AuthorDate: 2025-03-27 17:16:04 +0000 Commit: Cheng Cui CommitDate: 2025-06-16 16:52:46 +0000 cc_cubic: sync to the new specification of RFC9438 for TCP CUBIC. Reviewed by: rscheff Differential Revision: https://reviews.freebsd.org/D49540 --- sys/netinet/cc/cc_cubic.c | 164 ++++++++++++++++++++++++---------------------- sys/netinet/cc/cc_cubic.h | 160 ++++++++++++++++++++++++++------------------ 2 files changed, 181 insertions(+), 143 deletions(-) diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index a2e72130fa88..b3e15009244d 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -38,7 +38,7 @@ /* * An implementation of the CUBIC congestion control algorithm for FreeBSD, - * based on the Internet Draft "draft-rhee-tcpm-cubic-02" by Rhee, Xu and Ha. + * based on the Internet RFC9438 by Xu, Ha, Rhee, Goel, and Eggert. * Originally released as part of the NewTCP research project at Swinburne * University of Technology's Centre for Advanced Internet Architectures, * Melbourne, Australia, which was made possible in part by a grant from the @@ -81,7 +81,7 @@ static void cubic_conn_init(struct cc_var *ccv); static int cubic_mod_init(void); static void cubic_post_recovery(struct cc_var *ccv); static void cubic_record_rtt(struct cc_var *ccv); -static void cubic_ssthresh_update(struct cc_var *ccv, uint32_t maxseg); +static uint32_t cubic_get_ssthresh(struct cc_var *ccv, uint32_t maxseg); static void cubic_after_idle(struct cc_var *ccv); static size_t cubic_data_sz(void); static void cubic_newround(struct cc_var *ccv, uint32_t round_cnt); @@ -236,10 +236,11 @@ static void cubic_ack_received(struct cc_var *ccv, ccsignal_t type) { struct cubic *cubic_data; - unsigned long W_est, W_cubic; + uint32_t W_est, W_cubic, cwin, target, incr; int usecs_since_epoch; uint32_t mss = tcp_fixed_maxseg(ccv->tp); + cwin = CCV(ccv, snd_cwnd); cubic_data = ccv->cc_data; cubic_record_rtt(ccv); @@ -250,7 +251,7 @@ cubic_ack_received(struct cc_var *ccv, ccsignal_t type) if (type == CC_ACK && !IN_RECOVERY(CCV(ccv, t_flags)) && (ccv->flags & CCF_CWND_LIMITED)) { /* Use the logic in NewReno ack_received() for slow start. */ - if (CCV(ccv, snd_cwnd) <= CCV(ccv, snd_ssthresh) || + if (cwin <= CCV(ccv, snd_ssthresh) || cubic_data->min_rtt_usecs == TCPTV_SRTTBASE) { cubic_does_slow_start(ccv, cubic_data); } else { @@ -265,20 +266,32 @@ cubic_ack_received(struct cc_var *ccv, ccsignal_t type) cubic_data->flags &= ~CUBICFLAG_HYSTART_ENABLED; cubic_log_hystart_event(ccv, cubic_data, 11, CCV(ccv, snd_ssthresh)); } - if ((cubic_data->flags & CUBICFLAG_RTO_EVENT) && - (cubic_data->flags & CUBICFLAG_IN_SLOWSTART)) { - /* RFC8312 Section 4.7 */ - cubic_data->flags &= ~(CUBICFLAG_RTO_EVENT | - CUBICFLAG_IN_SLOWSTART); - cubic_data->W_max = CCV(ccv, snd_cwnd); - cubic_data->t_epoch = ticks; - cubic_data->K = 0; - } else if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | + if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | + CUBICFLAG_CONG_EVENT | CUBICFLAG_IN_APPLIMIT)) { + /* + * At the beginning of the current congestion + * avoidance stage, The epoch variables + * (t_epoch, cwnd_epoch, K) are updated in the + * following three cases: + * 1) just exited the slow start + * 2) after a congestion event + * 3) application-limited + */ + cubic_data->t_epoch = ticks; + cubic_data->cwnd_epoch = cwin; + cubic_data->K = cubic_k(cubic_data->W_max / mss, + cubic_data->cwnd_epoch / mss); cubic_data->flags &= ~(CUBICFLAG_IN_SLOWSTART | + CUBICFLAG_CONG_EVENT | CUBICFLAG_IN_APPLIMIT); - cubic_data->t_epoch = ticks; - cubic_data->K = cubic_k(cubic_data->W_max / mss); + + if (cubic_data->flags & CUBICFLAG_RTO_EVENT) { + /* RFC9438 Section 4.8: Timeout */ + cubic_data->flags &= ~CUBICFLAG_RTO_EVENT; + cubic_data->W_max = cwin; + cubic_data->K = 0; + } } usecs_since_epoch = (ticks - cubic_data->t_epoch) * tick; if (usecs_since_epoch < 0) { @@ -288,12 +301,9 @@ cubic_ack_received(struct cc_var *ccv, ccsignal_t type) usecs_since_epoch = INT_MAX; cubic_data->t_epoch = ticks - INT_MAX; } - W_est = tf_cwnd(ccv); - /* - * The mean RTT is used to best reflect the equations in - * the I-D. + * The mean RTT is used to best reflect the equations. */ W_cubic = cubic_cwnd(usecs_since_epoch + cubic_data->mean_rtt_usecs, @@ -302,33 +312,24 @@ cubic_ack_received(struct cc_var *ccv, ccsignal_t type) cubic_data->K); if (W_cubic < W_est) { - /* - * TCP-friendly region, follow tf - * cwnd growth. - */ - CCV(ccv, snd_cwnd) = ulmin(W_est, INT_MAX); + /* RFC9438 Section 4.3: Reno-friendly region */ + CCV(ccv, snd_cwnd) = W_est; cubic_data->flags |= CUBICFLAG_IN_TF; - } else if (CCV(ccv, snd_cwnd) < W_cubic) { + } else { /* - * Concave or convex region, follow CUBIC - * cwnd growth. - * Only update snd_cwnd, if it doesn't shrink. + * RFC9438 Section 4.4 or 4.5: + * Concave or Convex Region */ - CCV(ccv, snd_cwnd) = ulmin(W_cubic, INT_MAX); - cubic_data->flags &= ~CUBICFLAG_IN_TF; - } - - /* - * If we're not in slow start and we're probing for a - * new cwnd limit at the start of a connection - * (happens when hostcache has a relevant entry), - * keep updating our current estimate of the - * W_max. - */ - if (((cubic_data->flags & CUBICFLAG_CONG_EVENT) == 0) && - cubic_data->W_max < CCV(ccv, snd_cwnd)) { - cubic_data->W_max = CCV(ccv, snd_cwnd); - cubic_data->K = cubic_k(cubic_data->W_max / mss); + if (W_cubic < cwin) { + target = cwin; + } else if (W_cubic > ((cwin * 3) >> 1)) { + target = (cwin * 3) >> 1; + } else { + target = W_cubic; + } + incr = (((target - cwin) << CUBIC_SHIFT) / + cwin * mss) >> CUBIC_SHIFT; + CCV(ccv, snd_cwnd) = cwin + incr; } } } else if (type == CC_ACK && !IN_RECOVERY(CCV(ccv, t_flags)) && @@ -345,12 +346,11 @@ cubic_ack_received(struct cc_var *ccv, ccsignal_t type) static void cubic_after_idle(struct cc_var *ccv) { - struct cubic *cubic_data; - - cubic_data = ccv->cc_data; + struct cubic *cubic_data = ccv->cc_data; + uint32_t mss = tcp_fixed_maxseg(ccv->tp); cubic_data->W_max = ulmax(cubic_data->W_max, CCV(ccv, snd_cwnd)); - cubic_data->K = cubic_k(cubic_data->W_max / tcp_fixed_maxseg(ccv->tp)); + cubic_data->K = cubic_k(cubic_data->W_max / mss, cubic_data->cwnd_epoch / mss); if ((cubic_data->flags & CUBICFLAG_HYSTART_ENABLED) == 0) { /* * Re-enable hystart if we have been idle. @@ -389,7 +389,9 @@ cubic_cb_init(struct cc_var *ccv, void *ptr) cubic_data = ptr; /* Init some key variables with sensible defaults. */ - cubic_data->t_epoch = ticks; + cubic_data->t_epoch = 0; + cubic_data->cwnd_epoch = 0; + cubic_data->K = 0; cubic_data->min_rtt_usecs = TCPTV_SRTTBASE; cubic_data->mean_rtt_usecs = 1; @@ -416,7 +418,7 @@ static void cubic_cong_signal(struct cc_var *ccv, ccsignal_t type) { struct cubic *cubic_data; - uint32_t mss, pipe; + uint32_t mss, pipe, ssthresh; cubic_data = ccv->cc_data; mss = tcp_fixed_maxseg(ccv->tp); @@ -431,10 +433,13 @@ cubic_cong_signal(struct cc_var *ccv, ccsignal_t type) } if (!IN_FASTRECOVERY(CCV(ccv, t_flags))) { if (!IN_CONGRECOVERY(CCV(ccv, t_flags))) { - cubic_ssthresh_update(ccv, mss); + ssthresh = cubic_get_ssthresh(ccv, mss); + CCV(ccv, snd_ssthresh) = max(ssthresh, 2 * mss); + /* + * The congestion flag will recalculate K at the + * beginning of the congestion avoidance stage. + */ cubic_data->flags |= CUBICFLAG_CONG_EVENT; - cubic_data->t_epoch = ticks; - cubic_data->K = cubic_k(cubic_data->W_max / mss); } ENTER_RECOVERY(CCV(ccv, t_flags)); } @@ -448,17 +453,20 @@ cubic_cong_signal(struct cc_var *ccv, ccsignal_t type) cubic_log_hystart_event(ccv, cubic_data, 9, CCV(ccv, snd_ssthresh)); } if (!IN_CONGRECOVERY(CCV(ccv, t_flags))) { - cubic_ssthresh_update(ccv, mss); + ssthresh = cubic_get_ssthresh(ccv, mss); + CCV(ccv, snd_ssthresh) = max(ssthresh, 2 * mss); + CCV(ccv, snd_cwnd) = max(ssthresh, mss); + /* + * The congestion flag will recalculate K at the + * beginning of the congestion avoidance stage. + */ cubic_data->flags |= CUBICFLAG_CONG_EVENT; - cubic_data->t_epoch = ticks; - cubic_data->K = cubic_k(cubic_data->W_max / mss); - CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh); ENTER_CONGRECOVERY(CCV(ccv, t_flags)); } break; case CC_RTO: - /* RFC8312 Section 4.7 */ + /* RFC9438 Section 4.8: Timeout */ if (CCV(ccv, t_rxtshift) == 1) { /* * Remember the state only for the first RTO event. This @@ -475,12 +483,16 @@ cubic_cong_signal(struct cc_var *ccv, ccsignal_t type) (((uint64_t)min(CCV(ccv, snd_wnd), pipe) * CUBIC_BETA) >> CUBIC_SHIFT) / mss) * mss; } - cubic_data->flags |= CUBICFLAG_CONG_EVENT | CUBICFLAG_RTO_EVENT; + /* + * The RTO flag will recalculate K at the + * beginning of the congestion avoidance stage. + */ + cubic_data->flags |= CUBICFLAG_RTO_EVENT; CCV(ccv, snd_cwnd) = mss; break; case CC_RTO_ERR: - cubic_data->flags &= ~(CUBICFLAG_CONG_EVENT | CUBICFLAG_RTO_EVENT); + cubic_data->flags &= ~CUBICFLAG_RTO_EVENT; cubic_data->K = cubic_data->undo_K; cubic_data->W_max = cubic_data->undo_W_max; cubic_data->cwnd_epoch = cubic_data->undo_cwnd_epoch; @@ -503,7 +515,7 @@ cubic_conn_init(struct cc_var *ccv) * this here bad things happen when entries from the TCP hostcache * get used. */ - cubic_data->W_max = CCV(ccv, snd_cwnd); + cubic_data->W_max = UINT_MAX; } static int @@ -603,44 +615,36 @@ cubic_record_rtt(struct cc_var *ccv) } /* - * Update the ssthresh in the event of congestion. + * Return the new value for ssthresh in the event of a congestion. */ -static void -cubic_ssthresh_update(struct cc_var *ccv, uint32_t maxseg) +static uint32_t +cubic_get_ssthresh(struct cc_var *ccv, uint32_t maxseg) { struct cubic *cubic_data; - uint32_t ssthresh; - uint32_t cwnd; + uint32_t cwnd, pipe; cubic_data = ccv->cc_data; cwnd = CCV(ccv, snd_cwnd); - /* Fast convergence heuristic. */ + /* RFC9438 Section 4.7: Fast convergence */ if (cwnd < cubic_data->W_max) { cwnd = ((uint64_t)cwnd * CUBIC_FC_FACTOR) >> CUBIC_SHIFT; } - cubic_data->undo_W_max = cubic_data->W_max; cubic_data->W_max = cwnd; if (cubic_data->flags & CUBICFLAG_IN_TF) { - /* If in the TCP friendly region, follow what newreno does */ - ssthresh = newreno_cc_cwnd_on_multiplicative_decrease(ccv, maxseg); + /* If in the TCP friendly region, follow what newreno does. */ + return (newreno_cc_cwnd_on_multiplicative_decrease(ccv, maxseg)); - } else if ((cubic_data->flags & CUBICFLAG_CONG_EVENT) == 0) { - /* - * On the first congestion event, set ssthresh to cwnd * 0.5 - * and reduce W_max to cwnd * beta. This aligns the cubic - * concave region appropriately. - */ - ssthresh = cwnd >> 1; - cubic_data->W_max = ((uint64_t)cwnd * CUBIC_BETA) >> CUBIC_SHIFT; } else { /* - * On subsequent congestion events, set ssthresh to cwnd * beta. + * RFC9438 Section 4.6: Multiplicative Decrease + * Outside the TCP friendly region, set ssthresh to the size of + * inflight_size * beta. */ - ssthresh = ((uint64_t)cwnd * CUBIC_BETA) >> CUBIC_SHIFT; + pipe = tcp_compute_pipe(ccv->tp); + return ((pipe * CUBIC_BETA) >> CUBIC_SHIFT); } - CCV(ccv, snd_ssthresh) = max(ssthresh, 2 * maxseg); } static void diff --git a/sys/netinet/cc/cc_cubic.h b/sys/netinet/cc/cc_cubic.h index c30128570ab0..c31506d26b00 100644 --- a/sys/netinet/cc/cc_cubic.h +++ b/sys/netinet/cc/cc_cubic.h @@ -88,14 +88,23 @@ /* Kernel only bits */ #ifdef _KERNEL struct cubic { - /* CUBIC K in fixed point form with CUBIC_SHIFT worth of precision. */ + /* + * CUBIC K in fixed point form with CUBIC_SHIFT worth of precision. + * Also means the time period in seconds it takes to increase the + * congestion window size at the beginning of the current congestion + * avoidance stage to W_max. + */ int64_t K; /* Sum of RTT samples across an epoch in usecs. */ int64_t sum_rtt_usecs; - /* Size of cwnd just before cwnd was reduced in the last congestion event */ - uint64_t W_max; - /* The cwnd at the beginning of the current congestion avoidance stage */ - uint64_t cwnd_epoch; + /* Size of cwnd (in bytes) just before cwnd was reduced in the last congestion event. */ + uint32_t W_max; + /* An estimate (in bytes) for the congestion window in the Reno-friendly region */ + uint32_t W_est; + /* An estimate (in bytes) for the congestion window in the CUBIC region */ + uint32_t W_cubic; + /* The cwnd (in bytes) at the beginning of the current congestion avoidance stage. */ + uint32_t cwnd_epoch; /* various flags */ uint32_t flags; /* Minimum observed rtt in usecs. */ @@ -110,8 +119,8 @@ struct cubic { int undo_t_epoch; /* Few variables to restore the state after RTO_ERR */ int64_t undo_K; - uint64_t undo_W_max; - uint64_t undo_cwnd_epoch; + uint32_t undo_W_max; + uint32_t undo_cwnd_epoch; uint32_t css_baseline_minrtt; uint32_t css_current_round_minrtt; uint32_t css_lastround_minrtt; @@ -130,60 +139,103 @@ struct cubic { extern int hz; /* - * Implementation based on the formulae found in the CUBIC Internet Draft - * "draft-ietf-tcpm-cubic-04". + * Implementation based on the formulas in RFC9438. * */ -static __inline float -theoretical_cubic_k(double wmax_pkts) + +/* + * Returns K, the time period in seconds it takes to increase the congestion + * window size at the beginning of the current congestion avoidance stage to + * W_max. + */ +static inline float +theoretical_cubic_k(uint32_t wmax_segs, uint32_t cwnd_epoch_segs) { double C; C = 0.4; + if (wmax_segs <= cwnd_epoch_segs) + return 0.0; - return (pow((wmax_pkts * 0.3) / C, (1.0 / 3.0)) * pow(2, CUBIC_SHIFT)); + /* + * Figure 2: K = ((W_max - cwnd_epoch) / C)^(1/3) + */ + return (pow((wmax_segs - cwnd_epoch_segs) / C, (1.0 / 3.0)) * pow(2, CUBIC_SHIFT)); } -static __inline unsigned long -theoretical_cubic_cwnd(int ticks_since_epoch, unsigned long wmax, uint32_t smss) +/* + * Returns the congestion window in segments at time t in seconds based on the + * cubic increase function, where t is the elapsed time in seconds from the + * beginning of the current congestion avoidance stage, as described in RFC9438 + * Section 4.2. + */ +static inline unsigned long +theoretical_cubic_cwnd(int ticks_elapsed, uint32_t wmax_segs, uint32_t cwnd_epoch_segs) { - double C, wmax_pkts; + double C, t; + float K; C = 0.4; - wmax_pkts = wmax / (double)smss; + t = ticks_elapsed / (double)hz; + K = theoretical_cubic_k(wmax_segs, cwnd_epoch_segs); - return (smss * (wmax_pkts + - (C * pow(ticks_since_epoch / (double)hz - - theoretical_cubic_k(wmax_pkts) / pow(2, CUBIC_SHIFT), 3.0)))); + /* + * Figure 1: W_cubic(t) = C * (t - K)^3 + W_max + */ + return (C * pow(t - K / pow(2, CUBIC_SHIFT), 3.0) + wmax_segs); } -static __inline unsigned long -theoretical_reno_cwnd(int ticks_since_epoch, int rtt_ticks, unsigned long wmax, - uint32_t smss) +/* + * Returns estimated Reno congestion window in segments. + */ +static inline unsigned long +theoretical_reno_cwnd(int ticks_elapsed, int rtt_ticks, uint32_t wmax_segs) { - return ((wmax * 0.5) + ((ticks_since_epoch / (float)rtt_ticks) * smss)); + return (wmax_segs * 0.5 + ticks_elapsed / (float)rtt_ticks); } -static __inline unsigned long -theoretical_tf_cwnd(int ticks_since_epoch, int rtt_ticks, unsigned long wmax, - uint32_t smss) +/* + * Returns an estimate for the congestion window in segments in the + * Reno-friendly region -- that is, an estimate for the congestion window of + * Reno, as described in RFC9438 Section 4.3, where: + * cwnd: Current congestion window in segments. + * cwnd_prior: Size of cwnd in segments at the time of setting ssthresh most + * recently, either upon exiting the first slow start or just before + * cwnd was reduced in the last congestion event. + * W_est: An estimate for the congestion window in segments in the Reno-friendly + * region -- that is, an estimate for the congestion window of Reno. + */ +static inline unsigned long +theoretical_tf_cwnd(unsigned long W_est, unsigned long segs_acked, unsigned long cwnd, + unsigned long cwnd_prior) { + float cubic_alpha, cubic_beta; + + /* RFC9438 Section 4.6: The parameter β_cubic SHOULD be set to 0.7. */ + cubic_beta = 0.7; - return ((wmax * 0.7) + ((3 * 0.3) / (2 - 0.3) * - (ticks_since_epoch / (float)rtt_ticks) * smss)); + if (W_est >= cwnd_prior) + cubic_alpha = 1.0; + else + cubic_alpha = (3.0 * (1.0 - cubic_beta)) / (1.0 + cubic_beta); + + /* + * Figure 4: W_est = W_est + α_cubic * segments_acked / cwnd + */ + return (W_est + cubic_alpha * segs_acked / cwnd); } #endif /* !_KERNEL */ /* * Compute the CUBIC K value used in the cwnd calculation, using an - * implementation of eqn 2 in the I-D. The method used - * here is adapted from Apple Computer Technical Report #KT-32. + * implementation mentioned in Figure. 2 of RFC9438. + * The method used here is adapted from Apple Computer Technical Report #KT-32. */ -static __inline int64_t -cubic_k(unsigned long wmax_pkts) +static inline int64_t +cubic_k(uint32_t wmax_segs, uint32_t cwnd_epoch_segs) { int64_t s, K; uint16_t p; @@ -191,8 +243,13 @@ cubic_k(unsigned long wmax_pkts) K = s = 0; p = 0; - /* (wmax * beta)/C with CUBIC_SHIFT worth of precision. */ - s = ((wmax_pkts * ONE_SUB_CUBIC_BETA) << CUBIC_SHIFT) / CUBIC_C_FACTOR; + /* Handle the corner case where W_max <= cwnd_epoch */ + if (wmax_segs <= cwnd_epoch_segs) { + return 0; + } + + /* (wmax - cwnd_epoch) / C with CUBIC_SHIFT worth of precision. */ + s = ((wmax_segs - cwnd_epoch_segs) << (2 * CUBIC_SHIFT)) / CUBIC_C_FACTOR; /* Rebase s to be between 1 and 1/8 with a shift of CUBIC_SHIFT. */ while (s >= 256) { @@ -213,13 +270,14 @@ cubic_k(unsigned long wmax_pkts) } /* - * Compute the new cwnd value using an implementation of eqn 1 from the I-D. + * Compute and return the new cwnd value in bytes using an implementation + * mentioned in Figure. 1 of RFC9438. * Thanks to Kip Macy for help debugging this function. * * XXXLAS: Characterise bounds for overflow. */ -static __inline unsigned long -cubic_cwnd(int usecs_since_epoch, unsigned long wmax, uint32_t smss, int64_t K) +static inline uint32_t +cubic_cwnd(int usecs_since_epoch, uint32_t wmax, uint32_t smss, int64_t K) { int64_t cwnd; @@ -238,7 +296,7 @@ cubic_cwnd(int usecs_since_epoch, unsigned long wmax, uint32_t smss, int64_t K) cwnd *= (cwnd * cwnd); /* - * C(t - K)^3 + wmax + * Figure 1: C * (t - K)^3 + wmax * The down shift by CUBIC_SHIFT_4 is because cwnd has 4 lots of * CUBIC_SHIFT included in the value. 3 from the cubing of cwnd above, * and an extra from multiplying through by CUBIC_C_FACTOR. @@ -252,34 +310,10 @@ cubic_cwnd(int usecs_since_epoch, unsigned long wmax, uint32_t smss, int64_t K) return (lmax(0,cwnd)); } -/* - * Compute an approximation of the NewReno cwnd some number of usecs after a - * congestion event. RTT should be the average RTT estimate for the path - * measured over the previous congestion epoch and wmax is the value of cwnd at - * the last congestion event. The "TCP friendly" concept in the CUBIC I-D is - * rather tricky to understand and it turns out this function is not required. - * It is left here for reference. - * - * XXX: Not used - */ -static __inline unsigned long -reno_cwnd(int usecs_since_epoch, int rtt_usecs, unsigned long wmax, - uint32_t smss) -{ - - /* - * For NewReno, beta = 0.5, therefore: W_tcp(t) = wmax*0.5 + t/RTT - * W_tcp(t) deals with cwnd/wmax in pkts, so because our cwnd is in - * bytes, we have to multiply by smss. - */ - return (((wmax * RENO_BETA) + (((usecs_since_epoch * smss) - << CUBIC_SHIFT) / rtt_usecs)) >> CUBIC_SHIFT); -} - /* * Compute the "TCP friendly" cwnd by newreno in congestion avoidance state. */ -static __inline unsigned long +static inline uint32_t tf_cwnd(struct cc_var *ccv) { /* newreno is "TCP friendly" */ From nobody Mon Jun 16 17:16:44 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 4bLc9m3xpJz5y8V6; Mon, 16 Jun 2025 17:16:44 +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 4bLc9m39zjz3TDj; Mon, 16 Jun 2025 17:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750094204; 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=eRy9umocwOk1fx8ZS5bk199Tq9KulP8kXE0oCkrAu7U=; b=o9u8fxxHlV4XFz4382RatQB50BofKEQNU7MfP5Spw3kAbgk2DHnc/Farofyh9yjaOViL/D a/4q8KJEcmkS1bihvEPFw+Kr+R6VwiaxHQiQLB0EWBggAT5bbkGQhKWF2B26sjFbDSdbFO 3++IfGfPuL5p3G/f7isP9CXFLFArvdfLiyzT8S6HpJhhp/1/0+VwpSxzgH1WsBq4kFevsy 5eVP8YjlykFPPrkv7N5DrUuDdlflQPGfUVS4MdquknUU9vWFiXZPJCE0cFjSwuDJ6Oat5F XPcGRJyNkv8Ahbf5UeMHjtoroVqp6VZ++IUzOuOnpML3nUN5Xl2K0iAP8iQueg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750094204; 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=eRy9umocwOk1fx8ZS5bk199Tq9KulP8kXE0oCkrAu7U=; b=j54wKF+8X3XTITpby/aMCmWHsEEhq4YZory1V3RJ3+T/5G2KkaP1JIuNABCqjvnm2JmiRU soey08HlrKlCzQSv8YnEpRv5mMs1nmQ2/ptZzjQtGF5MOsgMKRjA5qXZFbdpRQL+l3L17X Bt0LZXm+YfQm48VsVO+oyRHd1FpGoIvVRb6z0mAb/Q4U0VFD7alDjWzhkXpddTX4eCVTl6 /KlIGyFM1SB44JyI8O+B0GzftbhmB+Wrs8Ihx7plO1AagnfBJ6dH+FKSB64/oLg1ZXXYdc prED7MZFV7xM5O0O2NFTDL2N9wzEE0/WaHY+8e38cj+XuXSsQCUIurx6guC1kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750094204; a=rsa-sha256; cv=none; b=KOFodQLtCNlSgF4Xr5m6Kf0L7vf7rFx/i5dmqOtpSO+WU/JXjGI4RAmMKO/faJOZCGPZV8 os9ph7e6fPxm8kq91Y/PWu/olS8b+yQDnICukhNePgiyeV1D7D2NiTOUbxVLuIc8JXtgtB iS4vm78lQqVE2CqnldTkbpBi+4+fCHI6qfxvI9PM7b/rRQZZZzgnqAtXUETMv9L+xR8qn5 2wHYZXGd1aSDfud26gb7GmDSw0yaXzjnjAlzYHv3nsXXLhzK5ZHAcilmXp8DxtJexiYLAk 5+ihVBez+WG35yIP7Toi+2RZsOPbLYw1bcNJ01DGQ9ym1W/ew7capU04z+PpQw== 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 4bLc9m2LLfz15Yh; Mon, 16 Jun 2025 17:16:44 +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 55GHGiHG085408; Mon, 16 Jun 2025 17:16:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GHGiMb085405; Mon, 16 Jun 2025 17:16:44 GMT (envelope-from git) Date: Mon, 16 Jun 2025 17:16:44 GMT Message-Id: <202506161716.55GHGiMb085405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: be3c2087c884 - main - Revert "Makefile.inc1: attempt to fix pkgbase building" 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be3c2087c88463c95ff733883773a59202ba12a2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=be3c2087c88463c95ff733883773a59202ba12a2 commit be3c2087c88463c95ff733883773a59202ba12a2 Author: Warner Losh AuthorDate: 2025-06-16 17:13:19 +0000 Commit: Warner Losh CommitDate: 2025-06-16 17:13:19 +0000 Revert "Makefile.inc1: attempt to fix pkgbase building" This was an attempt to fix b44147bb1245, but it's still not right. Per conversation on irc, revert it and the other commit so we can redo them correctly. Suggested by: bapt, kevans --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cff150668083..97bd81f3263f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2048,7 +2048,7 @@ package-pkg: .PHONY real-packages: stage-packages create-packages sign-packages .PHONY -real-update-packages: .PHONY create-packages +real-update-packages: .PHONY .if defined(PKG_VERSION_FROM_DIR) @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ From nobody Mon Jun 16 17:34:36 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 4bLcZS2t3kz5yBF9; Mon, 16 Jun 2025 17:34:40 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLcZR5vxtz3dNw; Mon, 16 Jun 2025 17:34:39 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id R5XOunkB39JM2RDjCuRpZe; Mon, 16 Jun 2025 17:34:38 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id RDjBu0WItl5eGRDjCuZ4JW; Mon, 16 Jun 2025 17:34:38 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=EO6l0EZC c=1 sm=1 tr=0 ts=685055ae a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=VxmjJ2MpAAAA:8 a=YxBL1-UpAAAA:8 a=Ew9AnIkR3oUrOk5kWkAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 72C10357; Mon, 16 Jun 2025 10:34:36 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 68EA7AE; Mon, 16 Jun 2025 10:34:36 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: John Baldwin cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bafe0e7edaee - main - pam_ksu: Proactively address MIT KRB5 build failure In-reply-to: <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org> References: <202506160251.55G2plI3062868@gitrepo.freebsd.org> <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org> Comments: In-reply-to John Baldwin message dated "Mon, 16 Jun 2025 12:31:54 -0400." 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=us-ascii Date: Mon, 16 Jun 2025 10:34:36 -0700 Message-Id: <20250616173436.68EA7AE@slippy.cwsent.com> X-CMAE-Envelope: MS4xfMIqqD7VrcJzaCUF4lcL2M/M7fWXa4+GjJHlf30NpyE6LqMKK+yNcFseOY1uhKTI3yBFeI7cQ2uWyBwGjQW7e8AoTo6rqp2OAbjtwzCl6IPUmCJmYo85 R+XRTW4VwXrsWrEeSlaD56Q7L0uAXw1QxRxrOJ3mAwFF3JU/kUPrCD8SlT6019Q6TxaKgSAkCnwitAbYX6xvikM2bsYR4qR0XOz1NvI5KfKSICnEMYxl9sl6 EZsWk3kNBuoy5hvvM+vnqgtruJwr3UfYrCbURAggjVy4H9W95Sh3t9hivh52PlucKLNZmhzTu1RGB9rEdAuDVM143Vfg7Y8FbHzJWcbTMKrw0PX4rCMsXBP3 c+rEmwOL X-Rspamd-Queue-Id: 4bLcZR5vxtz3dNw X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN_FAIL(0.00)[32.99.97.3.asn.rspamd.com:server fail] In message <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org>, John Baldwin wri tes: > On 6/15/25 22:51, Cy Schubert wrote: > > The branch main has been updated by cy: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=bafe0e7edaee75f3fcfe6bf6c3e7b1 > e816361365 > > > > commit bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 > > Author: Cy Schubert > > AuthorDate: 2025-06-05 17:09:57 +0000 > > Commit: Cy Schubert > > CommitDate: 2025-06-16 02:49:35 +0000 > > > > pam_ksu: Proactively address MIT KRB5 build failure > > > > MIT KRB5 does not provide a krb5_make_principal() function. We need to > > provide this ourselves for now. We provide the function for now while > > MIT and Heimdal are both in the tree. When Heimdal is removed we can > > inline the calls to krb5_get_default_realm() and > > krb5_build_principal_va(). krb5_build_principal_va() is > > deprecated in MIT KRB5. Its replacement, krb5_build_principal_alloc_va > () > > will be used instead at that time. > > > > Sponsored by: The FreeBSD Foundation > > Differential revision: https://reviews.freebsd.org/D50808 > > I still don't understand how this can work instead of instantly segfaulting > as I said in the review. > > > diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ > ksu/pam_ksu.c > > index 47362c835c12..a6b3f043d3f4 100644 > > --- a/lib/libpam/modules/pam_ksu/pam_ksu.c > > +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c > > @@ -48,6 +48,61 @@ static long get_su_principal(krb5_context, const ch > ar *, const char *, > > static int auth_krb5(pam_handle_t *, krb5_context, const char *, > > krb5_principal); > > > > +#ifdef MK_MITKRB5 > > +/* For MIT KRB5 only. */ > > + > > +/* > > + * XXX This entire module will need to be rewritten when heimdal > > + * XXX compatidibility is no longer needed. > > + */ > > +#define KRB5_DEFAULT_CCFILE_ROOT "/tmp/krb5cc_" > > +#define KRB5_DEFAULT_CCROOT "FILE:" KRB5_DEFAULT_CCFILE_ROOT > > + > > +/* > > + * XXX We will replace krb5_build_principal_va() with > > + * XXX krb5_build_principal_alloc_va() when Heimdal is finally > > + * XXX removed. > > + */ > > +krb5_error_code KRB5_CALLCONV > > +krb5_build_principal_va(krb5_context context, > > + krb5_principal princ, > > + unsigned int rlen, > > + const char *realm, > > + va_list ap); > > +typedef char *heim_general_string; > > +typedef heim_general_string Realm; > > +typedef Realm krb5_realm; > > +typedef const char *krb5_const_realm; > > + > > +static krb5_error_code > > +krb5_make_principal(krb5_context context, krb5_principal principal, > > + krb5_const_realm realm, ...) > > +{ > > + krb5_error_code rc; > > + va_list ap; > > + if (realm == NULL) { > > + krb5_realm temp_realm = NULL; > > + if ((rc = krb5_get_default_realm(context, &temp_realm))) > > + return (rc); > > + realm=temp_realm; > > + if (temp_realm) > > + free(temp_realm); > > + } > > + va_start(ap, realm); > > + /* > > + * XXX Ideally we should be using krb5_build_principal_alloc_va() > > + * XXX here because krb5_build_principal_va() is deprecated. But, > > + * XXX this would require changes elsewhere in the calling code > > + * XXX to call krb5_free_principal() elsewhere to free the > > + * XXX principal. We can do that after Heimdal is removed from > > + * XXX our tree. > > + */ > > + rc = krb5_build_principal_va(context, principal, strlen(realm), realm, > ap); > > + va_end(ap); > > + return (rc); > > +} > > +#endif > > + > > PAM_EXTERN int > > pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, > > int argc __unused, const char *argv[] __unused) > > @@ -217,7 +272,13 @@ get_su_principal(krb5_context context, const char *tar > get_user, const char *curr > > if (rv != 0) > > return (errno); > > if (default_principal == NULL) { > > +#ifdef MK_MITKRB5 > > + /* For MIT KRB5. */ > > + rv = krb5_make_principal(context, default_principal, NULL, curr > ent_user, NULL); > > +#else > > + /* For Heimdal. */ > > rv = krb5_make_principal(context, &default_principal, NULL, cur > rent_user, NULL); > > +#endif > > At this point default_principal is always NULL, so you pass in a NULL pointer > to > krb5_build_princpal_va. That will surely crash. In Heimdal the principal argument is defined as krb5_principal *principal Whereas in MIT the principal argument is krb5_principal princ In Heimdal krb5_principal is a structure. In MIT it is a pointer to the same structure. build_principal() is defined as a struct in Heimdal and a pointer to a struct in MIT. Therefore the function prototypes are different. > > Also, you then pass that NULL pointer to the following code which would also > surely crash: > > /* Now that we have some principal, if the target account is > * `root', then transform it into a `root' instance, e.g. > * `user@REA.LM' -> `user/root@REA.LM'. > */ > rv = krb5_unparse_name(context, default_principal, &principal_name); > krb5_free_principal(context, default_principal); > > This is why I said your comment seems wrong. The Heimdal version is clearly > allocating > a principal, so the MIT version should also be doing that, and you should alr > eady be > using krb5_build_prinpcial_alloc_va() _now_. Your comment claims that the ca > lling code > isn't using krb5_free_principal(), but the calling code quoted above in get_s > u_principal() > does call krb5_free_principal(). > > Have you tested this at runtime? Yes. It is running here. slippy$ which ksu /usr/bin/ksu slippy$ /usr/bin/ksu Authenticated cy@CWSENT.COM Account root: authorization for cy@CWSENT.COM successful Changing uid to root (0) slippy$ id uid=0(root) gid=0(wheel) groups=0(wheel),5(operator),920(vboxusers) slippy$ -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Mon Jun 16 17:38:00 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 4bLcfM60Jqz5yBbV; Mon, 16 Jun 2025 17:38:03 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLcfM2dnbz3ffr; Mon, 16 Jun 2025 17:38:03 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id RBvluNJgc5MqyRDmUuAcPl; Mon, 16 Jun 2025 17:38:02 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id RDmTu8gTIJhBPRDmTul1nD; Mon, 16 Jun 2025 17:38:02 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=6850567a a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=VxmjJ2MpAAAA:8 a=YxBL1-UpAAAA:8 a=MwvgeLF43hSTjRKjKUEA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A0A6C35C; Mon, 16 Jun 2025 10:38:00 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 74478206; Mon, 16 Jun 2025 10:38:00 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: John Baldwin , Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bafe0e7edaee - main - pam_ksu: Proactively address MIT KRB5 build failure In-reply-to: <20250616173436.68EA7AE@slippy.cwsent.com> References: <202506160251.55G2plI3062868@gitrepo.freebsd.org> <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org> <20250616173436.68EA7AE@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Mon, 16 Jun 2025 10:34:36 -0700." 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=us-ascii Date: Mon, 16 Jun 2025 10:38:00 -0700 Message-Id: <20250616173800.74478206@slippy.cwsent.com> X-CMAE-Envelope: MS4xfKPxv2ESgSe2inlFO3A1PVwL4x3f4muMYTkMFTD17085rmiXI0W7SbpXgRJ9oxE6xP4oirhyCYQ1RABzWxbMU6u/gsphyJUgOeMAUuWfbx4DJpSslO93 Fo7o2C2SAMjVOzAz+E/W5KkscgSZHsWL5qd1sg2bIzApc8M0MPz5ZhHptRNo56pDP793e3tI+Og0G24XiRFm/IhbbtRS0bhECpQjS9EjZY0U/ffRR2B58/rC W9qAKc2RoapnYo+87vSgnjhosx3dHotqmW15MsumScbG2isSJwDpriB4AhOn72Jid4oFRjPzeGbS948UobD4i5ZcBgm27+kFwWMt4t4OWWNpA7YPAdzsmgNP 5QS4M5E7 X-Rspamd-Queue-Id: 4bLcfM2dnbz3ffr X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN_FAIL(0.00)[33.99.97.3.asn.rspamd.com:server fail] In message <20250616173436.68EA7AE@slippy.cwsent.com>, Cy Schubert writes: > In message <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org>, John Baldwin > wri > tes: > > On 6/15/25 22:51, Cy Schubert wrote: > > > The branch main has been updated by cy: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=bafe0e7edaee75f3fcfe6bf6c3e7 > b1 > > e816361365 > > > > > > commit bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 > > > Author: Cy Schubert > > > AuthorDate: 2025-06-05 17:09:57 +0000 > > > Commit: Cy Schubert > > > CommitDate: 2025-06-16 02:49:35 +0000 > > > > > > pam_ksu: Proactively address MIT KRB5 build failure > > > > > > MIT KRB5 does not provide a krb5_make_principal() function. We need > to > > > provide this ourselves for now. We provide the function for now whil > e > > > MIT and Heimdal are both in the tree. When Heimdal is removed we can > > > inline the calls to krb5_get_default_realm() and > > > krb5_build_principal_va(). krb5_build_principal_va() is > > > deprecated in MIT KRB5. Its replacement, krb5_build_principal_alloc_ > va > > () > > > will be used instead at that time. > > > > > > Sponsored by: The FreeBSD Foundation > > > Differential revision: https://reviews.freebsd.org/D50808 > > > > I still don't understand how this can work instead of instantly segfaulting > > as I said in the review. > > > > > diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pa > m_ > > ksu/pam_ksu.c > > > index 47362c835c12..a6b3f043d3f4 100644 > > > --- a/lib/libpam/modules/pam_ksu/pam_ksu.c > > > +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c > > > @@ -48,6 +48,61 @@ static long get_su_principal(krb5_context, const ch > > ar *, const char *, > > > static int auth_krb5(pam_handle_t *, krb5_context, const char *, > > > krb5_principal); > > > > > > +#ifdef MK_MITKRB5 > > > +/* For MIT KRB5 only. */ > > > + > > > +/* > > > + * XXX This entire module will need to be rewritten when heimdal > > > + * XXX compatidibility is no longer needed. > > > + */ > > > +#define KRB5_DEFAULT_CCFILE_ROOT "/tmp/krb5cc_" > > > +#define KRB5_DEFAULT_CCROOT "FILE:" KRB5_DEFAULT_CCFILE_ROOT > > > + > > > +/* > > > + * XXX We will replace krb5_build_principal_va() with > > > + * XXX krb5_build_principal_alloc_va() when Heimdal is finally > > > + * XXX removed. > > > + */ > > > +krb5_error_code KRB5_CALLCONV > > > +krb5_build_principal_va(krb5_context context, > > > + krb5_principal princ, > > > + unsigned int rlen, > > > + const char *realm, > > > + va_list ap); > > > +typedef char *heim_general_string; > > > +typedef heim_general_string Realm; > > > +typedef Realm krb5_realm; > > > +typedef const char *krb5_const_realm; > > > + > > > +static krb5_error_code > > > +krb5_make_principal(krb5_context context, krb5_principal principal, > > > + krb5_const_realm realm, ...) > > > +{ > > > + krb5_error_code rc; > > > + va_list ap; > > > + if (realm == NULL) { > > > + krb5_realm temp_realm = NULL; > > > + if ((rc = krb5_get_default_realm(context, &temp_realm))) > > > + return (rc); > > > + realm=temp_realm; > > > + if (temp_realm) > > > + free(temp_realm); > > > + } > > > + va_start(ap, realm); > > > + /* > > > + * XXX Ideally we should be using krb5_build_principal_alloc_va() > > > + * XXX here because krb5_build_principal_va() is deprecated. But, > > > + * XXX this would require changes elsewhere in the calling code > > > + * XXX to call krb5_free_principal() elsewhere to free the > > > + * XXX principal. We can do that after Heimdal is removed from > > > + * XXX our tree. > > > + */ > > > + rc = krb5_build_principal_va(context, principal, strlen(realm), realm, > > ap); > > > + va_end(ap); > > > + return (rc); > > > +} > > > +#endif > > > + > > > PAM_EXTERN int > > > pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, > > > int argc __unused, const char *argv[] __unused) > > > @@ -217,7 +272,13 @@ get_su_principal(krb5_context context, const char *t > ar > > get_user, const char *curr > > > if (rv != 0) > > > return (errno); > > > if (default_principal == NULL) { > > > +#ifdef MK_MITKRB5 > > > + /* For MIT KRB5. */ > > > + rv = krb5_make_principal(context, default_principal, NULL, curr > > ent_user, NULL); > > > +#else > > > + /* For Heimdal. */ > > > rv = krb5_make_principal(context, &default_principal, N > ULL, cur > > rent_user, NULL); > > > +#endif > > > > At this point default_principal is always NULL, so you pass in a NULL point > er > > to > > krb5_build_princpal_va. That will surely crash. > > In Heimdal the principal argument is defined as > > krb5_principal *principal > > Whereas in MIT the principal argument is > > krb5_principal princ > > In Heimdal krb5_principal is a structure. In MIT it is a pointer to the > same structure. > > build_principal() is defined as a struct in Heimdal and a pointer to a > struct in MIT. Therefore the function prototypes are different. I should have said, build_principal() references the pointer to the struct because the principal is a struct while in MIT the principal is a pointer to principal_data, the actual struct. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 > > > > > Also, you then pass that NULL pointer to the following code which would als > o > > surely crash: > > > > /* Now that we have some principal, if the target account is > > * `root', then transform it into a `root' instance, e.g. > > * `user@REA.LM' -> `user/root@REA.LM'. > > */ > > rv = krb5_unparse_name(context, default_principal, &principal_name); > > krb5_free_principal(context, default_principal); > > > > This is why I said your comment seems wrong. The Heimdal version is clearl > y > > allocating > > a principal, so the MIT version should also be doing that, and you should a > lr > > eady be > > using krb5_build_prinpcial_alloc_va() _now_. Your comment claims that the > ca > > lling code > > isn't using krb5_free_principal(), but the calling code quoted above in get > _s > > u_principal() > > does call krb5_free_principal(). > > > > Have you tested this at runtime? > > Yes. It is running here. > > slippy$ which ksu > /usr/bin/ksu > slippy$ /usr/bin/ksu > Authenticated cy@CWSENT.COM > Account root: authorization for cy@CWSENT.COM successful > Changing uid to root (0) > slippy$ id > uid=0(root) gid=0(wheel) groups=0(wheel),5(operator),920(vboxusers) > slippy$ > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e**(i*pi)+1=0 > From nobody Mon Jun 16 17:55:41 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 4bLd2j6SzMz5yCbZ; Mon, 16 Jun 2025 17:55:41 +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 4bLd2j5dQVz3qcx; Mon, 16 Jun 2025 17:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750096541; 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=J88+6pxUzrUfoy/oE0lYows6XDkJ/JxnEWw+kInPYYg=; b=tiU+J5WjZ96Gow2vWlaR4E4ySYksij3YuFFX7EcuMu5hiGa0ILiO7e1aVUMdWjIaTjTuA2 fCCmBDd8tmS1oEVhh0+XiYFJ39tLmnficba44lU/HGmTz3+XntFgHJvOjr1DsULauYoLrZ vQsfF4lj4qn85xrs5RhwrNRCH77PgXTCU4rTv4aGf0rQEWkdr0f0G1+TLGj8r3PVB1Avey ib7sWFVLfabeQEhy4AIRf6lY3u3oGxeEo3In4RfcSD9bi3Qmrfz7kBgSr+s2Rz27gOG08G v9TiqHNbVSXodBnN4Ofo+D21bZRm+Oi1BwXiIKxrgpOeLQ8upSfCRh/suDl2ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750096541; 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=J88+6pxUzrUfoy/oE0lYows6XDkJ/JxnEWw+kInPYYg=; b=uPSzz+l4Ay2GTJp0urV7IXE6ke9+/YqCvEpAJ0g646W3ajmsCYbuvUUNxxGQJ+mcoMKXtq 4Se4NYXstejfHX6S8cIs5lF17BMFIGIdaT3JPAC4FdjoBf+01oLiVkfC57A5loCdhzxDH4 9EjV7xA6eP3D52zMaP2a0v5JgqGMrRwL0+rydsuJUvhriZrRJ7fjj8P2eYVlwuMtJF/5Qx T0VcNhaxQ6cK126APFyjjab9ER+fLbmUJEkPWJa5WKVPq6rDL3ikkgGjUrJk6DkcaOUigR k8vadoNS0KjjiID4/MsA+b8Stkgv+KzEJ46kEucEnW2jVCdp6ENtIvKC8EppTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750096541; a=rsa-sha256; cv=none; b=Rp3OsDTXJ7I+LJAG6jE7TR0WXtjghLf4ZMcyiYG/JvjrN8hL26Hnknvfy2HcYBfDHuR0B+ sjYsUbwp8yTFggbXPkiM6cSfxwelq1CR7vPf66SOGfdOnOa2UhbobaemOE5nItZM9gYwOx 6gW4CdehdmoSGlAGTQXBss3FVrnD7JYomsO9tOPnt9hEJlKPuTAKjZKT0DlPmpF7Zs2hvl 3dhAjPKi68PG1dglYkG4Hi7LJi7h3rS7JjI4xj2WQRifwLLpJ3K1U+Ho3c7RTaGX2TMln6 mbpZ2wUIWpS+y7Z7FvqkBJsEdGfZMqYXSlB7oAPyfNLaBOpaPmjwvVCW3FLQ/Q== 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 4bLd2j50K2z17Bv; Mon, 16 Jun 2025 17:55:41 +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 55GHtfY2059192; Mon, 16 Jun 2025 17:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GHtf4M059189; Mon, 16 Jun 2025 17:55:41 GMT (envelope-from git) Date: Mon, 16 Jun 2025 17:55:41 GMT Message-Id: <202506161755.55GHtf4M059189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a892d594a20b - main - Don't define NULL to nullptr in C++11 mode 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a892d594a20baa851a5850f0b3ae6f4d81c99a08 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a892d594a20baa851a5850f0b3ae6f4d81c99a08 commit a892d594a20baa851a5850f0b3ae6f4d81c99a08 Author: John Baldwin AuthorDate: 2025-06-16 17:54:47 +0000 Commit: John Baldwin CommitDate: 2025-06-16 17:54:47 +0000 Don't define NULL to nullptr in C++11 mode While C++ does seem to permit this, both GCC and clang do not do this in their bundled headers. Instead, both use the __null builtin (and g++ unconditionally overrides NULL back to __null). Our local change makes FreeBSD's C++ environment subtly different from the rest of the world such that code that compiles fine with clang++ on FreeBSD doesn't compile fine on other systems and doesn't compile on FreeBSD using g++. This reverts commit 3033610f5dfd03b68de35631a8693963a80099c2. PR: 286477 (exp-run) Reviewed by: olce, imp, dim, emaste Differential Revision: https://reviews.freebsd.org/D50089 --- sys/sys/_null.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/sys/_null.h b/sys/sys/_null.h index 28a7bd7f6708..f5c4223b9b8c 100644 --- a/sys/sys/_null.h +++ b/sys/sys/_null.h @@ -31,9 +31,7 @@ #if !defined(__cplusplus) #define NULL ((void *)0) #else -#if __cplusplus >= 201103L -#define NULL nullptr -#elif defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4 +#if defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4 #define NULL __null #else #if defined(__LP64__) From nobody Mon Jun 16 17:57: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 4bLd4b0lTdz5yCn5; Mon, 16 Jun 2025 17:57: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 4bLd4b06SRz3rZP; Mon, 16 Jun 2025 17:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750096639; 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=hRBt540Ynyn9lW93PVrntmaCker5AFTSqRmWXixDgUk=; b=rtBdOzbZJ2nfBa8OgkX5yMj46w2A2yta7LrtIKmetUc96N3426KsMxslmEEH1KJEqOLQ33 WZEgHH0mrd4Dw5CnAtrmRkJ+JYjK4XNf9I9+V9HzTpY//XPpDiG+nGm9c0KOV/JWVj90ng tR1Lx0+NVk+w05pVSSl+q6AhB9GPwoV9v02C/5IH53gweZcczYRTAnXSbpaGBJ+4hyB9E4 icvG3CL9LS6kU/CkbBbn7/Uq81WeIkHQH+8LtODOaxcDQJQxG8fMJ0637SWEvamDUkScbi 4MvrYTjyzXIJLmBC8W5dq2kgLIW0s/v4SxEu4D9K7CQtU0zmvcSWcTy8gjcv9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750096639; 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=hRBt540Ynyn9lW93PVrntmaCker5AFTSqRmWXixDgUk=; b=sl1FAJSKSX0LRTGrMfcCa2z3YehxiGGvXHSgujZbH8KpgvnA/u/sfPVOa0E6HMEittXrpL 4542WKT8t+iD9axGwRPmWTLuSnDLboM6sC/Ak59s3GJXsjvaJR/zYk3r9VCBHMXN2M698F 7PuXciCo1z2ribfngf6xWV3/y0+T0EqbjlGw0cWCagu2PO+fxDsJshxB7/AZXZG3MeKOyT Mcyl97NxtGqH0qEWBr145wAyTXEE9Iu0EBIjJ2+CaG63xI/eY1MaRuMOr3IgqNuyTg5BnY 5JHhDSLxHx+yBP7jr78djpZgMuIjZgSCCJQ5THYsfuuPbOx73GByJPuMqFfyFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750096639; a=rsa-sha256; cv=none; b=Wp0UkDxFGb9I00ZfmVzRiwvwdRiMlE6BbFwZDDeGnU0c2gVSORIYlgiybOHiJu3eArRHf9 m3SNn+P/sm0w+Nnp3u0ZrI+/X/COlTS6uWhUotdihgtC7Sw9cp/vIPedU79zoAyUd2gf5d rqY/900ZKubIRzS+Ef94hT2Ljwk14w3idVHgLmBEshOahMeGFJ2lETcsRY2baTffRQzWrc 04as7ZuEMBj8aLzTkHAjC6qzD3/u+ea4t2NX7rsTJ8OBldeEU1jC/vF38u/4vpQpE1n8+u K0EUROEawQvy7Ot/8i/Ev+DgHeSir8SkaVR2yfJwsZiPFnbQ8ILPECRR5OARnA== 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 4bLd4Z6WdZz16gr; Mon, 16 Jun 2025 17:57: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 55GHvIgp059772; Mon, 16 Jun 2025 17:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GHvIZ7059769; Mon, 16 Jun 2025 17:57:18 GMT (envelope-from git) Date: Mon, 16 Jun 2025 17:57:18 GMT Message-Id: <202506161757.55GHvIZ7059769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 45165aab2d22 - main - nvme.ko: Don't include nvme_util.c 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45165aab2d229a1377fb2c054d5c7c338acc268a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=45165aab2d229a1377fb2c054d5c7c338acc268a commit 45165aab2d229a1377fb2c054d5c7c338acc268a Author: John Baldwin AuthorDate: 2025-06-16 17:56:52 +0000 Commit: John Baldwin CommitDate: 2025-06-16 17:56:52 +0000 nvme.ko: Don't include nvme_util.c This file is already included in cam.ko which nvme.ko depends on unconditionally. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D50705 --- sys/modules/nvme/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/modules/nvme/Makefile b/sys/modules/nvme/Makefile index 9d7cf19b925e..936a28fa5de9 100644 --- a/sys/modules/nvme/Makefile +++ b/sys/modules/nvme/Makefile @@ -13,7 +13,6 @@ SRCS = nvme.c \ nvme_sim.c \ nvme_sysctl.c \ nvme_test.c \ - nvme_util.c \ \ bus_if.h \ device_if.h \ From nobody Mon Jun 16 18:18:48 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 4bLdYQ0FcWz5yF60; Mon, 16 Jun 2025 18:18:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLdYP68lbz452t; Mon, 16 Jun 2025 18:18:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750097929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0jOvyCVrtolyApCQzDyUaZS8Si+UET/uO6lNM42qbfM=; b=CbJzWdiR3mxB+GGH9UuTP1cNRA6BdlTttjiu6bHlIOWg5/Bpvz4v2UNfxcMcD6oxMrXq8G Cx2O8v2rk071b4FasOvgzrKxKkw3M34k1MJbfBbeolwLfYCKrTM0pra1ChGUXbRlerVt2S xpkxCncJLO6sKht8jQ1USn2Krc2QhR6IAk7Ipiq6TS9AJ/jIiQ3uY49zX1dOlm4fl6Pss/ 97/OzHTN4SpanhMYppMnUe7lhOndC5cynEl4SS3PDmsqVyL7toD5y+h7FIquDBHjNi1Vbu YyOE/M57kgJ/jsI/D4DAK3j9F2ISveTVFn39w5ABFT+He1GQERAixIrqNHORUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750097929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0jOvyCVrtolyApCQzDyUaZS8Si+UET/uO6lNM42qbfM=; b=ZKdPWCsLw/od1jYY9gPC7vRzq3NfUjOBgC5/gY101ag993dMQ/MI3K4hPWR1J0DVkl98Ao /5jR7APVUTw0+EeY4R+PzRcz1tqaV3Z9tv7QNLtjwmwSYNRIqaQ3/MBXMn0/AOO0Qsn+JV arNCyVEU7d37bgSe32Z59Xvy4DlLNnon42Qh22EEykZYp1fav58DI5IJSRcqFSrLhdvMcD g4aQ4eTtO2EDeyCHTcbxcrjG+H8FQu+/A9moZnPs3k3JGw9jjqqGAFPBi7LV9zfw8ZK8kv bCdNrJqiHjx/wBi3/eLaKtjXHE/4LE1Wy7Uf2De1nvmBYPsFlLMad3kofVdO6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750097929; a=rsa-sha256; cv=none; b=BjmgU+8abaYTxW8f257UB1YJuMpDMR5vUzEEqmOIDRXN7DRPyS2+sQasrzc61n3piGllks pK0occoE13BjwOD+pQbn3fNcAHVQbPYCo815l8J7GKjro7H/gHmQOiFsMQJBcD9CwhDHMZ 1aX1FWNU7ndMBOyoOcXpNh07IQtY2DOcKzqiBhzeUEKNTfyzvR65zvz5hgwA9FXeRSFZNC eizdtNRkB+bdjhL3nzR74AM4O77aVsvNg5712UurpywyDFQef4b+BQOC0CaRtSUj4KGeZy peXOXkTJGg4LjWh3GxG6ubCSbN4JPCA4HUPXW6u2sqm9njBis/0t08qQlH99YQ== Received: from [IPV6:2601:5c0:4200:b830:1556:8d92:a58f:7b21] (unknown [IPv6:2601:5c0:4200:b830:1556:8d92:a58f:7b21]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bLdYP3dpDzppM; Mon, 16 Jun 2025 18:18:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 16 Jun 2025 14:18:48 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: bafe0e7edaee - main - pam_ksu: Proactively address MIT KRB5 build failure Content-Language: en-US To: Cy Schubert Cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202506160251.55G2plI3062868@gitrepo.freebsd.org> <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org> <20250616173436.68EA7AE@slippy.cwsent.com> From: John Baldwin In-Reply-To: <20250616173436.68EA7AE@slippy.cwsent.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 6/16/25 13:34, Cy Schubert wrote: > In message <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org>, John Baldwin > wri > tes: >> On 6/15/25 22:51, Cy Schubert wrote: >>> The branch main has been updated by cy: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=bafe0e7edaee75f3fcfe6bf6c3e7b1 >> e816361365 >>> >>> commit bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 >>> Author: Cy Schubert >>> AuthorDate: 2025-06-05 17:09:57 +0000 >>> Commit: Cy Schubert >>> CommitDate: 2025-06-16 02:49:35 +0000 >>> >>> pam_ksu: Proactively address MIT KRB5 build failure >>> >>> MIT KRB5 does not provide a krb5_make_principal() function. We need to >>> provide this ourselves for now. We provide the function for now while >>> MIT and Heimdal are both in the tree. When Heimdal is removed we can >>> inline the calls to krb5_get_default_realm() and >>> krb5_build_principal_va(). krb5_build_principal_va() is >>> deprecated in MIT KRB5. Its replacement, krb5_build_principal_alloc_va >> () >>> will be used instead at that time. >>> >>> Sponsored by: The FreeBSD Foundation >>> Differential revision: https://reviews.freebsd.org/D50808 >> >> I still don't understand how this can work instead of instantly segfaulting >> as I said in the review. >> >>> diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ >> ksu/pam_ksu.c >>> index 47362c835c12..a6b3f043d3f4 100644 >>> --- a/lib/libpam/modules/pam_ksu/pam_ksu.c >>> +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c >>> @@ -48,6 +48,61 @@ static long get_su_principal(krb5_context, const ch >> ar *, const char *, >>> static int auth_krb5(pam_handle_t *, krb5_context, const char *, >>> krb5_principal); >>> >>> +#ifdef MK_MITKRB5 >>> +/* For MIT KRB5 only. */ >>> + >>> +/* >>> + * XXX This entire module will need to be rewritten when heimdal >>> + * XXX compatidibility is no longer needed. >>> + */ >>> +#define KRB5_DEFAULT_CCFILE_ROOT "/tmp/krb5cc_" >>> +#define KRB5_DEFAULT_CCROOT "FILE:" KRB5_DEFAULT_CCFILE_ROOT >>> + >>> +/* >>> + * XXX We will replace krb5_build_principal_va() with >>> + * XXX krb5_build_principal_alloc_va() when Heimdal is finally >>> + * XXX removed. >>> + */ >>> +krb5_error_code KRB5_CALLCONV >>> +krb5_build_principal_va(krb5_context context, >>> + krb5_principal princ, >>> + unsigned int rlen, >>> + const char *realm, >>> + va_list ap); >>> +typedef char *heim_general_string; >>> +typedef heim_general_string Realm; >>> +typedef Realm krb5_realm; >>> +typedef const char *krb5_const_realm; >>> + >>> +static krb5_error_code >>> +krb5_make_principal(krb5_context context, krb5_principal principal, >>> + krb5_const_realm realm, ...) >>> +{ >>> + krb5_error_code rc; >>> + va_list ap; >>> + if (realm == NULL) { >>> + krb5_realm temp_realm = NULL; >>> + if ((rc = krb5_get_default_realm(context, &temp_realm))) >>> + return (rc); >>> + realm=temp_realm; >>> + if (temp_realm) >>> + free(temp_realm); This still has the use-after-free of `temp_realm` I pointed out in the review since you are going to use it below. >>> + } >>> + va_start(ap, realm); Also, this seems quite sketchy if realm was NULL. You are starting the va_list with the value of temp_realm which is not an on-stack argument? >>> + /* >>> + * XXX Ideally we should be using krb5_build_principal_alloc_va() >>> + * XXX here because krb5_build_principal_va() is deprecated. But, >>> + * XXX this would require changes elsewhere in the calling code >>> + * XXX to call krb5_free_principal() elsewhere to free the >>> + * XXX principal. We can do that after Heimdal is removed from >>> + * XXX our tree. >>> + */ >>> + rc = krb5_build_principal_va(context, principal, strlen(realm), realm, >> ap); >>> + va_end(ap); You need to wait to free temp_realm until here? >>> + return (rc); >>> +} >>> +#endif >>> + >>> PAM_EXTERN int >>> pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, >>> int argc __unused, const char *argv[] __unused) >>> @@ -217,7 +272,13 @@ get_su_principal(krb5_context context, const char *tar >> get_user, const char *curr >>> if (rv != 0) >>> return (errno); >>> if (default_principal == NULL) { >>> +#ifdef MK_MITKRB5 >>> + /* For MIT KRB5. */ >>> + rv = krb5_make_principal(context, default_principal, NULL, curr >> ent_user, NULL); >>> +#else >>> + /* For Heimdal. */ >>> rv = krb5_make_principal(context, &default_principal, NULL, cur >> rent_user, NULL); >>> +#endif >> >> At this point default_principal is always NULL, so you pass in a NULL pointer >> to >> krb5_build_princpal_va. That will surely crash. > > In Heimdal the principal argument is defined as > > krb5_principal *principal > > Whereas in MIT the principal argument is > > krb5_principal princ > > In Heimdal krb5_principal is a structure. In MIT it is a pointer to the > same structure. > > build_principal() is defined as a struct in Heimdal and a pointer to a > struct in MIT. Therefore the function prototypes are different. This doesn't make sense. The code assumes it is a pointer: if (default_principal == NULL) { #ifdef MK_MITKRB5 /* For MIT KRB5. */ rv = krb5_make_principal(context, default_principal, NULL, current_user, NULL); #else How are we comparing a structure to NULL? >> >> Also, you then pass that NULL pointer to the following code which would also >> surely crash: >> >> /* Now that we have some principal, if the target account is >> * `root', then transform it into a `root' instance, e.g. >> * `user@REA.LM' -> `user/root@REA.LM'. >> */ >> rv = krb5_unparse_name(context, default_principal, &principal_name); >> krb5_free_principal(context, default_principal); >> >> This is why I said your comment seems wrong. The Heimdal version is clearly >> allocating >> a principal, so the MIT version should also be doing that, and you should alr >> eady be >> using krb5_build_prinpcial_alloc_va() _now_. Your comment claims that the ca >> lling code >> isn't using krb5_free_principal(), but the calling code quoted above in get_s >> u_principal() >> does call krb5_free_principal(). >> >> Have you tested this at runtime? > > Yes. It is running here. > > slippy$ which ksu > /usr/bin/ksu > slippy$ /usr/bin/ksu > Authenticated cy@CWSENT.COM > Account root: authorization for cy@CWSENT.COM successful > Changing uid to root (0) > slippy$ id > uid=0(root) gid=0(wheel) groups=0(wheel),5(operator),920(vboxusers) > slippy$ Did you test without a valid credential cache to exercise the default_principal == NULL path? -- John Baldwin From nobody Mon Jun 16 18:42:41 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 4bLf4y2t1gz5yGPn; Mon, 16 Jun 2025 18:42:42 +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 4bLf4x6nkYz3Plm; Mon, 16 Jun 2025 18:42:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750099362; 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=4kYYBM6Qw2d7NFBcVqOAS/m5l6YljQI55DC1JtMdI/A=; b=aVbZYSSk1C456UKxt0oDLqvKzIwsr2z8swWBmFyAWR3Z9awpZUaeeCM/1CdJRS1xPSblf1 Bx7xGklCDxaAZoyV7pamiKhwyjhRw6FPrUt1soi+VwRUVPAiMMKbRQmzySvz6wcbryduWu QDFsxiXBhYIY6c4m+3RoB9PHbnZXoloNS/DeEQgcmA+IA7y8vUFHPNGibxulD5xZJtUQ67 4Pe+Aj1UoZLY1PXLEkri5ok+ZSjNdEocEVfb0Va+Ph6rPjeBFXkxKssjKKN7SdCg0ZHxdO z085MqmP0cNUxxTDPRI9ExEaZSD+D/FBnnsUvElpiHd3dEFJeUxnm2vJUM14/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750099361; 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=4kYYBM6Qw2d7NFBcVqOAS/m5l6YljQI55DC1JtMdI/A=; b=xorMa8Mj+Yb9IW5u5T18po9OfJDUD+GCNEoBoTL2yb0lvZrq5L/jyoJl/TD1MkaXHP458R 1EKlz8Nq4Kj4ORQ2st34A7V5q+Zymh1tmwfnMdtl7JfZFyvXFWgCA0h8/a64BnK7dVunNi V0ZfGdwNiAL3T06oaY/MOQpEjEQxfyW2XW2cADslmaRasamFKX7fYVjs6MelTnGjmPK/Iw Ii7EvyZtq7X+w5UFtZMNmEbFhewcnOE1AxpoXTwH49AAbGpIcTlOeaaMsVdF/wQSN30lLq Fxy97FefwLJ9giUBCnWLXsj0x8VW38oXPxf8MLx/LNTnMrp2fCj69ukwtYcn3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750099362; a=rsa-sha256; cv=none; b=YTmVSCJTLKC6mAiI5bM2aDMKMMt0A2cOVfLKjshXUIbDS58JUon8Py2sltzkTduhoWKm8w KsaoHDAnCtRQD6I1Qfwc9rS7FpEkBjDxoLm9GvE2vbRfuwf5rwn1UkNmz9wH8+l8N1SyR5 rtL4V79cMrFyWY+R1s09196k5h7h++trXd8n/8IFOPYQMGlGDVUmTyM/ezEsJ4cGkspWPC UV6atF+5oHLo6aXX1MCzrm/H0Ym6R5jJQtO6YcX+kjWEfLnS+H59q3XzYbu9aAAmuuTiP/ BJ2O84uijUZ3aVkrAJgh8MB2Wxyi4HYKkrvG1xSoI5eZxpkzFJkUMWRXsj1ZuQ== 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 4bLf4x6PKLz18Zp; Mon, 16 Jun 2025 18:42:41 +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 55GIgftn052880; Mon, 16 Jun 2025 18:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GIgf9M052877; Mon, 16 Jun 2025 18:42:41 GMT (envelope-from git) Date: Mon, 16 Jun 2025 18:42:41 GMT Message-Id: <202506161842.55GIgf9M052877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 98f18cd98824 - main - pam_ksu: Move the realm free to end of function 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98f18cd98824acdf1045e74615f2db0219019f0b Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=98f18cd98824acdf1045e74615f2db0219019f0b commit 98f18cd98824acdf1045e74615f2db0219019f0b Author: Cy Schubert AuthorDate: 2025-06-16 18:40:51 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 18:42:30 +0000 pam_ksu: Move the realm free to end of function This avoids a use after free. Noted by: jhb --- lib/libpam/modules/pam_ksu/pam_ksu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c index a6b3f043d3f4..e50c3e387311 100644 --- a/lib/libpam/modules/pam_ksu/pam_ksu.c +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c @@ -85,8 +85,6 @@ krb5_make_principal(krb5_context context, krb5_principal principal, if ((rc = krb5_get_default_realm(context, &temp_realm))) return (rc); realm=temp_realm; - if (temp_realm) - free(temp_realm); } va_start(ap, realm); /* @@ -99,6 +97,8 @@ krb5_make_principal(krb5_context context, krb5_principal principal, */ rc = krb5_build_principal_va(context, principal, strlen(realm), realm, ap); va_end(ap); + if (temp_realm) + free(temp_realm); return (rc); } #endif From nobody Mon Jun 16 18:46:08 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 4bLf94639Tz5yGXg for ; Mon, 16 Jun 2025 18:46:16 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLf941Tfdz3RRl for ; Mon, 16 Jun 2025 18:46:16 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-3d948ce7d9dso21202915ab.2 for ; Mon, 16 Jun 2025 11:46:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1750099570; x=1750704370; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=siKOuYyHEbqeuuTIg0Ugi3IJlpxeABDJN8Yuq1T+iiE=; b=hr6OPOz4D5S0W4lbxx8dAdBVGwls8X7/xf+j9Ko2BN+TY3QXMU/yIehK3Nb707DReS sOBhy/PoEUyT5sxfIV4phfwxcCqvbefAFoOc1rFdjAdg6Ai2SOvaMiSwMPUNcLf/jOEy cM7C4yn01ywkbv/udH0ObMhRH6uk1qteUtQkqXKLlNMHzLZ4vjqQnwL/qnEoV6sqZvvf wNFv2UsVZLKsfRdgVEek92JNYXQXzoxvS3VCHyRupBBHen4n5FFuZURNn1Cl0c1Kgo/x 2VOdRyhQidKIoxklLhxZGe/4G5ohydVGoZPL2+xAcnUnjz9qJnu0X2Caz07rheSA2lIj UE8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750099570; x=1750704370; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=siKOuYyHEbqeuuTIg0Ugi3IJlpxeABDJN8Yuq1T+iiE=; b=b0aslyo/1e0GGgkPiOSQOrkDaejNeAb/u5Ty1+IQ8QL3C7rsrQJYPJJ5mvMhl+VLzH A6rYxc6K4b7lFzXNwZzpOwvO7fqD7suQCxpMMlnXV5xr8lDRPygiHQvBawNFiMjGADmO aZX4m/4r5erZoK3kQfB1BX1rOVgUn3H8gjBwmc2545MMarnuYP49Fbui8Fl6bQs4i+C5 e6oeccKsO7V143o5KCZhlvZxS04Uf5R4/beaTqWPn6A2TYm1MUi+0jG7g8+yjpTsELKX qVkfMNGl0WRLSK9hXfg7PUnb+HhW4T9K2exxoJ7+oI2uqs4k1YFfjv/m7dOGV8YxAmkD GgzQ== X-Forwarded-Encrypted: i=1; AJvYcCVc202JtuMTUL9VFIcveLvDlS5FLFqlPNGHP7J67xH96QD9s4QzqB51M4zHJ4drZgL4uRKaXDiTr1x9pd7TuA+NDDb9Og==@freebsd.org X-Gm-Message-State: AOJu0Yy9AsLwoSoZU6n4PNY+8oHbF/wLE+VGXEm3a7NZ+1DZ2Prt0oTz KNohM2Fjpl/tLvuFsH1HOQkFS/QHmF+AoEh3lXGSjQwogPNF1IrOJuBeT3coVxW33jE= X-Gm-Gg: ASbGncsAGbmLo2ymYzprKOpByb8tPPYuR6l8Ki6MymaiXTY74LMPyIzmdpl9pBmCCTY VXqiPK5EOH6HfistwWDRoFB721RRaaqnGVpJybaHcFMPoEl7GE53hsNB7SzOBXgGUUw+lTIJPQm j9avkEag+z2tIbacz75ekYOpSVXHKCrHXY2B/dYfXE7umnSy5pCarqBQRM59dZ6Q4CmXHk/oOug bTuKdoc/O4MTMfPCYux+flrOaOLxNt+vOOCifHnsOekxgL4hqsJLjSL+moO44UyIo8shkVn3dXz 8QLZqmq11lLIeznBmP2VYZpafH7E7HoaPdzGu4vwECcq X-Google-Smtp-Source: AGHT+IFStLPGyMq2rw2HLOWr9l8aYjEC/1NS1riofHILyRUUvnZZmvz9VlAaUQeEEHpZ8vVtrI7Z+w== X-Received: by 2002:a05:6e02:1fe7:b0:3dd:88da:e804 with SMTP id e9e14a558f8ab-3de07d1bb31mr127017115ab.18.1750099570054; Mon, 16 Jun 2025 11:46:10 -0700 (PDT) Received: from mutt-hbsd ([2001:470:4001:1::95]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-50149c85c1asm1841245173.111.2025.06.16.11.46.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 11:46:09 -0700 (PDT) Date: Mon, 16 Jun 2025 18:46:08 +0000 From: Shawn Webb To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 98f18cd98824 - main - pam_ksu: Move the realm free to end of function Message-ID: X-Operating-System: FreeBSD mutt-hbsd 14.2-STABLE-HBSD FreeBSD 14.2-STABLE-HBSD HARDENEDBSD-14-STABLE amd64 X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202506161842.55GIgf9M052877@gitrepo.freebsd.org> 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: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="jol37ovfjjuqkati" Content-Disposition: inline In-Reply-To: <202506161842.55GIgf9M052877@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4bLf941Tfdz3RRl X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] --jol37ovfjjuqkati Content-Type: text/plain; protected-headers=v1; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: git: 98f18cd98824 - main - pam_ksu: Move the realm free to end of function MIME-Version: 1.0 On Mon, Jun 16, 2025 at 06:42:41PM +0000, Cy Schubert wrote: > The branch main has been updated by cy: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D98f18cd98824acdf1045e74615= f2db0219019f0b >=20 > commit 98f18cd98824acdf1045e74615f2db0219019f0b > Author: Cy Schubert > AuthorDate: 2025-06-16 18:40:51 +0000 > Commit: Cy Schubert > CommitDate: 2025-06-16 18:42:30 +0000 >=20 > pam_ksu: Move the realm free to end of function > =20 > This avoids a use after free. > =20 > Noted by: jhb > --- > lib/libpam/modules/pam_ksu/pam_ksu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pa= m_ksu/pam_ksu.c > index a6b3f043d3f4..e50c3e387311 100644 > --- a/lib/libpam/modules/pam_ksu/pam_ksu.c > +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c > @@ -85,8 +85,6 @@ krb5_make_principal(krb5_context context, krb5_principa= l principal, > if ((rc =3D krb5_get_default_realm(context, &temp_realm))) > return (rc); > realm=3Dtemp_realm; > - if (temp_realm) > - free(temp_realm); > } > va_start(ap, realm); > /* > @@ -99,6 +97,8 @@ krb5_make_principal(krb5_context context, krb5_principa= l principal, > */ > rc =3D krb5_build_principal_va(context, principal, strlen(realm), realm= , ap); > va_end(ap); > + if (temp_realm) > + free(temp_realm); Hey Cy, I think the call to free can be made unconditional as it's safe to call free on a NULL pointer (which turns into a no-op). Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --jol37ovfjjuqkati Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmhQZmoACgkQ/y5nonf4 4fot1A//aMbSqF+uPkE0tdAgXNNX4gsYJ53y/9vOnQYypjqxdLYzGEUanf66t4ob UeVj6dpjYm3NeaLq9HREK49X9HGqVZmqEd7KyE9VrVkgYjf5u+onUTSKjcZbgJ4x F0UIPctegUALxDXIjytImQZznxRqo0JLub99YXoSEPbmjmYrTdMwpO6zS3g3RDHg izDpxEw0k0DA1X4xq1O9AY4gBMHaYZ1deSN8TVp9SnJZjWtLk0a/Ca7nmT0agY5Z awcZX/xC1cmXWw/k0stYa/Lwh+byf3Q0JF1aQQjpg33QvIYTh5dmG36gWOsKDAoy VSlB7FLKlZ9Vn4fEeOqEYTBWeySLI84iSzJUkqBPXzai8kgPmsFWJ8lYLEkW9tEL bPkY39Jh1vV0xUxGbtbm9ElqYZWiYgtysmFAvj2Knn2CCyQ8dL2jq9yFpdg9I0M8 hZ3taoejDmgzA/++ouJ5ayFgMTjlSKG3ZreopvDTuL2NSAzOLI2vsVjwvMEmRoXz yInrL0rG4znP1sxzLcfUQEpCtw7cKWs0I9vc4Q5pFlc2hvQcm3y81Yb92s6K5/Ig Ivq0yzKeCJpUpOE/LQCll+DitpkAPpGaVXtIkHvI2yyhKvMxKsyH/+rkSt215sH0 TCTwy11G/r5VSRKdPqdSCt24JPQtclXvQF4LPVedsQ2p5gVk27M= =I6Qk -----END PGP SIGNATURE----- --jol37ovfjjuqkati-- From nobody Mon Jun 16 18:52:49 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 4bLfJj6JXHz5yGhn; Mon, 16 Jun 2025 18:52:53 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLfJj17QDz3VQk; Mon, 16 Jun 2025 18:52:53 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id R6u8uN6ss5MqyREwuuCaV9; Mon, 16 Jun 2025 18:52:52 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id REwsu91NNJhBPREwtulAbN; Mon, 16 Jun 2025 18:52:52 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=68506804 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=J8UYeav3V4dppdFX0RAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id D57EF40C; Mon, 16 Jun 2025 11:52:49 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id CF79711A; Mon, 16 Jun 2025 11:52:49 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Shawn Webb cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 98f18cd98824 - main - pam_ksu: Move the realm free to end of function In-reply-to: References: <202506161842.55GIgf9M052877@gitrepo.freebsd.org> Comments: In-reply-to Shawn Webb message dated "Mon, 16 Jun 2025 18:46:08 -0000." 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=us-ascii Date: Mon, 16 Jun 2025 11:52:49 -0700 Message-Id: <20250616185249.CF79711A@slippy.cwsent.com> X-CMAE-Envelope: MS4xfM0PZGaKHp3L9MkubGq9eZQdl6zxVDMWOC5wYnw4TNsjgLP0wJG1p7FyJzQ9H25qWGzD/6IqxzqRFC/sSJlGnlbVmGs9SjL1mhwptF2IJEfGPwWctZ6t hunTPRjESfZ6G055FcM9vjt4wtC/OVCNi0t97ZT0cXRhtoCRnOnIpUWuWXC/MhxgTITfNC/5VtmNL6arFWTvjG6oi7qle8p4Lg6nWE/UW6C/Qx2VmQxsbH14 3uxnDZ/fKedeBQZkQHOvWkbY1xsBj4vdqM06AZYcVWr+Ci8Vz2LGidtYxfpCY7AFFqy5d6tz9Go2Wb7sdi6sdUJy7+o07gNueNIzlbKyBg+QvATEEN9qzS8g 91sXfssf0bgaG5+7Z33DAlsVM1Z9sg== X-Rspamd-Queue-Id: 4bLfJj17QDz3VQk X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message , S hawn Webb writes: > > > --jol37ovfjjuqkati > Content-Type: text/plain; protected-headers=v1; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > Subject: Re: git: 98f18cd98824 - main - pam_ksu: Move the realm free to end > of function > MIME-Version: 1.0 > > On Mon, Jun 16, 2025 at 06:42:41PM +0000, Cy Schubert wrote: > > The branch main has been updated by cy: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D98f18cd98824acdf1045e74615= > f2db0219019f0b > >=20 > > commit 98f18cd98824acdf1045e74615f2db0219019f0b > > Author: Cy Schubert > > AuthorDate: 2025-06-16 18:40:51 +0000 > > Commit: Cy Schubert > > CommitDate: 2025-06-16 18:42:30 +0000 > >=20 > > pam_ksu: Move the realm free to end of function > > =20 > > This avoids a use after free. > > =20 > > Noted by: jhb > > --- > > lib/libpam/modules/pam_ksu/pam_ksu.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > >=20 > > diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pa= > m_ksu/pam_ksu.c > > index a6b3f043d3f4..e50c3e387311 100644 > > --- a/lib/libpam/modules/pam_ksu/pam_ksu.c > > +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c > > @@ -85,8 +85,6 @@ krb5_make_principal(krb5_context context, krb5_principa= > l principal, > > if ((rc =3D krb5_get_default_realm(context, &temp_realm))) > > return (rc); > > realm=3Dtemp_realm; > > - if (temp_realm) > > - free(temp_realm); > > } > > va_start(ap, realm); > > /* > > @@ -99,6 +97,8 @@ krb5_make_principal(krb5_context context, krb5_principa= > l principal, > > */ > > rc =3D krb5_build_principal_va(context, principal, strlen(realm), realm > = > , ap); > > va_end(ap); > > + if (temp_realm) > > + free(temp_realm); > > Hey Cy, > > I think the call to free can be made unconditional as it's safe to > call free on a NULL pointer (which turns into a no-op). It does but this avoids the overhead of a function call when not needed. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Mon Jun 16 18:54:42 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 4bLfLt1jtKz5yH0k; Mon, 16 Jun 2025 18:54:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLfLs3sVFz3Vtm; Mon, 16 Jun 2025 18:54:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id R8KkunofR9JM2REyiuTwZz; Mon, 16 Jun 2025 18:54:44 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id REyhu6CobWbOaREyiuPClM; Mon, 16 Jun 2025 18:54:44 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Q5lx4J2a c=1 sm=1 tr=0 ts=68506874 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=VxmjJ2MpAAAA:8 a=YxBL1-UpAAAA:8 a=NvZBUe-xvrifUgClnZ8A:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id B7945412; Mon, 16 Jun 2025 11:54:42 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id B196F384; Mon, 16 Jun 2025 11:54:42 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: John Baldwin cc: Cy Schubert , Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bafe0e7edaee - main - pam_ksu: Proactively address MIT KRB5 build failure In-reply-to: References: <202506160251.55G2plI3062868@gitrepo.freebsd.org> <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org> <20250616173436.68EA7AE@slippy.cwsent.com> Comments: In-reply-to John Baldwin message dated "Mon, 16 Jun 2025 14:18:48 -0400." 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=us-ascii Date: Mon, 16 Jun 2025 11:54:42 -0700 Message-Id: <20250616185442.B196F384@slippy.cwsent.com> X-CMAE-Envelope: MS4xfCCQ1h4daC4KMXb9NNhKGQ9nlWSsDd9MX2T69xKHEo2tJh9y0e0Z8IGKE1tmVvnjyGifWPA7/O7gTMZeqkGtX0/dS4gHniwblbkmhMwYLDMO283Acvbm h/k3GnfHK6YdVM0Kdh9UFHn5ctSM+sAJYAe3hg2aiYtDIaCaLKFj+6guXgw1qCV/5ZOiPyofCK4g4q9widuDbBU25UdmXquNbFM45RLF6tHJt8Em59fUVo3T mzS7Z9YxD+NcBemMTg8x6bhceK8MVkihREtxv/HSfUyCH0coAglB4gYH0n6SxkHH6whfoKXC/CE0pi84KbzI8Rs7125pnG7qwVwTan5Ys8hCNi7F+Suk4G9r Gu0AGu45 X-Rspamd-Queue-Id: 4bLfLs3sVFz3Vtm X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message , John Baldwin wri tes: > On 6/16/25 13:34, Cy Schubert wrote: > > In message <36939c6e-1c9f-4e55-bd42-e759e6a37a2e@FreeBSD.org>, John Baldwin > > wri > > tes: > >> On 6/15/25 22:51, Cy Schubert wrote: > >>> The branch main has been updated by cy: > >>> > >>> URL: https://cgit.FreeBSD.org/src/commit/?id=bafe0e7edaee75f3fcfe6bf6c3e7 > b1 > >> e816361365 > >>> > >>> commit bafe0e7edaee75f3fcfe6bf6c3e7b1e816361365 > >>> Author: Cy Schubert > >>> AuthorDate: 2025-06-05 17:09:57 +0000 > >>> Commit: Cy Schubert > >>> CommitDate: 2025-06-16 02:49:35 +0000 > >>> > >>> pam_ksu: Proactively address MIT KRB5 build failure > >>> > >>> MIT KRB5 does not provide a krb5_make_principal() function. We need > to > >>> provide this ourselves for now. We provide the function for now whi > le > >>> MIT and Heimdal are both in the tree. When Heimdal is removed we ca > n > >>> inline the calls to krb5_get_default_realm() and > >>> krb5_build_principal_va(). krb5_build_principal_va() is > >>> deprecated in MIT KRB5. Its replacement, krb5_build_principal_alloc > _va > >> () > >>> will be used instead at that time. > >>> > >>> Sponsored by: The FreeBSD Foundation > >>> Differential revision: https://reviews.freebsd.org/D50808 > >> > >> I still don't understand how this can work instead of instantly segfaultin > g > >> as I said in the review. > >> > >>> diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pa > m_ > >> ksu/pam_ksu.c > >>> index 47362c835c12..a6b3f043d3f4 100644 > >>> --- a/lib/libpam/modules/pam_ksu/pam_ksu.c > >>> +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c > >>> @@ -48,6 +48,61 @@ static long get_su_principal(krb5_context, const ch > >> ar *, const char *, > >>> static int auth_krb5(pam_handle_t *, krb5_context, const char *, > >>> krb5_principal); > >>> > >>> +#ifdef MK_MITKRB5 > >>> +/* For MIT KRB5 only. */ > >>> + > >>> +/* > >>> + * XXX This entire module will need to be rewritten when heimdal > >>> + * XXX compatidibility is no longer needed. > >>> + */ > >>> +#define KRB5_DEFAULT_CCFILE_ROOT "/tmp/krb5cc_" > >>> +#define KRB5_DEFAULT_CCROOT "FILE:" KRB5_DEFAULT_CCFILE_ROOT > >>> + > >>> +/* > >>> + * XXX We will replace krb5_build_principal_va() with > >>> + * XXX krb5_build_principal_alloc_va() when Heimdal is finally > >>> + * XXX removed. > >>> + */ > >>> +krb5_error_code KRB5_CALLCONV > >>> +krb5_build_principal_va(krb5_context context, > >>> + krb5_principal princ, > >>> + unsigned int rlen, > >>> + const char *realm, > >>> + va_list ap); > >>> +typedef char *heim_general_string; > >>> +typedef heim_general_string Realm; > >>> +typedef Realm krb5_realm; > >>> +typedef const char *krb5_const_realm; > >>> + > >>> +static krb5_error_code > >>> +krb5_make_principal(krb5_context context, krb5_principal principal, > >>> + krb5_const_realm realm, ...) > >>> +{ > >>> + krb5_error_code rc; > >>> + va_list ap; > >>> + if (realm == NULL) { > >>> + krb5_realm temp_realm = NULL; > >>> + if ((rc = krb5_get_default_realm(context, &temp_realm))) > >>> + return (rc); > >>> + realm=temp_realm; > >>> + if (temp_realm) > >>> + free(temp_realm); > > This still has the use-after-free of `temp_realm` I pointed out in the review > since you are going to use it below. I'm not sure what happened I recall moving this. I did have an accident with the repo (a reset --hard in the wrong repo) requiring a recovery from backup. I may have missed reapplying the change. > > >>> + } > >>> + va_start(ap, realm); > > Also, this seems quite sketchy if realm was NULL. You are starting the > va_list with the value of temp_realm which is not an on-stack argument? > > >>> + /* > >>> + * XXX Ideally we should be using krb5_build_principal_alloc_va() > >>> + * XXX here because krb5_build_principal_va() is deprecated. But, > >>> + * XXX this would require changes elsewhere in the calling code > >>> + * XXX to call krb5_free_principal() elsewhere to free the > >>> + * XXX principal. We can do that after Heimdal is removed from > >>> + * XXX our tree. > >>> + */ > >>> + rc = krb5_build_principal_va(context, principal, strlen(realm), realm, > >> ap); > >>> + va_end(ap); > > You need to wait to free temp_realm until here? I'm sure I'd already moved it here. Apparently not. > > >>> + return (rc); > >>> +} > >>> +#endif > >>> + > >>> PAM_EXTERN int > >>> pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, > >>> int argc __unused, const char *argv[] __unused) > >>> @@ -217,7 +272,13 @@ get_su_principal(krb5_context context, const char *t > ar > >> get_user, const char *curr > >>> if (rv != 0) > >>> return (errno); > >>> if (default_principal == NULL) { > >>> +#ifdef MK_MITKRB5 > >>> + /* For MIT KRB5. */ > >>> + rv = krb5_make_principal(context, default_principal, NULL, curr > >> ent_user, NULL); > >>> +#else > >>> + /* For Heimdal. */ > >>> rv = krb5_make_principal(context, &default_principal, N > ULL, cur > >> rent_user, NULL); > >>> +#endif > >> > >> At this point default_principal is always NULL, so you pass in a NULL poin > ter > >> to > >> krb5_build_princpal_va. That will surely crash. > > > > In Heimdal the principal argument is defined as > > > > krb5_principal *principal > > > > Whereas in MIT the principal argument is > > > > krb5_principal princ > > > > In Heimdal krb5_principal is a structure. In MIT it is a pointer to the > > same structure. > > > > build_principal() is defined as a struct in Heimdal and a pointer to a > > struct in MIT. Therefore the function prototypes are different. > > This doesn't make sense. The code assumes it is a pointer: > > if (default_principal == NULL) { > #ifdef MK_MITKRB5 > /* For MIT KRB5. */ > rv = krb5_make_principal(context, default_principal, NULL, curr > ent_user, NULL); default_principal is a pointer under MIT. In Heimdal it is a structure. If we assume MIT defines default_principal a structure (like Heimdal) we get, /opt/src/git-src/lib/libpam/modules/pam_ksu/pam_ksu.c:277:37: error: incompatible pointer types passing 'krb5_principal *' (aka 'struct krb5_principal_data **') to parameter of type 'krb5_principal' (aka 'struct krb5_principal_data *'); remove & [-Werror,-Wincompatible-pointer-types] 277 | rv = krb5_make_principal(context, &default_principal, NULL, current_user, NULL); | ^~~~~~~~~~~~~~~~~~ default_principal in MIT is a pointer to a struct. Not so in Heimdal. > #else > > How are we comparing a structure to NULL? To reiterate, principal is not a structure in MIT. It is a pointer to a structure. Passing it as a pointer results in a pointer to a pointer being passed. In Heimdal principal is a structure therefore it must be passed as &principal. > > >> > >> Also, you then pass that NULL pointer to the following code which would al > so > >> surely crash: > >> > >> /* Now that we have some principal, if the target account is > >> * `root', then transform it into a `root' instance, e.g. > >> * `user@REA.LM' -> `user/root@REA.LM'. > >> */ > >> rv = krb5_unparse_name(context, default_principal, &principal_name); > >> krb5_free_principal(context, default_principal); > >> > >> This is why I said your comment seems wrong. The Heimdal version is clear > ly > >> allocating > >> a principal, so the MIT version should also be doing that, and you should > alr > >> eady be > >> using krb5_build_prinpcial_alloc_va() _now_. Your comment claims that the > ca > >> lling code > >> isn't using krb5_free_principal(), but the calling code quoted above in ge > t_s > >> u_principal() > >> does call krb5_free_principal(). > >> > >> Have you tested this at runtime? > > > > Yes. It is running here. > > > > slippy$ which ksu > > /usr/bin/ksu > > slippy$ /usr/bin/ksu > > Authenticated cy@CWSENT.COM > > Account root: authorization for cy@CWSENT.COM successful > > Changing uid to root (0) > > slippy$ id > > uid=0(root) gid=0(wheel) groups=0(wheel),5(operator),920(vboxusers) > > slippy$ > > Did you test without a valid credential cache to exercise the default_princip > al == NULL > path? Yes. slippy$ kdestroy slippy$ ksu cy@CWSENT.COM does not have any appropriate tickets in the cache. Authentication failed. slippy$ And let's show an expired ticket too: slippy$ kinit -l 00:01 Password for cy@CWSENT.COM: slippy$ klist -l Principal name Cache name -------------- ---------- cy@CWSENT.COM FILE:/tmp/krb5cc_1000_RqXUEA slippy$ klist -l Principal name Cache name -------------- ---------- cy@CWSENT.COM FILE:/tmp/krb5cc_1000_RqXUEA (Expired) slippy$ ksu ksu: Ticket expired while verifying ticket for server Authentication failed. slippy$ Remember, the difference between Heimdal and MIT in this case is Heimdal's principal is the structure while MIT's principal is a pointer to a structure. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Mon Jun 16 18:59:39 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 4bLfSX2hKMz5yHSf; Mon, 16 Jun 2025 18:59:40 +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 4bLfSX0Wx7z3XxV; Mon, 16 Jun 2025 18:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750100380; 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=3N0vIUSogkmp/ICCSH5dHTIUa/5AukW7yOxZX0ykHDw=; b=fBp27+bIpNiupT8EE8UN6Esv93qSky7dF371Uy5fn8fzP4gK9yKfN6iYgKZ25SZLWNvmBC 9bryp3QtF0PLhmUVau5LCYl88jMQNeczKh2q1DtRYR9QlJOKupiQEZ3r9dKO/Xvqg8g+hi /snEqO58l5TcRbBUBr9OXHjo+z+uvPIOBqXejb0wov6vdd6pBsx5JPCMmjbtTtQ89QxmCF NhEVFob7pze+XWUa7iYhfACrA64rfqoWzfAapzH3/PaCl2s4QLEqBXvRxxkaX6e4+KCFsR 33KFH5hNtW/YFwQKmcyt+KiCYpP8y9MPufhqaxxw6T6RJOckDmmE18pYaVVwyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750100380; 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=3N0vIUSogkmp/ICCSH5dHTIUa/5AukW7yOxZX0ykHDw=; b=dqqwQMqiY/88fHoP+pMru+UFTqcTovkeMi1lKzY02KNCYS5d4WRW03JZpM7vi/W4ThJpld rP1TFaU9pFRM3NTYI5Zuv53ygMTp7QlndGbtzj1vkypd8gPaZZs0DqDf3UiqKWHTzuf0Jm KhQJzEXmkJX08GcQ6unbpXmOhuTs1H4ZWuQPQHVx5cSwLK9qcJMQhvkl8dKP2b23+HN8FY E94Mu9Fcz2yfZOo6yF7q/X4EXkfH6PSPx0DPqg4fO4zoiGefCa7w0UOISiaZBRb+qFOhO7 avFT2iNWJ3fIx6eJxWv+bHqVogUaN14F07oaxdY0NpAHmeV5Ofeo3oTKH499ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750100380; a=rsa-sha256; cv=none; b=QjecKEx728EULWV8FzWaig118PXHSoUIuz40U/z56dThYuSp+GS1EEJCHDOMQqt/ym9vvQ Akrkc3uCpUkbN+MI4C2roMYFt0cq5BjtGou04XmoNUwaI7mcWD9VdiX7oyAtMt1egSldan Z/SwiicMs/+B2FgrzPPajeKAJUAZ2p7c5xr/1aromaIInol+3wqeX2+sxskr57ViL3EIxg p/j+OcZ8VkqinCWB8+wHskHlEuuj4+T3C3F/ZdSjN4pfvTthNFq5yOCyZxNaYfjutemxG5 ABCT2QYjwqQSvbmpTMWq2Yuxq4ymsUCmR62S5/9uvO1GBgjmTUrvFz+PCMPGxQ== 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 4bLfSW6DvZz18bH; Mon, 16 Jun 2025 18:59: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 55GIxdIe072997; Mon, 16 Jun 2025 18:59:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GIxd9W072994; Mon, 16 Jun 2025 18:59:39 GMT (envelope-from git) Date: Mon, 16 Jun 2025 18:59:39 GMT Message-Id: <202506161859.55GIxd9W072994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 956100d60fa8 - main - config.5: Bump .Dd to reflect latest update 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 956100d60fa86daebc1bd46ea62f207f6b54d93d Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=956100d60fa86daebc1bd46ea62f207f6b54d93d commit 956100d60fa86daebc1bd46ea62f207f6b54d93d Author: Olivier Certner AuthorDate: 2025-06-16 18:56:33 +0000 Commit: Olivier Certner CommitDate: 2025-06-16 18:59:08 +0000 config.5: Bump .Dd to reflect latest update MFC with: 7d7b2d38463c ("config.5: Document CONF_CFLAGS under 'makeoptions'") Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation --- usr.sbin/config/config.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/config/config.5 b/usr.sbin/config/config.5 index 134afb17f9a4..d7bf96cf6e7f 100644 --- a/usr.sbin/config/config.5 +++ b/usr.sbin/config/config.5 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 10, 2025 +.Dd June 13, 2025 .Dt CONFIG 5 .Os .Sh NAME From nobody Mon Jun 16 19:32:28 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 4bLgBn5D0sz5yJqc for ; Mon, 16 Jun 2025 19:32:49 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-20.consmr.mail.gq1.yahoo.com (sonic317-20.consmr.mail.gq1.yahoo.com [98.137.66.146]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLgBn2zyzz3vMK for ; Mon, 16 Jun 2025 19:32:49 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=saeDpmnC; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.66.146 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1750102362; bh=v2Hy0ImrbTEw/LW4SOadjJcr/iR9ddDY5Ok4CY2L3Ns=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=saeDpmnCJxVLjDZF+MBm+8l8HbnEuuTJaKgRV3DmxdlSmYuUHIgr7mSfI7nQqhfjUI1rvpipHDMcIK4CU7Rb6saWFfjjfMqWSYuXWok3/gZT53E2W+HBWL35ZJmS65zIF6pko58IFfRRBdg+wNH38PCurhUrr7gUuPcWPUBIbbdOs+EcFOe+p5QSB6cpbxMR501i5dH+5BSLTpaMgIwD/I48GmLPNnxCrm2o0re6L6ozXNMnHQSXtOEzWpr/2ZAyTHK8+ptg38o6QYPXDoaeDrzzjdMw7UGj6RW8qvCH+7s/k6QQuNQgtcU8ghKqWCScpnOCHTSMPkaB7l9ZA6CCXg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1750102362; bh=zU/JBuQeocaxDW2gwpj+B4CdHXKQNmG/z5U5cBpVFdO=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=Uu/KVOm2PR2p8Rtynpi40DuRcxAhu/l6WsLU80QzphfFxRfebv3Z6cKgT3rRKzTVRfPK4pdEVrG4F4aIlszqatGJpd/YpYIR7cF/zuOwgbcSvmieABqsbQDTLSvhsaU2NtUwtN0JhFp0VpsxjcfLliLzt1s5ejwLaB5o9UuwY2XtOWVNNoMGyPzRyARiZ1krwTwSZJcVd9FVxkUeSu7yGaimt8M8L2LwZvlfABvhOpHt6lfbFHy7QI+yUdkJ5UppIjQ9SwE0UbnRTSNk3bk9UMnqyOfG/+pq1yh3bc/3XZPyRKTp1vIkabIRNJ2DyGRC9m0jqS7gykLosP3UzW6q4Q== X-YMail-OSG: ODdvb6EVM1m.wuIk3D2XxypNprsaghoybj_ggmXdoRaaaFiaTgEVT2SBZ1dvwxw DxHDDkLQPJ9LXBcS2ldU47dJTisOt7Ln31z6IrYQVnkt5w3qXz8Ai4SoIEvAJf0E15m.zkSW2Ptr B8..72EIM5fGVCDOhmwSJuj9cvZ1KK3EU6tj41wScVAcNmwE5gYAw0KgcAKuRI3H9bjPd2SqWs9I M5iiGOY4k78vWG9_5mC_39kASIme1cLxTHJs6LU3Rn9h_PKpfmdrSl6imSPT8iCsXVzxP0h8lpyy NwqkO9rIonpBEd3BxqPupzdpcbH.q._NicHH.u0x8c6PaRPu3gn9C74GHVuuJfOU8HSL1okZla_Y naWYhnUQOwVpc7YxRI5eMqdHAFrepMAyWohwfIsqyzRrB4rom0vSfDYDHIc_ZyJd4nHQSqilrnxU 6ZoG8qpSte.vJNvTEYY_dkXANGta.O6VW5bZWS0H3X8z_052U8KIy5kujQ0PxnZZN4iBVh_EEA2l 7ogl7_q2bxuuh155bIZWMg0GZIfj9j9S4Ddsvq4zJLaj5NdQjWvy8VuH9GB09bmUQaH54XrZAgEN Bg8D6zN49SlsRPrTvT2UaQR8juSP7mvnw50JWosO.sL8BNJUkIKSvfWtt1J_313GKwn.p7zRR8cA _93VGeq..elInQgyfw_O6Mo1_UrAf.AZFIskB6nHcSpnyAPRCoETUM8D_X0c49adP4oknVCXgwKU ZqlDLkFsJHJTp8fJ.jkyqxW6gjcqR7GCzudDSzCUTsHqiyGBxMoEAZVpKWDSt5yg2LR9Ci9fbJwM RRIqMrs3I6TDnycYrN.3WJx68JCt2.mCnzAsMioEUDpBD8fkGMZ85ahNKOQXlgxWRL9FHPIpXyWh oNNP_macPbQ9vybbHO_bBBGsRzelCm4_vFDzQp.Sv5jGwa7e4Z3moCICw0JRqGbgd5M513V8ALRX yp3CSVZHNytKMkEtkiXJgSfmi_dcVULrh1f9F4LpjW_FhHWatGr9hNWVAXnJ5jklOI9MIi8VU8H3 .u24kSX5H0jJxgzmk9t1aBgTUV5MF_Zm0j1TRZkMOf3Ks8NCkKz7OydBcmDwq8ffX_MjbuyYq16E Mt73z17h3WCDoKHhUavGBET680w0OIkZR6AaiQECxXl_4.VpWjAGO2LKPTequBaDYRqSdXxfTqlC C.OK8ByrW2Mwxtbx9HKMbxUbIg76mI4Tau81d_NqkFU.SB_R9UiednKzXM0BMHDmmel6nZ6v2lDG otVmzgeQtKb5cOospjgTVTL0_YsFf8z.s5qvJQdjBb0IETo7GDx8wQTs5KqK2N7oollv6.hFJ43O 8bCupn9S8ntu9PTZ2yYGv1SYy95ZJAbHCoo0WA8IZ2BQ_22OxMGUoVlJuJ4ZRIRPcUNIUR8873vy KT6wzDkt6nav6kWhcX87Axr0K1RGapXo1y.lVnUpxjeY6rujhPDg74KpOA.gAm4eXWPafBnB4l2n .DNTto1yKX26_nSfDVaDcbUpZzjWIabrpgww5U2i2j1mYhfjwDcc9h5SVAW7bMGglbhw6vA0lOgo gBXcTbJrUqDlJI3i00QLDDx7fcnjw8_EdIJph_8FvsPYrxGQKxhQN6lie_MgQzzKvXy_z1cJS0Po yNNyF7chbbJzp4M6FIypeNKyDyHzFXDLgFFS1YOS1Kbi5i32U.HHUs2.snbigQSbEkZstOSL1__t zLD.36ZaIrGxFehBzrFt6hl52LFt.ey9KEQZ5z5LD4Dc3GeOysC7b2ZKysf8_WnxuQRj_2F0hAyx w_IoV84xZaUtgGh6wsUedESJH5GmipJoYJWCvF6usC8dH6plmQK3Nqy6UqkW4TJM8azI4XAGZgeF XVd3q_jwVJueu6UgSOywHwoY3rNa0GtHYgI.ySNU4N9YyXtorsTozHexiARXNKCpxwbeUX6Mf0nN XAyz6LWyoQWGW_p4ECcqppWrMnVdqStfgeXl_voOqTvEr8cdxFzzSbrfZK5HkTooYuBcRGzQ3jcn vwqSO0HhnRmq52ssm57qAO1P1pC1XKvqOEOd08WDtxwB2iOXjccwlvRbOEgzoXes4szQlB5NhFw2 nCy2UqqGI5lefToJl9_gtX7BObmNz7YR6OkK5kJ52w3klKAF.xNZyIf2k9h0AQKXAszEICwS8Uqc c6wOePv0mfSIZ2cfBnVEjjYf0kqCwcxAuutXoOvQoe6EnONz5pyXnyitNamB_36UJFQif_GkqkY1 hx1.7WRA5OHsaL0DchUAgBZwFD6yqvG3nGXsUdpg0U7qfyqE- X-Sonic-MF: X-Sonic-ID: 32df0e6d-054b-4d23-b4e8-4d19cf5a887b Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Mon, 16 Jun 2025 19:32:42 +0000 Received: by hermes--production-gq1-74d64bb7d7-r4nbl (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 5c957a3aefdcb58dad03d5156f00a8ce; Mon, 16 Jun 2025 19:32:38 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) Subject: git: be3c2087c884 - main - Revert "Makefile.inc1: attempt to fix pkgbase building" [FYI: following commit did not publish to list] Message-Id: Date: Mon, 16 Jun 2025 12:32:28 -0700 To: imp@freebsd.org, dev-commits-src-main@freebsd.org, Baptiste Daroussin X-Mailer: Apple Mail (2.3826.600.51.1.1) References: X-Spamd-Result: default: False [-3.37 / 15.00]; NEURAL_HAM_SHORT(-0.99)[-0.991]; NEURAL_HAM_MEDIUM(-0.96)[-0.957]; NEURAL_HAM_LONG(-0.92)[-0.921]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.146:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.66.146:from]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim] X-Rspamd-Queue-Id: 4bLgBn2zyzz3vMK X-Spamd-Bar: --- Warner Losh wrote on Date: Mon, 16 Jun 2025 17:16:44 UTC : > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dbe3c2087c88463c95ff733883773a592= 02ba12a2 >=20 > commit be3c2087c88463c95ff733883773a59202ba12a2 > Author: Warner Losh > AuthorDate: 2025-06-16 17:13:19 +0000 > Commit: Warner Losh > CommitDate: 2025-06-16 17:13:19 +0000 >=20 > Revert "Makefile.inc1: attempt to fix pkgbase building" > =20 > This was an attempt to fix b44147bb1245, but it's still not right. = Per > conversation on irc, revert it and the other commit so we can redo = them > correctly. =20 = https://lists.freebsd.org/archives/dev-commits-src-main/2025-June/date.htm= l = https://lists.freebsd.org/archives/dev-commits-src-main/2025-June/author.h= tml = https://lists.freebsd.org/archives/dev-commits-src-main/2025-June/index.ht= ml do not show that other commit: = https://cgit.freebsd.org/src/commit/?id=3De4988ba172a84b35abab8ce065f2210d= ab70f148 (Revert "Makefile.inc1: allow real-update-packages to be called = independently") But John Baldwin's later commit (that was the next one after the missing one) did show up: = https://lists.freebsd.org/archives/dev-commits-src-main/2025-June/032846.h= tml (There are a couple of unrelated Cy Schubert RE: . . . MIT KRB5 . . . = messages between as well.) > Suggested by: bapt, kevans > --- > Makefile.inc1 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/Makefile.inc1 b/Makefile.inc1 > index cff150668083..97bd81f3263f 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -2048,7 +2048,7 @@ package-pkg: .PHONY > =20 > real-packages: stage-packages create-packages sign-packages = .PHONY > =20 > -real-update-packages: .PHONY create-packages > +real-update-packages: .PHONY > .if defined(PKG_VERSION_FROM_DIR) > @echo "=3D=3D> Checking for new packages (comparing = ${PKG_VERSION} to ${PKG_VERSION_FROM})" > @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Mon Jun 16 19:33:59 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 4bLgD774DBz5yJvh; Mon, 16 Jun 2025 19:33:59 +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 4bLgD76P6Fz3w0j; Mon, 16 Jun 2025 19:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750102439; 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=81S/8PRVsb8D+cY+QLqfPE8H+7Rrhy6gEDeIhqLR4fU=; b=I2NQ5PYRn5+mNTHdAuDX2DGNhEr9WtsGS9vvOEfmv4gjyHwUf6SeFEO3THhluWrCTIMjrb 6USAn8Q3lL99f9i+3SzeFv/MF8Y1ZI6hOOaF4RJR6tJIN2LAG0Cafah+sBNP8Ssk3fU/gW UsymPMYphkfyM6HS/GHp1OFjrvcMtARdYH0McVS/gXqE4oFUhVKyMKEuVoteGgaiknaIPY gp2G9/Yo3jVOCrNK5IZfrXBmCpJb+Ml8i36VefVudNeY8wrwzGtTfYyeXtimFYUnxlDcQD +h27AIeVcirh6MjBJub29yuhN0F0Rb0+NrxaRPdRlpkzSoP9O899s8FKVy5q0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750102439; 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=81S/8PRVsb8D+cY+QLqfPE8H+7Rrhy6gEDeIhqLR4fU=; b=beTuZwz5GqigORMQqyH7ii4BttXVmEJ0byNdwlI9hDmbdIsgj02mezHhVZO83CWu8KbHb3 4VpfnxOgHPHMoCNs/WS4WUbQVxuaeDuaJKkeUC2P0PWR+jfZI/HdOTut7uQ6kn7uefDHNd IstIVCSY6fqlATXM8r2BKOKFmxywAifCsNhEatQwJVe3Fl3yDftnpQ3rfW8eKnh3ZJrd6n 7JV68xY5flK+qT/z0V18NfU5IJ69q2jvkiEhKuatYasLGoYWJXcc2qSjCtZWpU24ZLz4i8 UpjikfBjIiaqN1MLVF+QGPbtunil8efAri5waUcOdJlBgKZJ52J2dUaJnaG2OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750102439; a=rsa-sha256; cv=none; b=HDK5OBM65dZLxHOKhzJOaFzG7OcY56qxcDxdd0imqSzL99Pa28HBz3Vxkg/ba4tCLlbhE5 tXO8fkuk7LEDWwJ0BxaaMcfMW+5i1mCvoVNVxuswiWA2x5RJ9wc8MPrSQAY6kf0BkIiBtg 0msXK7f31v7AHCu8X75RPifHv2ixqLu8vlYLi6tk1yoveFA7IgNh7rMTAA4Q9WffxUYkhe hg0HLsa5VbtzL4wuEPaIBkxGs6WqoYXwmVIKLaKc5u0ZAZ8no1Z7J16whUKmq3s0hZ8HIj U32dmDF7adj91f5SplPo+t2L0dCVU0L8AyuJ/xS/2HKL8ecu9NZ9NjGkogkG+w== 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 4bLgD75rRcz19Xg; Mon, 16 Jun 2025 19:33:59 +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 55GJXxm5047058; Mon, 16 Jun 2025 19:33:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GJXxga047055; Mon, 16 Jun 2025 19:33:59 GMT (envelope-from git) Date: Mon, 16 Jun 2025 19:33:59 GMT Message-Id: <202506161933.55GJXxga047055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 4dfbc03d6492 - main - dtc: Sync with upstream commit 23387dd 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dfbc03d6492d9fccb781700cc17d58111dff456 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=4dfbc03d6492d9fccb781700cc17d58111dff456 commit 4dfbc03d6492d9fccb781700cc17d58111dff456 Author: Jose Luis Duran AuthorDate: 2025-06-16 19:31:43 +0000 Commit: Jose Luis Duran CommitDate: 2025-06-16 19:31:57 +0000 dtc: Sync with upstream commit 23387dd Add the ability to parse char literals needed to compile DTBs currently in base. Reviewed by: theraven, emaste Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D42438 --- usr.bin/dtc/input_buffer.cc | 53 +++++++++++++++++++++++++++++++++++++++++++++ usr.bin/dtc/input_buffer.hh | 22 +++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/usr.bin/dtc/input_buffer.cc b/usr.bin/dtc/input_buffer.cc index 278dd42b5ac6..20f747f29cd8 100644 --- a/usr.bin/dtc/input_buffer.cc +++ b/usr.bin/dtc/input_buffer.cc @@ -337,6 +337,47 @@ input_buffer::consume(const char *str) return false; } +bool +input_buffer::consume_char_literal(unsigned long long &outInt) +{ + outInt = (unsigned char)((*this)[0]); + cursor++; + + if(outInt != '\\') + { + return true; + } + else if(cursor >= size) + { + return false; + } + + outInt = (unsigned char)((*this)[0]); + cursor++; + + switch (outInt) { + default: + return false; + case 'n': + outInt = (unsigned char)'\n'; + break; + case 'r': + outInt = (unsigned char)'\r'; + break; + case 't': + outInt = (unsigned char)'\t'; + break; + case '0': + outInt = 0; + break; + case '\'': + case '\\': + break; + } + + return true; +} + bool input_buffer::consume_integer(unsigned long long &outInt) { @@ -874,6 +915,18 @@ expression_ptr text_input_buffer::parse_expression(bool stopAtParen) source_location l = location(); switch (*(*this)) { + case '\'': + consume('\''); + if(!consume_char_literal(leftVal)) + { + return nullptr; + } + if (!consume('\'')) + { + return nullptr; + } + lhs.reset(new terminal_expr(l, leftVal)); + break; case '0'...'9': if (!consume_integer(leftVal)) { diff --git a/usr.bin/dtc/input_buffer.hh b/usr.bin/dtc/input_buffer.hh index d6b033952bad..395c7b044df3 100644 --- a/usr.bin/dtc/input_buffer.hh +++ b/usr.bin/dtc/input_buffer.hh @@ -193,6 +193,13 @@ class input_buffer * current point in the input. */ bool consume(const char *str); + /** + * Reads unsigned from char literal. Returns true and advances + * the cursor to next char. + * + * The parsed value is returned via the argument. + */ + bool consume_char_literal(unsigned long long &outInt); /** * Reads an integer in base 8, 10, or 16. Returns true and advances * the cursor to the end of the integer if the cursor points to an @@ -412,6 +419,21 @@ class text_input_buffer } return input_stack.top()->consume(str); } + /** + * Converts next char into unsigned + * + * The parsed value is returned via the argument. + * + * This method does not scan between files. + */ + bool consume_char_literal(unsigned long long &outInt) + { + if (input_stack.empty()) + { + return false; + } + return input_stack.top()->consume_char_literal(outInt); + } /** * Reads an integer in base 8, 10, or 16. Returns true and advances * the cursor to the end of the integer if the cursor points to an From nobody Mon Jun 16 20:29:15 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 4bLhRw1yQdz5yND4; Mon, 16 Jun 2025 20:29:16 +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 4bLhRw0t1jz3NlJ; Mon, 16 Jun 2025 20:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750105756; 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=Ws46QgHEe4Kfc4a/XEIwqEMJdWaV2a3EqeiT57Aco6U=; b=RrM0iBFXfbi9Y4V59am6pGAiNONMGS0W4WG43Li/DVY3V//yseCe7MUbGMAagbE2/15ol7 CKv6WQOnT83hAtWi2IvonMWSFQp3nSwse62zCp4UTIgMosJTrkoUc9ROh+7MWfBPrBJqym T57GgAwgq0XtgObTOf3wCo3I79uZKUyeO6eTq+Nbpx7ateRrGO9v+M7cJD9QZeLncfAZxa dLFp1yaqaOEVeAtdJ6JRJ5jczfS6NXuZk07hCmACEX5slyVTDC0sk8fkyyFGqBN69OJDLt iv7nl82OrzvV/nY8NuYPecG2zfdB7Heu0Zur5Qr2gg8ySMVdnGA4G4PYxQ2bXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750105756; 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=Ws46QgHEe4Kfc4a/XEIwqEMJdWaV2a3EqeiT57Aco6U=; b=L/WmArsVt+KyW+nBENs+f9EkfRd7BJL8BHU2w68BWDYH7UJ02B2vnljg0kDnjuAkD9t/94 kABlk0Etx06tcR6F/agu0TTnUAhEZ6+vC/hmknWwwV+mirNOMdKl5Cv9Lkf+T3LgK1Ta6s udz8Yj2jpuHXKeILhnsw2I28dMeTPFK8XD7W4Uzb4+RFMnYdZoCK/hG7KoCHme+DbQLO9U wsuGQh0HyIji0BtPv4iI5XArjUwLulrdIBt66uNZUlN7HDYHzQFQ8CmEKj7a2m6v5JZqFS mvmIlqFfD0k67cMYneqD8auznfutt523kYCUahcstSOqGwqSmwxk2e2dUsoCqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750105756; a=rsa-sha256; cv=none; b=tOan6YJG2KGaHw/Hktci2Syp7g9s/FfXGRXRynny43sDAdJ5fyOLe/RqqyqQRhcGC6KX4m AXMt3I6ee4gcnJiwxofiDr9gQCHJVUEJywvlMJMuc1VV5vuYLuNz3AfVAy2YkIKAEIBFd3 SbuvOPxG73KQ51TwYkzvtV3JCMniExEwYakwZlKPu/c6vVQ82yrytG6ESJLOeVkP5D6RT8 TKAmrRED5w0WYkVA/wRKp7TgPo2cQJx83G6Q/cOtnBs2mjGIcXr/0JOguIMmG4u73kHP1C HuWCasEP8ut/hKe3hcWTtJOjv+x6bM9ydj59qSno8KyA6tACJ5vpnrF6llNbLA== 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 4bLhRw0QXbz1BgG; Mon, 16 Jun 2025 20:29:16 +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 55GKTF1q041886; Mon, 16 Jun 2025 20:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GKTFgh041883; Mon, 16 Jun 2025 20:29:15 GMT (envelope-from git) Date: Mon, 16 Jun 2025 20:29:15 GMT Message-Id: <202506162029.55GKTFgh041883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c13f4b1574da - main - tcp: cleanup timer initialisations 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c13f4b1574da77f89ab57cfcc87fe8ad80f25263 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c13f4b1574da77f89ab57cfcc87fe8ad80f25263 commit c13f4b1574da77f89ab57cfcc87fe8ad80f25263 Author: Michael Tuexen AuthorDate: 2025-06-16 13:04:05 +0000 Commit: Michael Tuexen CommitDate: 2025-06-16 13:04:05 +0000 tcp: cleanup timer initialisations Use MSEC_2_TICKS() to make clearer, which values are used and to ensure that the value stored is at least one tick. This also avoids the need of some protection code. Reviewed by: cc, glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50840 --- sys/netinet/tcp_subr.c | 4 ---- sys/netinet/tcp_timer.h | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index f766bf25ad66..d82a54031a95 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1473,11 +1473,7 @@ tcp_init(void *arg __unused) tcp_keepintvl = TCPTV_KEEPINTVL; tcp_maxpersistidle = TCPTV_KEEP_IDLE; tcp_rexmit_initial = TCPTV_RTOBASE; - if (tcp_rexmit_initial < 1) - tcp_rexmit_initial = 1; tcp_rexmit_min = TCPTV_MIN; - if (tcp_rexmit_min < 1) - tcp_rexmit_min = 1; tcp_persmin = TCPTV_PERSMIN; tcp_persmax = TCPTV_PERSMAX; tcp_rexmit_slop = TCPTV_CPU_VAR; diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index a3ca268417ba..8e1c609fd575 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -71,21 +71,21 @@ /* * Time constants. */ -#define TCPTV_MSL ( 30*hz) /* max seg lifetime (hah!) */ +#define TCPTV_MSL MSEC_2_TICKS(30000) /* max seg lifetime (hah!) */ #define TCPTV_SRTTBASE 0 /* base roundtrip time; if 0, no idea yet */ -#define TCPTV_RTOBASE ( 1*hz) /* assumed RTO if no info */ +#define TCPTV_RTOBASE MSEC_2_TICKS(1000) /* assumed RTO if no info */ -#define TCPTV_PERSMIN ( 5*hz) /* minimum persist interval */ -#define TCPTV_PERSMAX ( 60*hz) /* maximum persist interval */ +#define TCPTV_PERSMIN MSEC_2_TICKS(5000) /* minimum persist interval */ +#define TCPTV_PERSMAX MSEC_2_TICKS(60000) /* maximum persist interval */ -#define TCPTV_KEEP_INIT ( 75*hz) /* initial connect keepalive */ -#define TCPTV_KEEP_IDLE (120*60*hz) /* dflt time before probing */ -#define TCPTV_KEEPINTVL ( 75*hz) /* default probe interval */ +#define TCPTV_KEEP_INIT MSEC_2_TICKS(75000) /* initial connect keepalive */ +#define TCPTV_KEEP_IDLE MSEC_2_TICKS(120*60*1000) /* dflt time before probing */ +#define TCPTV_KEEPINTVL MSEC_2_TICKS(75000) /* default probe interval */ #define TCPTV_KEEPCNT 8 /* max probes before drop */ #define TCPTV_MAXUNACKTIME 0 /* max time without making progress */ -#define TCPTV_FINWAIT2_TIMEOUT (60*hz) /* FIN_WAIT_2 timeout if no receiver */ +#define TCPTV_FINWAIT2_TIMEOUT MSEC_2_TICKS(60000) /* FIN_WAIT_2 timeout if no receiver */ /* * Minimum retransmit timer is 3 ticks, for algorithmic stability. @@ -107,15 +107,15 @@ * The prior minimum of 1*hz (1 second) badly breaks throughput on any * networks faster then a modem that has minor (e.g. 1%) packet loss. */ -#define TCPTV_MIN ( hz/33 ) /* minimum allowable value */ -#define TCPTV_CPU_VAR ( hz/5 ) /* cpu variance allowed (200ms) */ -#define TCPTV_REXMTMAX ( 64*hz) /* max allowable REXMT value */ +#define TCPTV_MIN MSEC_2_TICKS(30) /* minimum allowable value */ +#define TCPTV_CPU_VAR MSEC_2_TICKS(200) /* cpu variance allowed (200ms) */ +#define TCPTV_REXMTMAX MSEC_2_TICKS(64000) /* max allowable REXMT value */ #define TCPTV_TWTRUNC 8 /* RTO factor to truncate TW */ #define TCP_MAXRXTSHIFT 12 /* maximum retransmits */ -#define TCPTV_DELACK ( hz/25 ) /* 40ms timeout */ +#define TCPTV_DELACK MSEC_2_TICKS(40) /* 40ms timeout */ /* * If we exceed this number of retransmits for a single segment, we'll consider From nobody Mon Jun 16 20:49:31 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 4bLhvH6Vx6z5yPK8; Mon, 16 Jun 2025 20:49:31 +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 4bLhvH2kgjz3h3w; Mon, 16 Jun 2025 20:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750106971; 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=8Jn8ts08pKGFU1PaI8hxOiet37Ebpf2BPrZ/pDwtWHE=; b=XxZnLnDYZIr4qYG+8uoeP0KVotF3W9mHn8jFO6nZ10wzP1pBeykoXhIJLkKO3EBLGqpruL 1drkaQErnAxOwvjXqNR24JS5/OPzRZ73tKdn19+I7pA+VMqBYIlE5A7h7f++pZ30PT/0nl nsMNK5xrct20nu3JCJH7uBL11KemykJH5f55DLnwK7CiPXYMCaTcjNFr8y2Kte98q3C8DN UcTFDJksNdKvfNl1k+O0RLCZAqL85X5KsBZYGP18o431FOFf259AMiuwhjUTRh9ZCLn5SI D/0lR4wGcqpG/I0vnMhkX4U+KnSwVHHJNjQhvjiPU2jfWo6l1x9HWinQ+zcgeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750106971; 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=8Jn8ts08pKGFU1PaI8hxOiet37Ebpf2BPrZ/pDwtWHE=; b=uFbF4BIOr93bq4VBDHvRem/SXuwnO/l5UWScAEW5JHFpGe2CXwiTtx6vqxPQxFrDBk9vlW w4p2EOuiwuXzeFRV17l6fnuNPnOm3pZmz9MRRcDoXJaZHkpofTlvVpPAZGqxTbTF95XvMH j3frbNVSURO9DrfuyZBb4NM9t5Z2DjyzTlkF6HzZYXHHZ6klOckHvHT8r6jHaNtkg6+Ogw 4vw4nRJkUnmHujE/ucoXUFvoTpZBt4zTNifW/cqdNpmDFOY+qk6usHoIT9658aGbvYng99 23sKdf/WfGf0KI8Rop6Z8bMR267HutY5672a1zDo2CNIPKDC0uqIJCmKWgydlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750106971; a=rsa-sha256; cv=none; b=HoqIE6mrT+AHAsIqY6Dz/2dJ/aGTUSFiEiLpiirhnqcvF/rS5X9SE5vsk/oZIfLLmL+S3W MUhuGyQg8/qFX2PasvrVaVzkasW6wK2ATep1p5xtCtcxiziF/IiuexMbASaOE7kqV9DlIH b4NPhIcz0PrNCrdyfRzlPPad/bsTHTOYHTp2QAUBS310K+LJCxE7r0VWqvdX9ilflMZuFX CueoYvUmRCRxKnnyEMCMB9ZTu7HiXk7GG4b+LjSC7Gc48Cq6VtVgYlqVcY3Kktiovedzhy z3LKbuZtWLDS7Z6+4W9OMtf8WtVEPRrGnp4ObJbzXZbQ/+Zc5TEThJSLJIlLqw== 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 4bLhvH2663z1Bwg; Mon, 16 Jun 2025 20:49:31 +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 55GKnVbG080399; Mon, 16 Jun 2025 20:49:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GKnVxD080396; Mon, 16 Jun 2025 20:49:31 GMT (envelope-from git) Date: Mon, 16 Jun 2025 20:49:31 GMT Message-Id: <202506162049.55GKnVxD080396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 64e0b2e8f752 - main - makefs: Implement the collision differentiator for micro ZAPs 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64e0b2e8f75286f9f4d85a86fbb6815b435c7096 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=64e0b2e8f75286f9f4d85a86fbb6815b435c7096 commit 64e0b2e8f75286f9f4d85a86fbb6815b435c7096 Author: Mark Johnston AuthorDate: 2025-06-16 20:33:14 +0000 Commit: Mark Johnston CommitDate: 2025-06-16 20:49:07 +0000 makefs: Implement the collision differentiator for micro ZAPs In the unlikely event of a hash collision, the collision differentiator is used to create a unique lookup key for ZAP entries. While the fat ZAP implementation in makefs implemented this, the micro ZAP implementation did not, so it's possible to end up with collisions in directory entries. These are caught deterministically by OpenZFS, but the result is a panic. Implement a simple differentiator by simply assigning a unique value to each ZAP entry. This scheme works since the 16-bit space of differentiators is larger than the maximum number of entries in a micro ZAP. (While the on-disk encoding provides 32 bits of space for the differentiator, the in-memory representation of micro ZAP entries is smaller.) PR: 287482 MFC after: 1 week --- usr.sbin/makefs/zfs/zap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/zfs/zap.c b/usr.sbin/makefs/zfs/zap.c index d01f7527adf9..decf5fc6a473 100644 --- a/usr.sbin/makefs/zfs/zap.c +++ b/usr.sbin/makefs/zfs/zap.c @@ -33,6 +33,7 @@ #include #include +#include #include #include @@ -201,6 +202,10 @@ zap_micro_write(zfs_opt_t *zfs, zfs_zap_t *zap) mzap_phys_t *mzap; mzap_ent_phys_t *ment; off_t bytes, loc; + uint16_t cd; + + _Static_assert(MZAP_ENT_MAX <= UINT16_MAX, + "micro ZAP collision differentiator must fit in 16 bits"); memset(zfs->filebuf, 0, sizeof(zfs->filebuf)); mzap = (mzap_phys_t *)&zfs->filebuf[0]; @@ -211,10 +216,11 @@ zap_micro_write(zfs_opt_t *zfs, zfs_zap_t *zap) bytes = sizeof(*mzap) + (zap->kvpcnt - 1) * sizeof(*ment); assert(bytes <= (off_t)MZAP_MAX_BLKSZ); + cd = 0; ment = &mzap->mz_chunk[0]; STAILQ_FOREACH(ent, &zap->kvps, next) { memcpy(&ment->mze_value, ent->valp, ent->intsz * ent->intcnt); - ment->mze_cd = 0; /* XXX-MJ */ + ment->mze_cd = cd++; strlcpy(ment->mze_name, ent->name, sizeof(ment->mze_name)); ment++; } From nobody Mon Jun 16 21:01:26 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 4bLj963TBRz5yPss; Mon, 16 Jun 2025 21:01:30 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLj961pDDz3rWC; Mon, 16 Jun 2025 21:01:30 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750107690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=S3uDpRa20SeEaudTHLMv6kwVr6x0pxHj5ayowIH65hQ=; b=dTHmMhQzEzgSVqZKPI7EbySK9L+vHebEkyKTrpYNkmwaXl8GYJKu7A/VSf22x2URLJk6QJ Bmf8GU0/oqXfaZzPD26J9f5FknmetRpTb574rlVbhwi1Plon5oBSlC5ezlQ0eZfsl7tmbv 1X4b0jUg0+EZ7rHT5VG7/9HGYDazthJ44TMH+BQK6vanwnWi6LlmP9ovU6Mith88wdCxk/ wNJt7bd9q0bmsFG+F+ZLouTHK1yCAoUq2jQGV43hXZMjohPi7Xm5XYgWIcqhBZqRo+5hG7 uqmDZDOgNuqYrwXkHO2Ve5bn8+etUFhmJ9JGEfXJMAkP0ir3sL+vkqgecpFGIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750107690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=S3uDpRa20SeEaudTHLMv6kwVr6x0pxHj5ayowIH65hQ=; b=U34JfRGBtPAYbQLtEZVbpBt71T2GYedJNKsU0+sIB+zfQRKjW6uk2P8nFBwIb+nj8bZdPu 0VTeyS13cDfmRr3GS7F6zlz4PrqCOn+HphPxShFF7wH1gbWq5o4WpupQ5EGk4Ce94/PjLH I/XjJGGsDUEtVUEXQARoPhk5+In8e6ut5bq6Lq37NxNDbq4qIjK/BcIiyZ0IT49a6JqKt+ aNWCFZUttqyFw6q5krNuOa3QQwaUJqLbFT0lUF7WgmryMN+L7pIZDKBnqR1pDEA24pI4HG FdId3Q02gqAR3lNHg9G95Sd4D9mugp88l3Go8+ZfE+22k8U+yQ/PeMglkAeZ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750107690; a=rsa-sha256; cv=none; b=k35dQyF1wKfdPRxWFADkiHy+V3htlL1iqJplH+OIB4WXqr6dCW5jAnRPXiIhdzH/knK2IR XrBzPE80pupn+2ej8z28RTh6eP4Ti3VJXKOD+paczCHn/DNYhZqnoblh+k/wL1sGy01cCQ 9Q05dAj6KuS/SOh/VBo9v2AwjlnTRzShRZCoiTT+jVlbjRbVIOAj4QuomQjubKR5ZtWg+/ iTx0jmDFBVA0hjImSxjcWEOvDH4JTgTBH1KyYYNmIosey78Y+xWeUsc07t8lYtmL0jO6OE CAgtyl2r1o8gudAZlkj+a1Z6brvwS/8xWeyYDwPlO7Kx2HoXnhlyOpLtBKGCRA== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bLj952cgdzsbV; Mon, 16 Jun 2025 21:01:29 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Mon, 16 Jun 2025 14:01:26 -0700 From: Gleb Smirnoff To: Mark Johnston Cc: John Baldwin , Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 4e207e3849d4 - main - exterr: make SET_ERRORX() macros an expression evaluating to the errno Message-ID: References: <202506131940.55DJeTa1046740@gitrepo.freebsd.org> <0003a97e-60ed-4868-8844-0a0346bc97ee@FreeBSD.org> 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=us-ascii Content-Disposition: inline In-Reply-To: On Sat, Jun 14, 2025 at 08:59:39AM -0400, Mark Johnston wrote: M> If your suggestion is implemented, then it would be sensible to use a M> different name to avoid collisions, maybe SET_EXTERROR() or just M> EXTERROR(). I'd vote for EXTERROR(). But now with the function existing, why would we recommend to use the macro instead of the function at all? IMHO, the function shall be the right use and that will make any macro collisions with ZFS or whatever void. -- Gleb Smirnoff From nobody Mon Jun 16 21:05:41 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 4bLjGC1m59z5yQDF; Mon, 16 Jun 2025 21:05:55 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4bLjGB4VJXz3vL0; Mon, 16 Jun 2025 21:05:54 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 55GL5ffN048882; Tue, 17 Jun 2025 00:05:44 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 55GL5ffN048882 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 55GL5fIZ048881; Tue, 17 Jun 2025 00:05:41 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 17 Jun 2025 00:05:41 +0300 From: Konstantin Belousov To: Gleb Smirnoff Cc: Mark Johnston , John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 4e207e3849d4 - main - exterr: make SET_ERRORX() macros an expression evaluating to the errno Message-ID: References: <202506131940.55DJeTa1046740@gitrepo.freebsd.org> <0003a97e-60ed-4868-8844-0a0346bc97ee@FreeBSD.org> 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=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Rspamd-Queue-Id: 4bLjGB4VJXz3vL0 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] On Mon, Jun 16, 2025 at 02:01:26PM -0700, Gleb Smirnoff wrote: > On Sat, Jun 14, 2025 at 08:59:39AM -0400, Mark Johnston wrote: > M> If your suggestion is implemented, then it would be sensible to use a > M> different name to avoid collisions, maybe SET_EXTERROR() or just > M> EXTERROR(). > > I'd vote for EXTERROR(). But now with the function existing, why would > we recommend to use the macro instead of the function at all? Because there is an option to not bloat the kernel with strings. Also there is a desire to provide more info, like amount of the arguments supplied, automatically. It is already EXTERROR(). See vm/vm_mmap.c for exemplary usage. > IMHO, the > function shall be the right use and that will make any macro collisions > with ZFS or whatever void. From nobody Mon Jun 16 21:37:19 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 4bLjyS2TJtz5yRZP; Mon, 16 Jun 2025 21:37:20 +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 4bLjyR5whWz3Jb2; Mon, 16 Jun 2025 21:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109839; 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=aw3jTY1zXHltyXkO6h2KyEddT2gveBCFYhkagQgg3TQ=; b=SeNRX1quCJrtAsSJYUBLlqRwdQ4yssMyzMM/dwLRotWaCCgEtrEqt85/MrxC/J/uvqfyOX bO0pnvOaAiF3uEKCNZwzi574yCZkqOuz4l0WADDbSS16flQmpJ11NcdC6BahsZGgYU5AdX oIsqtYQvkwF/UX6YPuurn59I597KjLOpUY0B7seDtyEQe9yB/oWxSi/qKAPdGBQrc/1Qiz 8PNWHcVVt54eQPqu9+k+BdlFREO3LKTNWjQiOlFnvSNLTJUdKF5nYIcomvYM53z01ICloZ IZGxmp5/iwwvAKZ+KT5zak6tzTFoEw9isULZebHyWDIgOtGfjoEjbH3lNVhXsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109839; 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=aw3jTY1zXHltyXkO6h2KyEddT2gveBCFYhkagQgg3TQ=; b=akgDVSF4CtIlzIpgWKDhsa1pCv53MVE0C0btVFuF6SYOcTHDkDmPQV9R05HhErEhFU8RrD thGCybRa6Fc9Lz2oe5QRsHjE52UL31sJjdZ03z997GboKtgeB1cLS9JnRXrUmNNQrs6V0m KOzVi9eOpKeUMTGWk5oU6r5lCHtNqTDy0kGukPPG/LijM80SBaUCXbD0fQda6t0xt8SPh/ KqjPqj+E1J1G09h87SR3A92nHPEMsXCZD3uLo8jRfnKfxxabq3N44JgqUPG+cPG2COH4Ux pltad4vEuZwyzNCJaRSJnZGRAHzsrF0EzlSdzfJ8tH6eTdgHTMkp4RgazPAz2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109839; a=rsa-sha256; cv=none; b=bmYXP8jAKPaLHU6eL0HtdaD1ko66GTHn/AuvlZ30s2MVJ9u1MKfOIcoBJPyEsl7PYfROfe qmiY8y+fkGmEP5Q3sOgD3WO6C3yLD5SzDVgX43T5RPL5nlGEwd2wMJa2wGjWk9cKoNJj1Y qhPkUHSs+UeOTTi885iGZXgXA343ZR0lNnj4k+T9WUoFZ5qSk92zH7XFqLX0vxhCCPbjIW fBbJkFVqxYfKIl3cnT6EgppCCL9csAsNHByE8rHfCS06f2bnFRPtBk2McDtqwqW5z9qd9H hJvwRMd77u7vutvl4sMfQNIrl3ptPlk7aENkomty+tWg2oXKfVrjfi7SmEKf5g== 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 4bLjyR598mzsl; Mon, 16 Jun 2025 21:37:19 +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 55GLbJPF072886; Mon, 16 Jun 2025 21:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbJpj072883; Mon, 16 Jun 2025 21:37:19 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:19 GMT Message-Id: <202506162137.55GLbJpj072883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3923bf59f992 - main - tools/build: Provide extra headers on non-FreeBSD 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3923bf59f99295b66c8c36c4d5f03f9e39393274 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3923bf59f99295b66c8c36c4d5f03f9e39393274 commit 3923bf59f99295b66c8c36c4d5f03f9e39393274 Author: Jessica Clarke AuthorDate: 2025-06-16 21:29:36 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:29:36 +0000 tools/build: Provide extra headers on non-FreeBSD These will be needed by future changes to continue to allow building makefs as a bootstrap tool on Linux and macOS. This also requires defining __sbintime_t in our cross-build sys/_types. --- tools/build/Makefile | 6 ++++++ tools/build/cross-build/include/common/sys/_types.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 40ac498bfbb4..83f589ce3864 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -270,6 +270,12 @@ subr_capability.c: ${SRCTOP}/sys/kern/subr_capability.c cp ${.ALLSRC} ${.TARGET} SRCS+= subr_capability.c CLEANFILES+= subr_capability.c + +# Headers needed for msdosfs use in makefs +SYSINCS+= ${SRCTOP}/sys/sys/_callout.h +SYSINCS+= ${SRCTOP}/sys/sys/_lock.h +SYSINCS+= ${SRCTOP}/sys/sys/_lockmgr.h +SYSINCS+= ${SRCTOP}/sys/sys/_task.h .endif # ${MAKE.OS} != "FreeBSD" CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h diff --git a/tools/build/cross-build/include/common/sys/_types.h b/tools/build/cross-build/include/common/sys/_types.h index 408f0537d1e6..dc1b76f25063 100644 --- a/tools/build/cross-build/include/common/sys/_types.h +++ b/tools/build/cross-build/include/common/sys/_types.h @@ -48,3 +48,6 @@ typedef __builtin_va_list __va_list; /* Needed for opensolaris compat. */ typedef __int64_t off64_t; + +/* Needed for sys/_callout.h */ +typedef __int64_t __sbintime_t; From nobody Mon Jun 16 21:37:21 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 4bLjyV0nrzz5yRwf; Mon, 16 Jun 2025 21:37:22 +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 4bLjyT6dQxz3JdK; Mon, 16 Jun 2025 21:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109842; 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=tdk15JyB/5eJ1umInf0LdRh3CuB2HtQByAeOvR5qzRc=; b=PB/u9CD1miQitnm8UQASVzlgIbkbuwmIthp9GacqIprPy7Z0UcOQ9bTG5yMsXuRswrTS25 BZ9GLUbvug+G3FiCERDY3IdFa0trxCK6PsUQ1LsoVzkTbP7HtvW0S2KDCfddNyduSl9q7g kd36ARSUwTVLV6VQNx2jHlnekIovQYfXzAYo1uD7+G/hoG1ZPNzpwlbcYqFQZZ6enBkIzG kQovE1H4AcVv3dfIFVTf9a9gU43/9B1jCbFDKMtUhG9YY3a7aYoWox2Y14NHmPTOaybTfb haHKlFx2nr8ahF58vujLpIZKgABBfJtFbOwx31/xr+ePVnKjmg0VMLJbT0sd6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109842; 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=tdk15JyB/5eJ1umInf0LdRh3CuB2HtQByAeOvR5qzRc=; b=gh3CucNUT62UMmyBYxg/0iRiUUG4isAddFFVEhXMuit0c06SvsPS1jilrfJ0CwiuuxsGLK N5IRbJ5yPSLnbiw31hkVALRHcGaDM0nW1CTUVR23zTOogmI4vpCpXm5RvoYhp76N0zNh3J HqbvbV0XCrEULqj0nGu5RpdHB2xh4xzVGDRh+dzlUqy0Hrdl9M7tWecAyOFJktABver9q5 uFThmne8rx6MYL47hOvFv2SbNlIDtTt654YCghYR4Ot9IQlRlFBH/5RSC24lAMsUH/560j /bxCG0F+yPqQZsXDFl+kIcbA9wUnIE3AeY6Ki3lhtZPie9vBjl1/Q4g5xK1wfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109842; a=rsa-sha256; cv=none; b=D955Di7elBQEuUUOB9smkFNbYXNwntN0AXbNJ2z8Ax2Clq9sXHxKH576LM6d/+SRFR0s5p tJ7+3WLdI+7b7POiS19ibIrTKAtbXCypzX382A28NtkRjnycgBCpHg1tOJkYISziatImSh vZfMeG9Z5Kahcm/9f/MzDulmfBVF0ocb55C+p6mD7DDzbXOpAmm6Qd5XdyRioZSGI+tWG0 2uBH5Mhkp2Ghde0l9WUPeun0LiidLNjn0GINhI8FJ8SyJwpBZvB0gRnkdKVxby7Xt+dbv5 JwZU0eEZf5AgofDHK1jIO2e3OtjJiompeKDcwZM+L9W0F/F/OiamaagHS/nQBw== 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 4bLjyT67tXzw8; Mon, 16 Jun 2025 21:37:21 +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 55GLbLW5072959; Mon, 16 Jun 2025 21:37:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbL6w072956; Mon, 16 Jun 2025 21:37:21 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:21 GMT Message-Id: <202506162137.55GLbL6w072956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: b1e67144058d - main - sys/mount.h: Add missing headers so it's standalone for _WANT_MOUNT 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1e67144058d6c8394272ba81751e041029bd876 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b1e67144058d6c8394272ba81751e041029bd876 commit b1e67144058d6c8394272ba81751e041029bd876 Author: Jessica Clarke AuthorDate: 2025-06-16 21:32:03 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:32:03 +0000 sys/mount.h: Add missing headers so it's standalone for _WANT_MOUNT Reviewed by: imp, kib, markj Differential Revision: https://reviews.freebsd.org/D50716 --- sys/sys/mount.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index d3ab6d7c9cae..a6f858e02395 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -41,6 +41,10 @@ #include #include #include +#elif defined(_WANT_MOUNT) +#include +#include +#include #endif /* From nobody Mon Jun 16 21:37:20 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 4bLjyT1XlFz5yRwd; Mon, 16 Jun 2025 21:37:21 +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 4bLjyS65Jpz3Jkb; Mon, 16 Jun 2025 21:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109840; 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=528lIt9GWkMTYLQRlABoZYXwW+sBZaqd0Uh3BzGFsBw=; b=eT8hpnkI4UJRAbJKaA27pdUy2c2qzrdgr+nyM78/K3GSi6uEVfeDd1RBhXMjj2FqnFs542 0Gr10YFj808pBOk7WVvktjCJH7xEZ43hEzDY9TD8To9W6owKs4kPZVRCefZ5Wrf4ZEoCJL IPaxk40eFPIEEQRHDeq+DOB1tRblgQyW1hZA8Br9hMziqg7DQiJoo2/x9JiqgQC/Gi14v1 qfgAifduHd4C+YkU4jOqCP/hpCHTvTWFEaDo2tvr9fsmGhOd7YpZ1eBLPdrw2dvHNglNyo +KvnPi6+r2JaziZAMMm+yw3s2+Qf1LlsJlEDLG8Rb3RPxiMbVFHVQenE2aWY7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109840; 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=528lIt9GWkMTYLQRlABoZYXwW+sBZaqd0Uh3BzGFsBw=; b=O+i79dAphyfyoQrWME6C8eSERbwiKkVkbH+QaqMFGKxO3yEyjxexRR6vNbrzKqNIkl59Dx UVnLVkYRtCwpVz2KGObEdmtenXLXjBgP7UumeeaWU9eDwsLQaZEHur+a8sxkQ8s1w/w9Ka 1mm6fvxbYcAKQGsIJAEsZoBlfRE65uSFRWzRhxFhPbDaM8LjN8E2EHXbC9Q9I9EsB8Fs2T uRItqkrRTMyq+R8nvTrNz2erFFNeFxHdFGzkCze8xVAN8W9Wquy7V/2Mw2W3kvAwS8XtqU K20goH+ppyve4nygGPiune7/I0mO50s2xQjQVyQxZPXwznPAA3cNssigqvAkOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109840; a=rsa-sha256; cv=none; b=Ig4//It88TkkPYzq9LoJG2/kiv1t9wBsvbB2pNBlodosdN8feNRFAabaHGDpvKTLc9N3Oz Js1ZaME7FbMQ5Ltoh+VYy+Rq4/+5liVY6iyylwLIJDA2EOoiNH0gsW05r36YvhCvkXUdHB b1mavsK71C6a+HOMhpMWvPtphpr8ELK9Y1PKGm+H2uacI5r/yRLO1ljH4t48RjyCMgb1K5 F5qYVYS+Mq33NWdjExAakgbWF3Qtmm3xXttX7o6XGoJ2wUtcq/EvxJi7XaMpKfc5AURpc1 bI5Aw6FBGfGrk8VjpHhU/caGH9+gDEjMLJpYyZpIIOG/FZI1hQZJWNMylt5xTA== 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 4bLjyS5TgBz10G; Mon, 16 Jun 2025 21:37:20 +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 55GLbK9j072926; Mon, 16 Jun 2025 21:37:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbK55072923; Mon, 16 Jun 2025 21:37:20 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:20 GMT Message-Id: <202506162137.55GLbK55072923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ebc0ceaca16c - main - sys/mount.h: Hoist sys/types.h include 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebc0ceaca16cd276ca6ff1c66142389db8d33840 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ebc0ceaca16cd276ca6ff1c66142389db8d33840 commit ebc0ceaca16cd276ca6ff1c66142389db8d33840 Author: Jessica Clarke AuthorDate: 2025-06-16 21:31:56 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:31:56 +0000 sys/mount.h: Hoist sys/types.h include This header uses various types that come from here regardless of whether _KERNEL is defined, so unconditionally include it rather than relying on other headers implicitly including it for when _KERNEL is not defined. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50884 --- sys/sys/mount.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 66822a5aadc2..d3ab6d7c9cae 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -32,10 +32,10 @@ #ifndef _SYS_MOUNT_H_ #define _SYS_MOUNT_H_ +#include #include #include #ifdef _KERNEL -#include #include #include #include From nobody Mon Jun 16 21:37:22 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 4bLjyW3tcrz5yS51; Mon, 16 Jun 2025 21:37:23 +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 4bLjyW0XKcz3Jpb; Mon, 16 Jun 2025 21:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109843; 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=/Ox6gJDTcBaS3SzakkEyIZb/2+/lmEV8fS3UxGt5VAY=; b=qasuaomBRlGboARYZvvJY1/ssMawEsh590ojEtTL98xVcv8HcBrKMHInblue/QH4qtxpaV YN+XnROaBpo/drCaqUwsTUIg/3ThaiyzEN6sutI9m9jbZpOXtg0K/e0CTMS2FF5C2VeK8P mTqwNijwZ0nYijGPJ86anyDCf9wMyHVEyzIsTLTMdutNjNnSsv8mMARzOhwyZQluQvk4GD I3vO8gEhdHQkHcS2GH8i5mMdG26gXGZI2N3OHm2YS8ElY3cUpSWIcWwn8qRnuwBI749odu kidknBsYKRjo0n3VDuIc6V1GO6rL+gK1Vd5mW8Zm2hgY9e1HA/LgekHSOcZCYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109843; 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=/Ox6gJDTcBaS3SzakkEyIZb/2+/lmEV8fS3UxGt5VAY=; b=KtAVAdDI4ASIcCjCJa8xE9i1NgySx4pmMHzEob1WxczbsVRoKiba0dwjycu87jq2Q/slHn 6+3Wwm/M9pJW6c8wFKv1DT9ZULnNCUYAozDGQCGSGUkdBwr0H1BKLEF0+ZcIOJSjsPI+O5 lCk+Fz6GpZ7Upwf8GMGf4FSBen2LHdgULN6lBs/hKJ4NaumT8R6xMUtUsV7nH8xcKU1coJ VcUYnPSgp2Z1NM6lXl54N3KpxlM+Ap9miO/qC1WfkPpUgwvNNuJN1gnU7m3b0EzOPQy9I0 hjXerra5E9G/sZKBusT34RGXxNlTehCkOrhK4FoDd45bRSrPjFarQ7kEOzArRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109843; a=rsa-sha256; cv=none; b=RAG5I8KQQFj97+EXG6WiWxrXMvimQQYPdBuXHffIstBMB05GrwkVp63ZEdKzddKgzbRfAU fCHxja9iwC3i6O4bKB3Ml4PUd04DNyGNQTbUNTg0SEbBRZ5kvrHQ/iN5WIMpY2J+0KB/R8 5qwE8rgcYmIH4w4QtkyKZ7RjO1UV6aU9CRsx8GAqHOKYkEm3fdajgeOl1v8UfM3i1lJjfz uCbnrDOr+khF7isTfrhTq5ySh2MVZFoP6iDUsyrtpmxRQwlSStipl8yLejxFzwfkNEyLTA jScO024hq1faa6C4p6r6yk41UQzTlrrWSWDA+1pJcE1M5clEhFBs1WOyDykCbg== 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 4bLjyV72LzzbP; Mon, 16 Jun 2025 21:37:22 +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 55GLbMR7072992; Mon, 16 Jun 2025 21:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbMR9072989; Mon, 16 Jun 2025 21:37:22 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:22 GMT Message-Id: <202506162137.55GLbMR9072989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 68c3cec90a87 - main - cd9660: Add _WANT_ISO_MNT 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68c3cec90a87d0d833a34f58135be9a1b063087a Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=68c3cec90a87d0d833a34f58135be9a1b063087a commit 68c3cec90a87d0d833a34f58135be9a1b063087a Author: Jessica Clarke AuthorDate: 2025-06-16 21:32:09 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:32:09 +0000 cd9660: Add _WANT_ISO_MNT This allows struct iso_mnt to be defined for userspace without resorting to the gross hack of defining _KERNEL. In particular, it will be used by libprocstat so it can stop defining _KERNEL. Reviewed by: imp, kib, markj Differential Revision: https://reviews.freebsd.org/D50717 --- sys/fs/cd9660/iso.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index 63ce5f50949a..40047cc92de6 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -212,7 +212,7 @@ struct iso_extended_attributes { u_char len_au [ISODCL (247, 250)]; /* 723 */ }; -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_WANT_ISO_MNT) /* CD-ROM Format type */ enum ISO_FTYPE { ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP, @@ -253,6 +253,10 @@ struct iso_mnt { void *im_l2d; }; +#endif /* defined(_KERNEL) || defined(_WANT_ISO_MNT) */ + +#ifdef _KERNEL + struct ifid { u_short ifid_len; u_short ifid_pad; From nobody Mon Jun 16 21:37:24 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 4bLjyX4S1sz5yS06; Mon, 16 Jun 2025 21:37:24 +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 4bLjyX1Bg1z3Jh3; Mon, 16 Jun 2025 21:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109844; 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=MwS0Rh23OFtvuEXNXL1Qqx45WojGbM8YvRGsrUVxgdM=; b=qZ3TwbJuIGz1bA2xb9zUDgTDtRQhuwJ3V2yBmx4gxCLTGrkbQigBxRNC48pQL4t5bFzg96 AxnOHFxWug5iHDFkOUKqtWlo6tXdF8GQsimjPolXy696hPG26HrEyaP95c3MOtYOf0uihr bbHmnhF2ExkQpktceNlh1JPng7Pu1rf3xHeVLjPvUTJDhmgGIjLOOl5OQg+6FKAvPD5Tc0 ikI9D+BQnPiG2FDPmcGpKzMtulcAwNtIDT8JzEaifXPiqn/z88HUAV6QFPERZ4/5SCNWnG OvAC/jDzN5G7D4CMP1oLwb8FVdIQJuKvb4jSxcVbgC0Ddh7KCxQvi5vnkBZDLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109844; 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=MwS0Rh23OFtvuEXNXL1Qqx45WojGbM8YvRGsrUVxgdM=; b=AuBCz2uMQN701WB77aeJGoIXu6lYit0yzetdIwnjrYWWzUxT8XflNjbdNuPZwgfCTLupBG zwV5rJ91aDYBxri1asg5guqmcho/DMyA2GwUASmnXJ84jvoTp31Gspf5W+RjnOt3w7ISsI wfM073fM6pAEhbUtcjh+/gUXZ2fVn8PKlqTtuqREPl4BX/iMzKU08jTymEdMR0WR7Jnpay 7EBxmsYkT0yipnX4hY5Vzrre5BAaQXCxcevFHlVwO/Q4oxXmgh4DIfAdok0w6ZN1NBBdFc 94uJYdvKRNO/TRzluCzBeAw8p75uBw0cMFTGyJ9MMsNCxzCDnE4G+nARmmTXSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109844; a=rsa-sha256; cv=none; b=kw8NvZiJfFR9Vuq49bAvhhFSpunRAox232RDCRZwM8pMx9LicQVSlXOpH43h9/DJGhQw12 km55hzsFQzV5diJNMRx19/9Pa+iMAQxIU0faVQzwzRrfAwfUWfS0kePjnJcm2fAn7RQZjd 7D6xS1bSNUpUY+mNOYVZmMRgjH9W53/3OnMVykvhI1i/ol/ilX0SzyxZYFVE+VUfJM/VYR QVkava4MyU/NntH+OB805vR7ByeKU2vlOGtibGTyp7R0AxJBU6sN+r1BgtHB+aHPQy9ILm FSpXHMiOiRtjXE9ceoUt9hhSCVtA0HYlOTnlNmz6vj/Gyz+c/mArwXVjOoIREg== 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 4bLjyX0pRrzbQ; Mon, 16 Jun 2025 21:37:24 +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 55GLbO9v073025; Mon, 16 Jun 2025 21:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbOg6073022; Mon, 16 Jun 2025 21:37:24 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:24 GMT Message-Id: <202506162137.55GLbOg6073022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c4d3a1836d50 - main - msdosfs: Don't #ifdef out msdosfsmount members 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4d3a1836d50f66de71384bf7e824b2c49f914a3 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c4d3a1836d50f66de71384bf7e824b2c49f914a3 commit c4d3a1836d50f66de71384bf7e824b2c49f914a3 Author: Jessica Clarke AuthorDate: 2025-06-16 21:33:07 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:33:07 +0000 msdosfs: Don't #ifdef out msdosfsmount members Whilst these aren't used by makefs, they do little harm existing once the needed headers are included, and having structs change layout based on defines like this can be fraught. This will be particularly true once this code is exposed by defines other than _KERNEL and MAKEFS, as any consumer will be able to opt into exposing this kernel type and all the definitions should match. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50885 --- sys/fs/msdosfs/msdosfsmount.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h index 8f15bc2eaf42..adfc7e4d0e88 100644 --- a/sys/fs/msdosfs/msdosfsmount.h +++ b/sys/fs/msdosfs/msdosfsmount.h @@ -58,8 +58,11 @@ #ifndef MAKEFS #include #include -#include +#else +#include +#include #endif +#include #include #ifdef MALLOC_DECLARE @@ -114,11 +117,9 @@ struct msdosfsmount { void *pm_w2u; /* Unicode->Local iconv handle */ void *pm_u2d; /* Unicode->DOS iconv handle */ void *pm_d2u; /* DOS->Local iconv handle */ -#ifndef MAKEFS struct lock pm_fatlock; /* lockmgr protecting allocations */ struct lock pm_checkpath_lock; /* protects doscheckpath result */ struct task pm_rw2ro_task; /* context for emergency remount ro */ -#endif }; /* From nobody Mon Jun 16 21:37:26 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 4bLjyb0ndWz5yRtG; Mon, 16 Jun 2025 21:37:27 +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 4bLjyZ2sghz3Jmm; Mon, 16 Jun 2025 21:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109846; 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=1rBst8MKT5+SBWEyzqcGpJagOsN6l5m/Wymk6E3z6SA=; b=Tm4PUbv0hcwr7UtlPXiavJChjRogSIsOppxO8f9WZCp8QEWo/8naQB1vMVY5wuqAIoe6UR GX8l41Pzqatd4EjVAna4mc6HHIxfplMA0+Ad89OJQ93VdiF9+DNJfgF7tzxeyz5XBhrVhT eBFBiAKVK/lBd0WkgOYPx6W5uQJIfYQB1BQfBG1FeYGT6VSNetbIbQzGe2r8bXKMMUygrm c9+bVCk1BpnlJC90iXESgZ1+giAsG3iu2fsOoj0h1poZz11w7Z2C5lbdTIXBV5ieC6jxWg UwsmosOns5kCVtP8Ub6UVdN1o202OV1or5BDY1k2U7uLESqPXb3fTvMBS78ySg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109846; 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=1rBst8MKT5+SBWEyzqcGpJagOsN6l5m/Wymk6E3z6SA=; b=uFhMhWqgI7WQzgePQzHg5SmTXn/LrZP9IhWhR/q81gXnrb9CIuun1tTltSuADgl0iIY+4S F1pUvoSwldO4jIbskPdu2oYB+N/rBn8PPfjRo7icrnOl3XwfYtmWvkyVZJZsT4PVawRMZx rbhv0jnGyJ+k4NsSbLd7U1kvSSfku+iVfuDDgxqnOTIudmeCbqi8OsWJg0j1Tr5DZVactm 06SjcVPJ6Ts43qA4C5bbvvyNE/plAzG4V9PmKhHGakbTGnRNLPTB114tUDXKsS0PwyF6cV HMz1GKEUIc/DJUCrTDcnTRdNmGOE0lLznEe9AgXmjuOpcV8NFMua90Ot85O16g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109846; a=rsa-sha256; cv=none; b=QvR28FS6AT8Ew/YflDgfpOMsNSeikHpBIlDSgrg4V2B8pjQBNG+gMPJO23LrXrEF+GnOMF nwzJKXh6d1aBskoLUI8mU6M9oFPpBMXPIsfQEW/H3BHq/uH0NgyoYkTx7Qqm46pAqSNwEZ DjhzNP5YMQO3qlkw+dJqtYGiFDBB3oUv7HADHcxMbpOmrQCwQJUHrAAE5ZpVxNcpIE2h5Q ivC4rZeFY6yjn8geQ2VweJFTLZwHUrCpttDNQSYtKvMCiXt1ogSjByIbAJqHzglrIMx3W2 o63RItZynZaWf90zBqgEecvH1RVB1ncF4LdbCTcg5d1PEhsJjAI23P7576Gmzw== 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 4bLjyZ2DDKz14b; Mon, 16 Jun 2025 21:37:26 +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 55GLbQNA073097; Mon, 16 Jun 2025 21:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbQsu073094; Mon, 16 Jun 2025 21:37:26 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:26 GMT Message-Id: <202506162137.55GLbQsu073094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 20aaf0f6578c - main - libprocstat: Drop all _KERNEL defines outside of zfs_defs.c 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20aaf0f6578cfb273383332fb9188548b53d2ca7 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=20aaf0f6578cfb273383332fb9188548b53d2ca7 commit 20aaf0f6578cfb273383332fb9188548b53d2ca7 Author: Jessica Clarke AuthorDate: 2025-06-16 21:33:54 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:33:54 +0000 libprocstat: Drop all _KERNEL defines outside of zfs_defs.c Defining _KERNEL is a historical hack that can often break due to the environment not actually being that of a kernel build. Now that we have other targeted macros we can define instead that don't have far-reaching implications like _KERNEL we can drop this. Reviewed by: imp, kib, markj Differential Revision: https://reviews.freebsd.org/D50719 --- lib/libprocstat/cd9660.c | 3 +-- lib/libprocstat/msdosfs.c | 15 +++------------ lib/libprocstat/smbfs.c | 3 +-- lib/libprocstat/udf.c | 2 -- lib/libprocstat/zfs.c | 3 +-- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/libprocstat/cd9660.c b/lib/libprocstat/cd9660.c index de1140145527..ec37f49df0f6 100644 --- a/lib/libprocstat/cd9660.c +++ b/lib/libprocstat/cd9660.c @@ -52,9 +52,8 @@ #include -#define _KERNEL +#define _WANT_ISO_MNT #include -#undef _KERNEL #include #include diff --git a/lib/libprocstat/msdosfs.c b/lib/libprocstat/msdosfs.c index bb1ad65e6b1a..01345bb8d334 100644 --- a/lib/libprocstat/msdosfs.c +++ b/lib/libprocstat/msdosfs.c @@ -44,17 +44,15 @@ #include #include #include +#include #include -#define _KERNEL -#include +#define _WANT_MSDOSFS_INTERNALS #include #include -#undef _KERNEL - -#include #include +#include #include #include @@ -62,13 +60,6 @@ #include #include -/* - * XXX - - * VTODE is defined in denode.h only if _KERNEL is defined, but that leads to - * header explosion - */ -#define VTODE(vp) ((struct denode *)getvnodedata(vp)) - #include "libprocstat.h" #include "common_kvm.h" diff --git a/lib/libprocstat/smbfs.c b/lib/libprocstat/smbfs.c index 136cceacb471..cbd32cf8f597 100644 --- a/lib/libprocstat/smbfs.c +++ b/lib/libprocstat/smbfs.c @@ -32,9 +32,8 @@ #include #include #include -#define _KERNEL +#define _WANT_MOUNT #include -#undef _KERNEL #include diff --git a/lib/libprocstat/udf.c b/lib/libprocstat/udf.c index 9a110950f8b0..3298af6dec5f 100644 --- a/lib/libprocstat/udf.c +++ b/lib/libprocstat/udf.c @@ -32,9 +32,7 @@ #include #include #include -#define _KERNEL #include -#undef _KERNEL #include diff --git a/lib/libprocstat/zfs.c b/lib/libprocstat/zfs.c index 665b1e5abe24..010337c1919a 100644 --- a/lib/libprocstat/zfs.c +++ b/lib/libprocstat/zfs.c @@ -31,9 +31,8 @@ #include #include -#define _KERNEL +#define _WANT_MOUNT #include -#undef _KERNEL #include #include #include From nobody Mon Jun 16 21:37:25 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 4bLjyY55xrz5yS09; Mon, 16 Jun 2025 21:37:25 +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 4bLjyY2PLPz3JVm; Mon, 16 Jun 2025 21:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109845; 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=3TyxlkemaYdow0sGc/6OGtEWm90To38rzrMZsZf+rRU=; b=fdBCoqZRT7kYvPyqod92Av4pRQiv70qsI31ZapAW7THuKEs4gM9Cc5+twhOmC3GnzJy2kJ P1lDQ1dxi802ogwAAK1SJMhxqRaHGzf69yU4uW8Ji+AXIePFt9neP83UKx+tljN7DswApq etZ5PzK9ZuXlKXx64tQWOpxY+vPfspgVZLNQeNUvCLJeOIhnu5Oyzdm5wXl+jZhoLSSBU7 bYbBNqE+XtpKMfWCicnaFD/BnjvKnPyW+S+7Vv4TIxYraALpNgWbKyAS0pEmXofmdb6t9u 06Er8pSNhQ3zdDughyjLNR9fymLl1EKsD5a6S3qbJEGd/uNB0nhxZSwgRm5ASA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109845; 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=3TyxlkemaYdow0sGc/6OGtEWm90To38rzrMZsZf+rRU=; b=ZK+RgDTOg6+2EjSo7NsD4PXghJxHOZsPkpDQx3g+GQo6QhIMKY1ODMw4x/f+YMcF/xS+jX c/mGNqSLu4M8DtXxl7p1m9rLs8B5V5pttTZGLIiHZuQY5JYw/97CmI1eYXdgKoViu6jdMK m1ePbRIseob+7Kr+9D80jugUBrZLhtFcBbbivM5xZnobHn49Az1IpvTD1O1XlKfE0HvJlg qaYNPMYnXRsuSs7WC9SPiLMdzuU/f7gpGQf95t12py3GheIQ9AwOic+sYTe3zt6R/UdS6g 9ufAG6nbORWWuUY8HbwoA19slvnc+ePDfXJWTjgj7xsCDYxDPuJbH/LVq7pPUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109845; a=rsa-sha256; cv=none; b=dSZRBl4Iqrbz++AZDsohdyeoMTWtcTl4+jcPsB0JXtuXO3IToEF+ii09bszluthBW58Lz4 soAVnKynmnroNiV1TgmJt+DvxBxdMKdkF6l0q1vbQfCCkeTNhvH63kTTfZZKdJUcVmi4W0 +smeCC/q6zB4F/7uOtVR+Aedapxh+PqBpfof88/dd8LQtGqFWqE1LDDE5PTmWcOBVQLfRn ykjYg3ZbmP69oltYX4FxRueIhYLFAL3pJTyUUJ7acfmM6w2aL7lQjtE7ALh0UmN9jk0Fm6 NcU9Ui3znDCcVam19O2ivr74FZcuoV3bw+YVwMx36x2TvmR0SUpgX4K2mfe2Tw== 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 4bLjyY1lj9zbR; Mon, 16 Jun 2025 21:37:25 +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 55GLbPvr073058; Mon, 16 Jun 2025 21:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbPR5073055; Mon, 16 Jun 2025 21:37:25 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:25 GMT Message-Id: <202506162137.55GLbPR5073055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: b61239ef83d6 - main - msdosfs: Add _WANT_MSDOSFS_INTERNALS to replace MAKEFS in headers 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b61239ef83d671f04c3f9d3ace96cb07e0c9e6df Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b61239ef83d671f04c3f9d3ace96cb07e0c9e6df commit b61239ef83d671f04c3f9d3ace96cb07e0c9e6df Author: Jessica Clarke AuthorDate: 2025-06-16 21:33:18 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:33:18 +0000 msdosfs: Add _WANT_MSDOSFS_INTERNALS to replace MAKEFS in headers This lets other bits of userspace expose these various definitions too. In particular, this will be used by libprocstat so it can stop defining _KERNEL. The function prototypes surely won't be useful in other contexts, but the various types are, and it's not worth hiding the prototypes unless they end up causing issues, but so long as they aren't called they shouldn't be a problem. Note the MAKEFS define continues to exist, but only for use in newfs_msdos, as those sources are reused by makefs with some changed behaviour. Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D50718 --- sys/fs/msdosfs/denode.h | 4 ++-- sys/fs/msdosfs/fat.h | 4 ++-- sys/fs/msdosfs/msdosfsmount.h | 10 +++++----- usr.sbin/makefs/msdos/Makefile.inc | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h index 0d31b0583fa6..e6928fb46052 100644 --- a/sys/fs/msdosfs/denode.h +++ b/sys/fs/msdosfs/denode.h @@ -212,7 +212,7 @@ struct denode { ((dep)->de_Attributes & ATTR_DIRECTORY) ? 0 : (dep)->de_FileSize), \ putushort((dp)->deHighClust, (dep)->de_StartCluster >> 16)) -#if defined(_KERNEL) || defined(MAKEFS) +#if defined(_KERNEL) || defined(_WANT_MSDOSFS_INTERNALS) #define VTODE(vp) ((struct denode *)(vp)->v_data) #define DETOV(de) ((de)->de_vnode) @@ -294,5 +294,5 @@ int removede(struct denode *pdep, struct denode *dep); int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred); int doscheckpath( struct denode *source, struct denode *target, daddr_t *wait_scn); -#endif /* _KERNEL || MAKEFS */ +#endif /* _KERNEL || _WANT_MSDOSFS_INTERNALS */ #endif /* !_FS_MSDOSFS_DENODE_H_ */ diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h index a88bfb94e91d..344cd5a9416d 100644 --- a/sys/fs/msdosfs/fat.h +++ b/sys/fs/msdosfs/fat.h @@ -81,7 +81,7 @@ #define MSDOSFSEOF(pmp, cn) ((((cn) | ~(pmp)->pm_fatmask) & CLUST_EOFS) == CLUST_EOFS) -#if defined (_KERNEL) || defined(MAKEFS) +#if defined (_KERNEL) || defined(_WANT_MSDOSFS_INTERNALS) /* * These are the values for the function argument to the function * fatentry(). @@ -110,5 +110,5 @@ markvoldirty(struct msdosfsmount *pmp, bool dirty) return (markvoldirty_upgrade(pmp, dirty, false)); } -#endif /* _KERNEL || MAKEFS */ +#endif /* _KERNEL || _WANT_MSDOSFS_INTERNALS */ #endif /* !_FS_MSDOSFS_FAT_H_ */ diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h index adfc7e4d0e88..fcaac544a74d 100644 --- a/sys/fs/msdosfs/msdosfsmount.h +++ b/sys/fs/msdosfs/msdosfsmount.h @@ -52,10 +52,10 @@ #ifndef _MSDOSFS_MSDOSFSMOUNT_H_ #define _MSDOSFS_MSDOSFSMOUNT_H_ -#if defined (_KERNEL) || defined(MAKEFS) +#if defined(_KERNEL) || defined(_WANT_MSDOSFS_INTERNALS) #include -#ifndef MAKEFS +#ifdef _KERNEL #include #include #else @@ -246,9 +246,9 @@ struct msdosfs_fileno { #define MSDOSFS_ASSERT_MP_LOCKED(pmp) \ lockmgr_assert(&(pmp)->pm_fatlock, KA_XLOCKED) -#endif /* _KERNEL || MAKEFS */ +#endif /* _KERNEL || _WANT_MSDOSFS_INTERNALS */ -#ifndef MAKEFS +#ifdef _KERNEL /* * Arguments to mount MSDOS filesystems. */ @@ -266,7 +266,7 @@ struct msdosfs_args { char *cs_local; /* Local Charset */ mode_t dirmask; /* dir mask to be applied for msdosfs perms */ }; -#endif /* MAKEFS */ +#endif /* _KERNEL */ /* * Msdosfs mount options: diff --git a/usr.sbin/makefs/msdos/Makefile.inc b/usr.sbin/makefs/msdos/Makefile.inc index 78ddc7804b31..cfa9e0e114c2 100644 --- a/usr.sbin/makefs/msdos/Makefile.inc +++ b/usr.sbin/makefs/msdos/Makefile.inc @@ -3,7 +3,7 @@ MSDOS_NEWFS= ${SRCTOP}/sbin/newfs_msdos .PATH: ${SRCDIR}/msdos ${MSDOS} ${MSDOS_NEWFS} -CFLAGS+= -DMAKEFS -I${MSDOS} -I${MSDOS_NEWFS} +CFLAGS+= -DMAKEFS -D_WANT_MSDOSFS_INTERNALS -I${MSDOS} -I${MSDOS_NEWFS} SRCS+= mkfs_msdos.c SRCS+= msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c From nobody Mon Jun 16 21:37:28 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 4bLjyd6RnDz5yRqf; Mon, 16 Jun 2025 21:37:29 +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 4bLjyc6HHzz3Jq0; Mon, 16 Jun 2025 21:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109848; 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=njcCunHFIa7Dey7jVbx3spb4Q48qVRbj8lDFyKTYr/U=; b=JpbUyreC0eDoGtAMAc5oKA5qUqKfkQHQKpy6EJq7cuhRlmyHDfSMM8eLzlFbL3M/IF4AI9 Dne63BYv+Fc7QBc/71Zn9xlpfon6o0NmBRU3MUKMkIHzmucjrpeGqrintBOmDUw2jrgwTH 6PnqbR9denARO9AYjKjxWfG/PSvEUEwtETdvk1ECpcSmZgW3fAOzbOm+0VtME/mMBFN5G0 37HKoPBH3bMW81T2Ro5Uqr/M2US1gxHXx/+S/80d7E60HquraegP+5/7jvZue5NNfFDFLb KCmr/AXzU23xrTIlrwLPEvoVLRFB3/JEGgxBxjN1LTuRjfkSqyASVD48y8cveA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109848; 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=njcCunHFIa7Dey7jVbx3spb4Q48qVRbj8lDFyKTYr/U=; b=wsq28lXOn+WUsnvsjOiIjhLEDEvhKS8q2GslAsp9dWC4tWTPx7mgl9L1nGHC9nq1a6EJ5U DpKR7DPnnm6SS0ZTW2HxHqxOFl2MORDRDGzyxwBe0ln56qNrP6mBlyqv1NJC2giKGOfJlA M8/G7tz6LTbG8CZeb8zw5+Z/zymiMQFpkoFvOt85QxP5Aglhthbru43ub05LLSmxvHItYp h4M4eppiyIv/W1poXT6pUM02iX8Q8si8B1sNusU+0RzRGLmZ36RCR6sGOvikKRJSyevXix PZXEU2i3sNf+PB2SK1LIzvrlynnBijN3Awx6bYfnNTw+7DdzfR+y30iS1Sa5dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109848; a=rsa-sha256; cv=none; b=SBU9X+7CUSSPg37LAgyUTdxhYUwgsUFah7DaqXEKTQmeD4mRc2WD/h7+kpzTihNUZ+PLP6 uiWNWJtu0EdCEQdVntNLnFYHPdfYhOf/hmsCTqlYHGSi9vwCj2TgMexPBj9v5rkMtyAUdW rsLZOu2ZiQoyWJtY3UA3U+IEcJTHrGk8SwW6zOSsos5AxnnpDb1opbTmNV55z5W6gGecwp r55efW82Y/GBY90Mcd4+R5sMR/ePZv/vs55s2oINPaGx67BLFNgPWVrc0h6ZEIhdh7L8Lu KcChRSDt8VWq3jqyFlOgHsJidpGrvPaBGZFSMt7OmhvS88zE7LAS84lUPe5jRg== 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 4bLjyc4N9Vzsm; Mon, 16 Jun 2025 21:37:28 +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 55GLbSa6073163; Mon, 16 Jun 2025 21:37:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbSbJ073160; Mon, 16 Jun 2025 21:37:28 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:28 GMT Message-Id: <202506162137.55GLbSbJ073160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 66cc116bb2c1 - main - libprocstat: Drop zfs_defs.c hack, including its _KERNEL define 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66cc116bb2c17c3373762c2c53928a2be775b17d Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=66cc116bb2c17c3373762c2c53928a2be775b17d commit 66cc116bb2c17c3373762c2c53928a2be775b17d Author: Jessica Clarke AuthorDate: 2025-06-16 21:34:34 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:34:34 +0000 libprocstat: Drop zfs_defs.c hack, including its _KERNEL define Now that we have a _WANT_ZNODE we can use that instead of defining _KERNEL, and we're able to move the code back into zfs.c using a real znode_t pointer. Whilst here, tidy the includes. Reviewed by: imp, kib, markj Differential Revision: https://reviews.freebsd.org/D50721 --- lib/libprocstat/Makefile | 23 ++++++----- lib/libprocstat/zfs.c | 49 +++++++++++----------- lib/libprocstat/zfs/Makefile | 30 -------------- lib/libprocstat/zfs/Makefile.depend | 11 ----- lib/libprocstat/zfs_defs.c | 81 ------------------------------------- lib/libprocstat/zfs_defs.h | 36 ----------------- 6 files changed, 38 insertions(+), 192 deletions(-) diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index 229adc6015f7..e20518910ba3 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -52,18 +52,23 @@ MLINKS+=libprocstat.3 procstat_close.3 \ libprocstat.3 procstat_open_kvm.3 \ libprocstat.3 procstat_open_sysctl.3 -# XXX This is a hack. .if ${MK_CDDL} != "no" CFLAGS+= -DLIBPROCSTAT_ZFS SRCS+= zfs.c -OBJS+= zfs/zfs_defs.o -SUBDIR= zfs -zfs/zfs_defs.o: .PHONY - @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.o -zfs/zfs_defs.pico: .PHONY - @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pico -zfs/zfs_defs.pieo: .PHONY - @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pieo +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs +CFLAGS.zfs.c+= -DIN_BASE +CFLAGS.zfs.c+= -DHAVE_ISSETUGID +CFLAGS.zfs.c+= -DZFS_DEBUG +CFLAGS.zfs.c+= -I${ZFSTOP}/include +CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include +CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include/os/freebsd +CFLAGS.zfs.c+= -I${ZFSTOP}/include/os/freebsd/zfs +CFLAGS.zfs.c+= -I${ZFSTOP}/module/icp/include +CFLAGS.zfs.c+= -I${SRCTOP}/sys +CFLAGS.zfs.c+= -I${SRCTOP}/sys/modules/zfs +CFLAGS.zfs.c+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h +CFLAGS.zfs.c+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +CFLAGS.zfs.c+= -Wno-cast-qual .endif .include diff --git a/lib/libprocstat/zfs.c b/lib/libprocstat/zfs.c index 010337c1919a..6dc23d7573fd 100644 --- a/lib/libprocstat/zfs.c +++ b/lib/libprocstat/zfs.c @@ -26,10 +26,6 @@ * SUCH DAMAGE. */ -#include /* __RENAME */ - -#include - #include #define _WANT_MOUNT #include @@ -38,26 +34,28 @@ #include #include #include +#define _WANT_ZNODE +#include +#include #include #include #include +#include #include #include #define ZFS #include "libprocstat.h" #include "common_kvm.h" -#include "zfs_defs.h" int zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn) { struct mount mount, *mountptr; - void *znodeptr; - char *dataptr; + znode_t *kznodeptr, *znode; size_t len; int size; @@ -66,27 +64,30 @@ zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn) warnx("error getting sysctl"); return (1); } - dataptr = malloc(size); - if (dataptr == NULL) { + znode = malloc(size); + if (znode == NULL) { warnx("error allocating memory for znode storage"); return (1); } - if ((size_t)size < offsetof_z_id + sizeof(uint64_t) || - (size_t)size < offsetof_z_mode + sizeof(mode_t) || - (size_t)size < offsetof_z_size + sizeof(uint64_t)) { + if ((size_t)size != sizeof(znode_t)) + warnx("znode_t size mismatch, data could be wrong"); + + if ((size_t)size < offsetof(znode_t, z_id) + sizeof(znode->z_id) || + (size_t)size < offsetof(znode_t, z_mode) + sizeof(znode->z_mode) || + (size_t)size < offsetof(znode_t, z_size) + sizeof(znode->z_size)) { warnx("znode_t size is too small"); goto bad; } - if ((size_t)size != sizeof_znode_t) - warnx("znode_t size mismatch, data could be wrong"); - - /* Since we have problems including vnode.h, we'll use the wrappers. */ - znodeptr = getvnodedata(vp); - if (!kvm_read_all(kd, (unsigned long)znodeptr, dataptr, - (size_t)size)) { - warnx("can't read znode at %p", (void *)znodeptr); + /* + * OpenZFS's libspl provides a dummy sys/vnode.h that shadows ours so + * struct vnode is an incomplete type. Use the wrapper until that is + * resolved. + */ + kznodeptr = getvnodedata(vp); + if (!kvm_read_all(kd, (unsigned long)kznodeptr, znode, (size_t)size)) { + warnx("can't read znode at %p", (void *)kznodeptr); goto bad; } @@ -102,12 +103,10 @@ zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn) * under .zfs/. */ vn->vn_fsid = mount.mnt_stat.f_fsid.val[0]; - vn->vn_fileid = *(uint64_t *)(void *)(dataptr + offsetof_z_id); - vn->vn_mode = *(mode_t *)(void *)(dataptr + offsetof_z_mode); - vn->vn_size = *(uint64_t *)(void *)(dataptr + offsetof_z_size); - free(dataptr); + vn->vn_fileid = znode->z_id; + vn->vn_mode = znode->z_mode; + vn->vn_size = znode->z_size; return (0); bad: - free(dataptr); return (1); } diff --git a/lib/libprocstat/zfs/Makefile b/lib/libprocstat/zfs/Makefile deleted file mode 100644 index 5e1ebd44d1d3..000000000000 --- a/lib/libprocstat/zfs/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -.PATH: ${.CURDIR:H} - -SRCS= zfs_defs.c -OBJS= zfs_defs.o -WARNS?= 1 - -FORTIFY_SOURCE= 0 - -# We fake a kernel compilation environment in order to get the definition for -# 'zpool_t'. -CFLAGS+= -DIN_BASE -D__KERNEL__ -D_KERNEL -UKLD_TIED -DKLD_MODULE -CFLAGS+= -DHAVE_ISSETUGID -D_SYS_VMEM_H_ - -CFLAGS+= -fno-builtin -nostdlib - -CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -I${SRCTOP}/sys -I. -I.. - -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h - -all: ${OBJS} -CLEANFILES= ${OBJS} - -.include diff --git a/lib/libprocstat/zfs/Makefile.depend b/lib/libprocstat/zfs/Makefile.depend deleted file mode 100644 index 993ab0638f4a..000000000000 --- a/lib/libprocstat/zfs/Makefile.depend +++ /dev/null @@ -1,11 +0,0 @@ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/lib/libprocstat/zfs_defs.c b/lib/libprocstat/zfs_defs.c deleted file mode 100644 index 7f935c827118..000000000000 --- a/lib/libprocstat/zfs_defs.c +++ /dev/null @@ -1,81 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2020 Andriy Gapon - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -/* - * Prevent some headers from getting included and fake some types - * in order to allow this file to compile without bringing in - * too many kernel build dependencies. - */ -#define _OPENSOLARIS_SYS_PATHNAME_H_ -#define _OPENSOLARIS_SYS_POLICY_H_ -#define _VNODE_PAGER_ - - -enum vtype { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD, - VMARKER }; - -/* - * Vnode attributes. A field value of VNOVAL represents a field whose value - * is unavailable (getattr) or which is not to be changed (setattr). - */ -struct vattr { - enum vtype va_type; /* vnode type (for create) */ - u_short va_mode; /* files access mode and type */ - u_short va_padding0; - uid_t va_uid; /* owner user id */ - gid_t va_gid; /* owner group id */ - nlink_t va_nlink; /* number of references to file */ - dev_t va_fsid; /* filesystem id */ - ino_t va_fileid; /* file id */ - u_quad_t va_size; /* file size in bytes */ - long va_blocksize; /* blocksize preferred for i/o */ - struct timespec va_atime; /* time of last access */ - struct timespec va_mtime; /* time of last modification */ - struct timespec va_ctime; /* time file changed */ - struct timespec va_birthtime; /* time file created */ - u_long va_gen; /* generation number of file */ - u_long va_flags; /* flags defined for file */ - dev_t va_rdev; /* device the special file represents */ - u_quad_t va_bytes; /* bytes of disk space held by file */ - u_quad_t va_filerev; /* file modification number */ - u_int va_vaflags; /* operations flags, see below */ - long va_spare; /* remain quad aligned */ -}; - -#define _WANT_MOUNT -#include -#include - -size_t sizeof_znode_t = sizeof(znode_t); -size_t offsetof_z_id = offsetof(znode_t, z_id); -size_t offsetof_z_size = offsetof(znode_t, z_size); -size_t offsetof_z_mode = offsetof(znode_t, z_mode); - -/* Keep pcpu.h satisfied. */ -uintptr_t *__start_set_pcpu; -uintptr_t *__stop_set_pcpu; diff --git a/lib/libprocstat/zfs_defs.h b/lib/libprocstat/zfs_defs.h deleted file mode 100644 index de17efba5630..000000000000 --- a/lib/libprocstat/zfs_defs.h +++ /dev/null @@ -1,36 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2020 Andriy Gapon - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LIBPROCSTAT_ZFS_DEFS_H -#define _LIBPROCSTAT_ZFS_DEFS_H - -extern size_t sizeof_znode_t; -extern size_t offsetof_z_id; -extern size_t offsetof_z_size; -extern size_t offsetof_z_mode; - -#endif /* _LIBPROCSTAT_ZFS_DEFS_H */ From nobody Mon Jun 16 21:37:27 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 4bLjyb5P0Lz5yRnJ; Mon, 16 Jun 2025 21:37:27 +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 4bLjyb3fDjz3Jpq; Mon, 16 Jun 2025 21:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109847; 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=3vXi6fzCui2mP8tjgVXBgePA5PxtkrNHaNPbzogY7X0=; b=QlaBEKOFONWNfqa0ZYYTOcCktsPijyWI0/hskxet6CptySFIK5k+EeJluJ3PLt5ltXuMSr 5LDs1sR8AUoiISuz8wYEsXKGtPWbfyLBhsukUFzTfhOCJP4U2O25Np+TowS5CAnBYr4UhA 9J8Dj0HMalUzmFjGMWWyzBziIs5pb0BDbHqiYO7+vapAiuhz/XKN9NSoAYtDvfrTpbzqOX DnZZ7MjHgUKSjAKFal/7Gkuwf6oRrAbAj9StqhwdAKBa43P2xU/+Z68WBm3Mik1Y8a+Q1y NE9P6Bx8syGlMAOzex3SjZfJYuOkLnlvHDN/yW+JkphDyx5z5T6kd/umCwLmkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109847; 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=3vXi6fzCui2mP8tjgVXBgePA5PxtkrNHaNPbzogY7X0=; b=qhyhrTAolcEuchsDokchDnHNI/gNOmD+Llq/juJ3jX2EG4bQG7T76quo3sx/kaaePm7/ZL pj68aP786X/a9WuzYDgp79i5TGXZZ7X8SPUAHWfQLoL5HM94aawE33gFb+/TmaKNltQakw tIhVh4doyVsYQU8cRs1x6zJdpe3BiIHEixYbXQE0tvEr+FfLHQ84VPjIhAwIp1+hZDOkv+ OSeXcveITpQft+86yhqUzuO7e5rw9jO2Xqg8gJK27yRWpEVFaaxuLfJL0gVijBMo7EJOAX fdXnhT9Sz7gjoMfEDfCmfOJuiXFhqs/CZSuMFeFPmm/a6nC/03c8Iv7gN/gnjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109847; a=rsa-sha256; cv=none; b=ja028B/C5axN3X8/vfTj1LxsMEAW2qvHYmEjBh0YbaLAUlMEbBU8HfppFZF+Go+PnJKTYP bTjnRh7Zc+P+M/87B1ex/PpK0kylgzRLVq1qMxzGxA6EfMAJCQnHrxH9xPcLsO25fMVyTy pgFCmZQ2hpYovgvJ67Tk6+nN/672j2/mZFnelJ4tCRuMha8ENRTaTdnT9d7Fb7CCxIwQDj 4CvGLoJHsJGHKIyL1h6kSyddt34fuHp4GnI6Nfs91THUozKCi+yyFiB38fJu/eCTT6adHB QFzNXntEb5l0bdR7PyiZIyFSfOySRg1DeUob9p+Fb9UOED2qZZG8RwaJYlhzKA== 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 4bLjyb381Lzn0; Mon, 16 Jun 2025 21:37:27 +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 55GLbRod073130; Mon, 16 Jun 2025 21:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbRnE073127; Mon, 16 Jun 2025 21:37:27 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:27 GMT Message-Id: <202506162137.55GLbRnE073127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: b4f9be7fb371 - main - openzfs: Add a _WANT_ZNODE that defines struct znode / znode_t for userspace 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4f9be7fb371aa84881d12089d42df5ef14d3e89 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b4f9be7fb371aa84881d12089d42df5ef14d3e89 commit b4f9be7fb371aa84881d12089d42df5ef14d3e89 Author: Jessica Clarke AuthorDate: 2025-06-16 21:34:12 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:34:12 +0000 openzfs: Add a _WANT_ZNODE that defines struct znode / znode_t for userspace Note that ZNODE_OS_FIELDS needs to change to using struct vnode over vnode_t (matching struct zfsvfs rather than vnode_t) since vnode_t is only defined in the kernel SPL, not the userspace SPL (libspl). Whilst here, tidy up the includes and clarify a comment. Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D50720 --- sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h | 9 ++++++++- sys/contrib/openzfs/include/sys/zfs_vfsops.h | 2 +- sys/contrib/openzfs/include/sys/zfs_znode.h | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h index b292818750d9..15e3affba0e8 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h @@ -29,6 +29,7 @@ #ifndef _FREEBSD_ZFS_SYS_ZNODE_IMPL_H #define _FREEBSD_ZFS_SYS_ZNODE_IMPL_H +#ifdef _KERNEL #include #include #include @@ -42,6 +43,7 @@ #include #include #include +#endif #ifdef __cplusplus extern "C" { @@ -54,7 +56,7 @@ extern "C" { */ #define ZNODE_OS_FIELDS \ struct zfsvfs *z_zfsvfs; \ - vnode_t *z_vnode; \ + struct vnode *z_vnode; \ char *z_cached_symlink; \ uint64_t z_uid; \ uint64_t z_gid; \ @@ -62,6 +64,8 @@ extern "C" { uint64_t z_atime[2]; \ uint64_t z_links; +#ifdef _KERNEL + #define ZFS_LINK_MAX UINT64_MAX /* @@ -183,6 +187,9 @@ extern int zfs_znode_parent_and_name(struct znode *zp, struct znode **dzpp, char *buf, uint64_t buflen); extern int zfs_rlimit_fsize(off_t fsize); + +#endif /* _KERNEL */ + #ifdef __cplusplus } #endif diff --git a/sys/contrib/openzfs/include/sys/zfs_vfsops.h b/sys/contrib/openzfs/include/sys/zfs_vfsops.h index 18cc31e7183f..8b8f73cf3540 100644 --- a/sys/contrib/openzfs/include/sys/zfs_vfsops.h +++ b/sys/contrib/openzfs/include/sys/zfs_vfsops.h @@ -27,7 +27,7 @@ #ifndef _SYS_ZFS_VFSOPS_H #define _SYS_ZFS_VFSOPS_H -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_WANT_ZNODE) #include #endif diff --git a/sys/contrib/openzfs/include/sys/zfs_znode.h b/sys/contrib/openzfs/include/sys/zfs_znode.h index b3a267e16f3e..2fedaff78534 100644 --- a/sys/contrib/openzfs/include/sys/zfs_znode.h +++ b/sys/contrib/openzfs/include/sys/zfs_znode.h @@ -163,8 +163,9 @@ extern int zfs_obj_to_pobj(objset_t *osp, sa_handle_t *hdl, sa_attr_type_t *sa_table, uint64_t *pobjp, int *is_xattrdir); extern int zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value); -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_WANT_ZNODE) #include +#include /* * Directory entry locks control access to directory entries. @@ -219,7 +220,9 @@ typedef struct znode { */ ZNODE_OS_FIELDS; } znode_t; +#endif +#ifdef _KERNEL /* Verifies the znode is valid. */ static inline int zfs_verify_zp(znode_t *zp) From nobody Mon Jun 16 22:00:42 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 4bLkTQ74Xhz5yStX; Mon, 16 Jun 2025 22:00:42 +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 4bLkTQ6V9zz3ZkL; Mon, 16 Jun 2025 22:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750111242; 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=+G6I6uQCBGn/lrLySwj+fwPPod5CUgrVy18QxNFlglY=; b=Tw6DyDAtTCE0yqm6n/IpfL4Kv11LQ21XCk2X4oXg4co81gU4voXkdpeSJNSpdxBXQ7upES l9Dp7C6RcOT2I6OCAFhx2TmzhNVnpFM2CFuhNZ68IttgL7ruezukRjL6Xsq9u5GrBG2QW9 WvBYI3DUe8kv/8lRlSAOF/kFxxhw5u8f7WFqI+OkCXA0SAUDzVEytozr86/abhoXLbunD0 LY4DLIRSgphEaVyzH2TeGxalPsEaToXCV58f0Ox5tkU0hRNK3+XP0qgTe2X1YsweUS7DbG xpV2WAg0d4r+mZpPLm/9mW8uVfbjeI49vj59g2uhuBWEW3g9CEdknUAqO5ukYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750111242; 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=+G6I6uQCBGn/lrLySwj+fwPPod5CUgrVy18QxNFlglY=; b=xi6DLxGbJ36vq0xjz044YsJzMi0YMBk5vggctOSxvMieUYH1f9gAYVo02kjccitJy+AbyX wP1kGttWeW83YKM98gt35/il0qa1a2QHrIv8sydOiNN4Sr1oMEM+txRvEkOCFCZHYX2XO6 EaoDGZAojCrlB6tz7SxROeh6fMIOLdphjn8iraPyeRX06Hxp5FLUHqpWHkqRRJSbhwa/hQ 5nrGDbsVmSL2VDzgNfMv/xFC31CLfvM5N/aAFwjy2uJC2Svp5hYs1zpS7BfrC8/T8yZX7R 0LfK3BAkYPFPF+kIjUu/WSdPzmHhZ1IcDMfw0gQzC0n6F3+VEenppb7KNzVKNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750111242; a=rsa-sha256; cv=none; b=Rt0vmxEyPNFdtD7v1nFTJhwK1/xxgkGM+TVD+L08JrwHbHvX6KVFKxCRfi20FrBhlowmOz XdcWRSeNRxQieOEfM7s97nwRd+P6mqqdQMBTUqUsdZpM7E3beSEcRm4nN6vZ25R9BrOvvH kUXPVebMELTfp0nT+cXKen08R8ON1cmJpgyoqY4p9aDKjtk4bh47jsec1A/ezT3Z8duu8y tHyLmlOPxW1m1ycRrqqAoQEjXkEz0p4wxrQx1TC/Br+KgCc7gBCqN7r2QABvsb2mXHE3V7 T5wvMp1pZ4g+z4MHp5yfExWAdzZXJzfZMN730GhxtbmjrE9q7Suz+OQJT/q1mQ== 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 4bLkTQ640Wz1W5; Mon, 16 Jun 2025 22:00:42 +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 55GM0gEX021966; Mon, 16 Jun 2025 22:00:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GM0gh1021963; Mon, 16 Jun 2025 22:00:42 GMT (envelope-from git) Date: Mon, 16 Jun 2025 22:00:42 GMT Message-Id: <202506162200.55GM0gh1021963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d8496725c155 - main - Revert "tcp: cleanup timer initialisations" 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8496725c155e5454a872c8ff61fc7f14d57dc37 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d8496725c155e5454a872c8ff61fc7f14d57dc37 commit d8496725c155e5454a872c8ff61fc7f14d57dc37 Author: Michael Tuexen AuthorDate: 2025-06-16 14:17:59 +0000 Commit: Michael Tuexen CommitDate: 2025-06-16 14:17:59 +0000 Revert "tcp: cleanup timer initialisations" This reverts commit c13f4b1574da77f89ab57cfcc87fe8ad80f25263. Using MSEC_2_TICKS() breaks compiling contrib/bsnmp/snmp_mibII/mibII_tcp.c since it includes tcp_timer.h in userland and MSEC_2_TICKS() is only defined for kernel land. --- sys/netinet/tcp_subr.c | 4 ++++ sys/netinet/tcp_timer.h | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index d82a54031a95..f766bf25ad66 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1473,7 +1473,11 @@ tcp_init(void *arg __unused) tcp_keepintvl = TCPTV_KEEPINTVL; tcp_maxpersistidle = TCPTV_KEEP_IDLE; tcp_rexmit_initial = TCPTV_RTOBASE; + if (tcp_rexmit_initial < 1) + tcp_rexmit_initial = 1; tcp_rexmit_min = TCPTV_MIN; + if (tcp_rexmit_min < 1) + tcp_rexmit_min = 1; tcp_persmin = TCPTV_PERSMIN; tcp_persmax = TCPTV_PERSMAX; tcp_rexmit_slop = TCPTV_CPU_VAR; diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 8e1c609fd575..a3ca268417ba 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -71,21 +71,21 @@ /* * Time constants. */ -#define TCPTV_MSL MSEC_2_TICKS(30000) /* max seg lifetime (hah!) */ +#define TCPTV_MSL ( 30*hz) /* max seg lifetime (hah!) */ #define TCPTV_SRTTBASE 0 /* base roundtrip time; if 0, no idea yet */ -#define TCPTV_RTOBASE MSEC_2_TICKS(1000) /* assumed RTO if no info */ +#define TCPTV_RTOBASE ( 1*hz) /* assumed RTO if no info */ -#define TCPTV_PERSMIN MSEC_2_TICKS(5000) /* minimum persist interval */ -#define TCPTV_PERSMAX MSEC_2_TICKS(60000) /* maximum persist interval */ +#define TCPTV_PERSMIN ( 5*hz) /* minimum persist interval */ +#define TCPTV_PERSMAX ( 60*hz) /* maximum persist interval */ -#define TCPTV_KEEP_INIT MSEC_2_TICKS(75000) /* initial connect keepalive */ -#define TCPTV_KEEP_IDLE MSEC_2_TICKS(120*60*1000) /* dflt time before probing */ -#define TCPTV_KEEPINTVL MSEC_2_TICKS(75000) /* default probe interval */ +#define TCPTV_KEEP_INIT ( 75*hz) /* initial connect keepalive */ +#define TCPTV_KEEP_IDLE (120*60*hz) /* dflt time before probing */ +#define TCPTV_KEEPINTVL ( 75*hz) /* default probe interval */ #define TCPTV_KEEPCNT 8 /* max probes before drop */ #define TCPTV_MAXUNACKTIME 0 /* max time without making progress */ -#define TCPTV_FINWAIT2_TIMEOUT MSEC_2_TICKS(60000) /* FIN_WAIT_2 timeout if no receiver */ +#define TCPTV_FINWAIT2_TIMEOUT (60*hz) /* FIN_WAIT_2 timeout if no receiver */ /* * Minimum retransmit timer is 3 ticks, for algorithmic stability. @@ -107,15 +107,15 @@ * The prior minimum of 1*hz (1 second) badly breaks throughput on any * networks faster then a modem that has minor (e.g. 1%) packet loss. */ -#define TCPTV_MIN MSEC_2_TICKS(30) /* minimum allowable value */ -#define TCPTV_CPU_VAR MSEC_2_TICKS(200) /* cpu variance allowed (200ms) */ -#define TCPTV_REXMTMAX MSEC_2_TICKS(64000) /* max allowable REXMT value */ +#define TCPTV_MIN ( hz/33 ) /* minimum allowable value */ +#define TCPTV_CPU_VAR ( hz/5 ) /* cpu variance allowed (200ms) */ +#define TCPTV_REXMTMAX ( 64*hz) /* max allowable REXMT value */ #define TCPTV_TWTRUNC 8 /* RTO factor to truncate TW */ #define TCP_MAXRXTSHIFT 12 /* maximum retransmits */ -#define TCPTV_DELACK MSEC_2_TICKS(40) /* 40ms timeout */ +#define TCPTV_DELACK ( hz/25 ) /* 40ms timeout */ /* * If we exceed this number of retransmits for a single segment, we'll consider From nobody Mon Jun 16 22:47:22 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 4bLlWH2NRwz5yWX7; Mon, 16 Jun 2025 22:47:23 +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 4bLlWH0kv1z3H23; Mon, 16 Jun 2025 22:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750114043; 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=vqKpVdv66dWylm35CjLm6LX1zHzemcNZW2Z59aa6dbw=; b=sHShO9CPPG59z65rq3X6Uwf/cRILJ4+3gi52kaxovLVwjpg0JcZHJIkkFoAvN7HVGQYC7X agACJScEK8vMmNVw4yADf4DbebvA/4qm3ZZqS6UaSvl4zCUSW2EaR77i3sW9G822Ue3IuN zIvVNjpY2t/GgOJc9l/1JWRjdD0vEhUem3bgPhzCgsQDmYqLrVRW+gG4LP7jVtvPfmcx6m zXXKw/lIFef6qX2s5BHNtHNRuePZQSDjB1PaLv5th+yYja1WfdaSWApg1hciTMaQ0dGenZ KQ70EHHm6n8FyLaG1L1vgJbfEWiUEccJdCGB74caFZfXbn+mG0Z9WGCU6m1pxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750114043; 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=vqKpVdv66dWylm35CjLm6LX1zHzemcNZW2Z59aa6dbw=; b=OALjwOIuKv4RG7gN/tcCJopHUlH1vSVzvuWYBuMX4vAUuy/IMO7PuDuw7hHvmoIuFJHorH IyvxqEmA8dJ5gWXHn7AcVwDxqpgd1Yj2l6Qk79UE/906h2xXmUFbpSygMVNZw0tdWkFptI PgH7J8a3no25pvnbnYb/m8eJKLpM5/DYdBgbR35z7Ci/EmvnrJ4gT1F4Pt383KpvzgeZZS TlVE9fP0hsa4Icriw8+U1CrEHKZ5EhVuSFxw1qJboBv0Q5b2kt2lk5sie7NJVOk7kJD9e9 Ucr5N+O0PWfwjGlLCPNsk1mX4q+x+TRRNVS+/ugp8lQjBUQxg3BM+CnAGhDeOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750114043; a=rsa-sha256; cv=none; b=muiyciUXPK/yiaX+LhJwu1C7tS4pFTmEARzCbSS+AzmBqoqn36091yVescZu7wzXgFX2i+ wFrKFDmdYa51HIqgpaEiEBd/z8ZktMf+QAlp/jAOpaI0DENENb5x55RifoikzqidAm+H5W 2kyGuWJxUJ1eTz6zaJQ7Pu/iJ3EOekmvs3xyiRxJgilzLrffd60GVtsm3a52IPpqZaD/HH Fu55Ve+ZcbfWc+g/h2jPLJLMUEWZOBWr36zDFf0s4TvImBV9CatJf/p5401EMK8BsIk+MN YdD06Zq4vE4cZCesLdAvTbBNdCViZpKs55iqgpldimgHTl8X3l5I0tORAx+Lrw== 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 4bLlWH0Hnbz2Ps; Mon, 16 Jun 2025 22:47:23 +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 55GMlMTs004538; Mon, 16 Jun 2025 22:47:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GMlM4x004535; Mon, 16 Jun 2025 22:47:22 GMT (envelope-from git) Date: Mon, 16 Jun 2025 22:47:22 GMT Message-Id: <202506162247.55GMlM4x004535@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: 9134ed157388 - main - bsdinstall: Default to pkgbase if media contains base packages 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: 9134ed157388f3e34374322a5de06449a031f1ec Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9134ed157388f3e34374322a5de06449a031f1ec commit 9134ed157388f3e34374322a5de06449a031f1ec Author: Ed Maste AuthorDate: 2025-05-22 15:24:59 +0000 Commit: Ed Maste CommitDate: 2025-06-16 22:44:57 +0000 bsdinstall: Default to pkgbase if media contains base packages As of commit 62d18f8c4c10 ("release: Add -DPKGBASE option to include pkgbase packages") we can include base system packages on the install media instead of dist tarballs. Set the default for the traditional/pkgbase question to match the artifact type included in the install image. Reviewed by: jrm Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50467 --- usr.sbin/bsdinstall/scripts/auto | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index d5ac14864d6b..ef92dc13a5b3 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -186,15 +186,24 @@ trap true SIGINT # This section is optional trap error SIGINT # Catch cntrl-C here if [ -z "$BSDINSTALL_SKIP_HOSTNAME" ]; then bsdinstall hostname || error "Set hostname failed"; fi +if [ -f /usr/freebsd-packages/repos/FreeBSD-base-offline.conf ]; then + HAVE_BASE_PACKAGES=yes + PKGBASE_DEFAULT_BUTTON=--default-no +else + unset HAVE_BASE_PACKAGES + unset PKGBASE_DEFAULT_BUTTON +fi + bsddialog --backtitle "$OSNAME Installer" --title "Select Installation Type" \ --yes-label "Traditional" --no-label "Packages (Experimental)" --yesno \ + $PKGBASE_DEFAULT_BUTTON \ "Would you like to install the base system using traditional distribution sets or packages (experimental)?" 0 0 if [ $? -eq 1 ]; then PKGBASE=yes fi if [ "$PKGBASE" == yes ]; then - if [ -f /usr/freebsd-packages/repos/FreeBSD-base-offline.conf ]; then + if [ "$HAVE_BASE_PACKAGES" == yes ]; then bsddialog --backtitle "$OSNAME Installer" --title "Network or Offline Installation" \ --yes-label "Network" --no-label "Offline (Limited Packages)" --yesno \ "Would you like to fetch packages from the internet or use the limited set of packages included in this installation media?" 0 0 From nobody Mon Jun 16 23:45:49 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 4bLmpj3rj2z5VccM; Mon, 16 Jun 2025 23:45: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 4bLmpj2Tgzz41D6; Mon, 16 Jun 2025 23:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750117549; 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=hQJPfLg3XWCGCS/rJyTkLnInQ5ysDHvAQZmqswYeTO8=; b=fapHD02+Fnfdlc416urQ3m1wXGuITy4he0wBJ+8E5b9g8nGX4YnSjQq6uvesnsQPs8WpVa Sevj6LzK1qioNTiuwKJT65IxLoigiorPvF/nvKoZHdQtEt6Dqmzhwiq7ozrcRy3327Nz+j 9Vp+GJVWkRHPLZw176rA0blog5TMLCRVBgSUmPp+wnkOvqGaNzrWPDQSkj9NINi7cvrTum YhyiwwHANybllGCfsZn6s251UTwoRHrl+FW3DIkDdSGGt1+n8WbFw7mdkZ/j/r320cgT+d 1pdKZrhU5TRjG4IjCGI9N7B0Y8lpf+TFqwFsKzJKUxmFJ+XxZA2c9k9Fn5HneA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750117549; 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=hQJPfLg3XWCGCS/rJyTkLnInQ5ysDHvAQZmqswYeTO8=; b=rT/pC4PFKKNK//3iVj4Dmdn4tM/6+QDUQKgavDRIg1nzuA/e9eenHJwNNXD/kufiDHVQVt lrYkipCnfiyxSDRXtzyZ7lMAyXxfNo4Lp49ePJyUd0rKjxlr7kNq0X3tppXa84bVKdXVbM CnXxwYeA8QBKhoh1mxXwT2UT/UcHaYwnFcCyZ8fqW0EbHu3Lhj+K+9m/gnKYkJmCBKtfXG RLxvDkuQkWM4OS2LaT3g8Uet86u1JYv5vWw+wnfJJrhkfAovDyezNiEG7OgzETFzMJRKD5 PDUG7uvYDBkUgjzTALQvG8NIOY/gWspc9V+nKWHqVWQWNghEJeNFw7E3alZ0uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750117549; a=rsa-sha256; cv=none; b=I3x/C+4WE6wGMSOSKpC93c7nc5usHl99VnE+9j0KefMDxKQadR0kezlHkCQ0F0EljHMn0J WS1tDKjlost4/YOKr1KaS5BmtMkOaFCXAQTfT0CeF/QeDvPUFa35E8iv4TAeiIhV8mOyAw E6oZGjkvP1aQZeD6OmxTGoPJ1TDJG6/wrP5YxSOflBSmrgFOMRmz1227aAIKGKQUqkOdKf ZXOZx9+OEui36ycLEhIOgJNIJ7IsMdbB5wKrEh5l+aFpk+HiY2QgGl3zPUnEF963LMOdjI n0hqAFxcc6qk3arG1UrOmrsuooUE4x/fhyxTa3mgk5BACAptGlwElOEIQolCuw== 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 4bLmpj1lcgz43j; Mon, 16 Jun 2025 23:45: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 55GNjnCk016954; Mon, 16 Jun 2025 23:45:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GNjnOd016951; Mon, 16 Jun 2025 23:45:49 GMT (envelope-from git) Date: Mon, 16 Jun 2025 23:45:49 GMT Message-Id: <202506162345.55GNjnOd016951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 29b02abb906b - main - pam_ksu: Move temp_realm into the correct context 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29b02abb906bfdc8523ce3989493a2c87e89c4ad Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=29b02abb906bfdc8523ce3989493a2c87e89c4ad commit 29b02abb906bfdc8523ce3989493a2c87e89c4ad Author: Cy Schubert AuthorDate: 2025-06-16 23:44:10 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 23:45:28 +0000 pam_ksu: Move temp_realm into the correct context Fixes: 98f18cd98824 --- lib/libpam/modules/pam_ksu/pam_ksu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.c b/lib/libpam/modules/pam_ksu/pam_ksu.c index e50c3e387311..002613188d8c 100644 --- a/lib/libpam/modules/pam_ksu/pam_ksu.c +++ b/lib/libpam/modules/pam_ksu/pam_ksu.c @@ -78,10 +78,11 @@ static krb5_error_code krb5_make_principal(krb5_context context, krb5_principal principal, krb5_const_realm realm, ...) { + krb5_realm temp_realm = NULL; krb5_error_code rc; va_list ap; + if (realm == NULL) { - krb5_realm temp_realm = NULL; if ((rc = krb5_get_default_realm(context, &temp_realm))) return (rc); realm=temp_realm; From nobody Tue Jun 17 03:12:36 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 4bLsPK59Xpz5phMw; Tue, 17 Jun 2025 03:12:37 +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 4bLsPJ6V6vz3Tvs; Tue, 17 Jun 2025 03:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750129956; 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=ELfXpC/odnvqlaecjGpALp97S8ah5lzWFfgfju51eCQ=; b=L8rB4iSPJijODx0swEA5s1ZYuF1uBmScpOUNtY60rg1EF+qCXj16w2HJw1qQa9FIRzND/U c7unugUcICj0ZeSweu1tfGJCk+IuR01tyo5CcpTNZPVBGIMofYybDXOiZk3WnWlI2cthO6 S89Zm0uifXE3bnJijpGV0Ayqs8LurcgGtf1sv4V2fqlkSeG31xn7b1MBk1o2HJGDPpreqO HlRJOygcKZGKo+6mZ5oEQNesKCq+hOlY2T0DuH5XKaAa9oBV2UEfIBH8qb+iWE9cnu2yTg XVvHjgHsV4o2DsgdtvViSoixApA52pWDUvmiHvW2w48MVZNOFcF9xtQ3UwvwaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750129956; 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=ELfXpC/odnvqlaecjGpALp97S8ah5lzWFfgfju51eCQ=; b=roo3KwK7TiB+m4xwiCb4thVNJfvbD3BuGH1uBuzD001JHERZUj10pAqUqO6ufa+dK3W9Q9 sszqeZ1zvI8v6r1+sYsIsEISPzQiam8S8OycT1qb1Kg4ZhfCsbdy31BLzkcupoIIajUyV6 eoH70hsQM4rI3nq8JbIv2EOUGUD0BDkdbOq8o5pkWAZU44ZJ78TS+06k0M+aiduqcOb2bd l3pI3TrWlQ+QxaPwgW5uSlGpVJGKIlqjVj8EAB53G+RubIPoxyoLlHtEk5Y3WZrjj2nrMU vwbShTBC7Yv1mjlvx5jvrgJy0aqeWXYdFlbThit6FDVL4/PI/ae0KTeVIaDPJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750129956; a=rsa-sha256; cv=none; b=BVsxy/0llEuNAld3xqltMxQ4NkwD8OMMcY3jA8JK/yVvzWPDa+zQgjBBGRbmIGVkiFW8E4 yS7utCdEg0misQ7OBQI/W9ZG/AS0FEuhhFpYEoMTii6f37N2/VTC8JzTbtEE6x9GU0y1N5 8ZyNaSP0JT5vSrYBF6LDIo4uf8kadiVsBYosd8kouFpw5v/GhE8Doctn62O7cVi6gmhPBC EeudExak2szJkpqUZsc+6y3QHzngFHMsdJIPPNKRjJx/ZktF3hSYdnEC3uiTQqZpyZgk9x r06gL0ti4YUzE+8KujXC21IwyzT8ifQavBpd5d2TKKCCcPqFBtdHTrZ83irJEg== 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 4bLsPJ62FczB52; Tue, 17 Jun 2025 03:12:36 +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 55H3Cavi011853; Tue, 17 Jun 2025 03:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55H3CaaI011850; Tue, 17 Jun 2025 03:12:36 GMT (envelope-from git) Date: Tue, 17 Jun 2025 03:12:36 GMT Message-Id: <202506170312.55H3CaaI011850@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: 5c66d7a2b8a0 - main - =?utf-8?Q?uk.kbd: Fix =E2=82=AC mapping?= 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: 5c66d7a2b8a000b6307c0a12e78eb1b50376c9f8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5c66d7a2b8a000b6307c0a12e78eb1b50376c9f8 commit 5c66d7a2b8a000b6307c0a12e78eb1b50376c9f8 Author: Ed Maste AuthorDate: 2025-06-05 15:18:45 +0000 Commit: Ed Maste CommitDate: 2025-06-17 03:12:02 +0000 uk.kbd: Fix € mapping We previously emitted the generic currency sign `¤` for Ctrl+4. Generally speaking the modifer should be AltGr not Ctrl, and this should be the Euro symbol `€`. Fixes: eb8f9028fb38 ("Add the Euro symbol mapping to the UK keyboard keymap.") Fixes: a232c1d130d2 ("Copy country-code .iso syscons keymaps for vt(4)") Fixes: fdd869bd8a89 ("Another rpund of fixes, after checking keymaps for plausibility and with") Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50702 --- share/vt/keymaps/uk.kbd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/vt/keymaps/uk.kbd b/share/vt/keymaps/uk.kbd index 4a805fae12b9..261af190dcbe 100644 --- a/share/vt/keymaps/uk.kbd +++ b/share/vt/keymaps/uk.kbd @@ -7,7 +7,7 @@ 002 '1' '!' nop nop '`' '`' nop nop O 003 '2' '"' nul nul '@' '@' nul nul O 004 '3' 0xa3 nop nop '#' '#' nop nop O - 005 '4' '$' 0xa4 0xa4 '4' '$' nop nop O + 005 '4' '$' nop nop 0x20ac '$' nop nop O 006 '5' '%' nop nop '5' '%' nop nop O 007 '6' '^' rs rs '^' '^' rs rs O 008 '7' '&' nop nop '[' '[' esc esc O From nobody Tue Jun 17 03:35:22 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 4bLsvZ6mR7z5pjTC; Tue, 17 Jun 2025 03:35:22 +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 4bLsvZ594Cz3knf; Tue, 17 Jun 2025 03:35:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750131322; 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=359OqGtSxpnbcWqt8wu9FBCfaSec7G8fAmtdv9UYq8Y=; b=P0V6no7GnCj8AU4x3CxVPvlnglML7z8dWM3vXeWB1b9voOB1JqfjI73cvxruP2e0OrLG+i /VVtT10iGqu53P5MU07cDcQac0LE3oh3lMHd5oA19CbHv1xCuAn7ujds62rI5S+Eny6ecG 9p835lSffsGOFWQeNa7YVGo1rdBo+Cc1FKpJa+o2HNJaM/0vQd//lrYX/wEyA01AAEMGxi aeX5WAIMkmE2hkcXlzJj7WoYXjRoX45pI2jHAKy0CgUlqf8A/fhdX7CHR4U2nHz+v1oN25 ddetGGJ5t3FEK+ew++XdyK4NZMj2XxQ6wFHukzYT2/zxceWG/ilmaLY/1QF2/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750131322; 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=359OqGtSxpnbcWqt8wu9FBCfaSec7G8fAmtdv9UYq8Y=; b=M8oPhTyDl5pgcqw+juV4GgajYq4T67lJt9ROySbywlQr2nmIi5gzmIxs/h+v8QcfrMfjU1 gQQEXBWb4fsuZ1DEUIED0j3YzbM5wVM91DckjaJmV0V9F0/VpqzjQbLovdXjR5diGS2s4U Eyi0OKvJ6xm6ZA/PxiYcC3d+N8+ZgYnSurrBPfKnAHOnmayl76JDyK03+Cg9QXpoNHM9M5 Kf8BNVIqRdn8HrOARI5N4zCcW/UdyFqhFsfWgdbMKbrpCVxqavr+r2n1FHIMT2JGUSvqUj e3mKeGIeLR369PhwO/pEXX55Tk5jOnMi9vDq+0MUXIUBH8q77sVOBVcCnrfVCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750131322; a=rsa-sha256; cv=none; b=Invof+0o2geju5iS/Ki+NmUWbrwEg7u1uP1xHkoUO6e8XOtPdccqJjnDfgMbhw1vXQrBPP tyVYBx7E5AWXz/iB9gi33wk0uRDBIxB/RlQBFtpp/zkIkYWfeK7eYJKH0Opgg+Z87+zQ7z rCM26d0kcHQwSTO7rSBn7THOJNa0Q7pFXRyDlgG6xNxyE6R7/nvaJXC0dK07X35Vpf15P1 SwZw3FE2IqBvl0Q5EwxNfKqOZmq/8LxDiuCW9L/U1BIQR5ysV1I1N88AjyRusGm/OM9al6 9jrhnIzyPlWdyx67O5Xw/ZyxZJ2OoszlkIOjEf2gwmeHw8d2+T2sGEg71Uzo6A== 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 4bLsvZ4Y3LzB8B; Tue, 17 Jun 2025 03:35:22 +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 55H3ZMFP049785; Tue, 17 Jun 2025 03:35:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55H3ZMAH049779; Tue, 17 Jun 2025 03:35:22 GMT (envelope-from git) Date: Tue, 17 Jun 2025 03:35:22 GMT Message-Id: <202506170335.55H3ZMAH049779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 990a088612c3 - main - OptionalObsoleteFiles: Keep common files between MIT and Heimdal 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 990a088612c3b7f42ed38db187ec0efb66560a9c Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=990a088612c3b7f42ed38db187ec0efb66560a9c commit 990a088612c3b7f42ed38db187ec0efb66560a9c Author: Cy Schubert AuthorDate: 2025-06-17 03:26:30 +0000 Commit: Cy Schubert CommitDate: 2025-06-17 03:30:34 +0000 OptionalObsoleteFiles: Keep common files between MIT and Heimdal Reported by: "Herbert J. Skuhra" Original by: "Herbert J. Skuhra" Fixes: 7e35117eb07f --- tools/build/mk/OptionalObsoleteFiles.inc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d692b5307198..8f1c709c3bd2 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4836,7 +4836,6 @@ OLD_FILES+=usr/include/kadm5/kadm5-protos.h OLD_FILES+=usr/include/kadm5/kadm5-pwcheck.h OLD_FILES+=usr/include/kadm5/kadm5_err.h OLD_FILES+=usr/include/kadm5/private.h -OLD_DIRS+=usr/include/kadm5 OLD_FILES+=usr/include/kafs.h OLD_FILES+=usr/include/kdc-protos.h OLD_FILES+=usr/include/kdc.h @@ -4846,7 +4845,6 @@ OLD_FILES+=usr/include/krb5-types.h OLD_FILES+=usr/include/krb5/ccache_plugin.h OLD_FILES+=usr/include/krb5/send_to_kdc_plugin.h OLD_FILES+=usr/include/krb5/windc_plugin.h -OLD_DIRS+=usr/include/krb5 OLD_FILES+=usr/include/krb5_asn1.h OLD_FILES+=usr/include/krb5_ccapi.h OLD_FILES+=usr/include/krb5_err.h @@ -4872,10 +4870,8 @@ OLD_FILES+=usr/lib/libasn1.a OLD_FILES+=usr/lib/libasn1.so OLD_LIBS+=usr/lib/libasn1.so.11 OLD_FILES+=usr/lib/libasn1_p.a -OLD_FILES+=usr/lib/libcom_err.a OLD_LIBS+=usr/lib/libcom_err.so.5 OLD_FILES+=usr/lib/libcom_err_p.a -OLD_FILES+=usr/lib/libgssapi_krb5.a OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 OLD_FILES+=usr/lib/libgssapi_krb5_p.a OLD_FILES+=usr/lib/libgssapi_ntlm.a @@ -4922,7 +4918,6 @@ OLD_FILES+=usr/lib/libkdc.a OLD_FILES+=usr/lib/libkdc.so OLD_LIBS+=usr/lib/libkdc.so.11 OLD_FILES+=usr/lib/libkdc_p.a -OLD_FILES+=usr/lib/libkrb5.a OLD_LIBS+=usr/lib/libkrb5.so.11 OLD_FILES+=usr/lib/libkrb5_p.a OLD_FILES+=usr/lib/libroken.a @@ -5646,7 +5641,6 @@ OLD_FILES+=usr/share/man/man3/ntlm_core.3.gz OLD_FILES+=usr/share/man/man3/ntlm_type1.3.gz OLD_FILES+=usr/share/man/man3/ntlm_type2.3.gz OLD_FILES+=usr/share/man/man3/ntlm_type3.3.gz -OLD_FILES+=usr/share/man/man5/krb5.conf.5.gz OLD_FILES+=usr/share/man/man8/hprop.8.gz OLD_FILES+=usr/share/man/man8/hpropd.8.gz OLD_FILES+=usr/share/man/man8/iprop-log.8.gz From nobody Tue Jun 17 04:09:08 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 4bLtfY4cGxz5plTN; Tue, 17 Jun 2025 04:09:09 +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 4bLtfY1fyxz479r; Tue, 17 Jun 2025 04:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750133349; 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=Ks1qaZ7l9eKUCloF74k/hZ3lu5bCw9DiHHpTMjRE/OI=; b=A/kO6/3+sZ+k3TcbzMZpwkquHi5qjIs80ZteeaMcU5e5hf4rkhBC1cyxd4ZnLj4z2b9K/z I5vcZpmcnhYaRvIztc0HJaZq7z/cgv+GMErUN7WD9ILF0hgNNXDzi41GQBONYy/2JTOW/d edzbQOy4wYslYxOusO8JORol9E7+uO9ARjyksw1yWQqxb6tKHU7qENbU+DSAlAyS1s6eK9 5582JFmiVl67/VP/G9CQmnIZsK/+6J5pxxrc5xdn9z1LI3yhPd0jyhJTaMKDZpJG2hOhfa 2oz/PKQB+ZBNm04x0z127bWoXb6scC43kCd+ry7dN3zdp2Kk48UMXQCUgbFnow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750133349; 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=Ks1qaZ7l9eKUCloF74k/hZ3lu5bCw9DiHHpTMjRE/OI=; b=HvqmZWcZQWGJjaBsHmejK14NPZWfNrjWAyX7TxazDC9sXDeOFI0zCHlbivu7N0RyfpmtaL JwgDPEj8okfQRLPj6GKSq65MLcAIrBcqgOvxGvC3xm8nG7eDyddvrnjRWR5YAS0NOoI0rW DFnf+5M/t5HPPIZb9+ZS1DL41DGZQ2AnyVRYB4lY8HPP/8vZ3c3JkggJZK8SvTJ9FzDpVg McGM0VX0BhRqgIHf1l5YnT4AdpWf7djd1Caz5bf/VIPH9EZvnRAf414TbpsuWDF6KpMLQs xMqLEQve0w/kst6fdKe+Vxo/U6Ws0NyyScHMAEyLbK19JOWiTN/ELeho2KOTaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750133349; a=rsa-sha256; cv=none; b=YumoaaSaCLTDLBQGlKI1dMupNo2Abxkb9xxhAc2IR4o9Xcuz7GfehjVCxg9qkJvkEAKkJn lSmn12LY7mKdqOCRnmgd22qem8UsNENkKsUBEBADTm7JkL7DaTPdHEgD3NDcXUCrnO8lOx mVxPB6ZOYPvkM/K1c1PAQMc+yoV5MGWmjDPwCTzUIzesMTFTBbJ0KF8/HSmwtgpo2unALf 88L21txjNPZ96hmQOA5ahy/KINorReoRcRN1cQRSbNPL/R1lHnmoY8xWNnSBpLOuwpe/ve zgemZ9S1Tjk0DfghS5GNIGSy5uNjjzNPBzsCLVPk+cf3bxtbFFvB11uLP17sIg== 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 4bLtfY0fdkzBr2; Tue, 17 Jun 2025 04:09:09 +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 55H498Qj007408; Tue, 17 Jun 2025 04:09:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55H4980F007405; Tue, 17 Jun 2025 04:09:08 GMT (envelope-from git) Date: Tue, 17 Jun 2025 04:09:08 GMT Message-Id: <202506170409.55H4980F007405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 6039cd1b45eb - main - Don't include netinet/tcp_timer.h when not needed 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6039cd1b45eb847ef5bbe6c58341b8b92fff8a74 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6039cd1b45eb847ef5bbe6c58341b8b92fff8a74 commit 6039cd1b45eb847ef5bbe6c58341b8b92fff8a74 Author: Michael Tuexen AuthorDate: 2025-06-17 04:07:13 +0000 Commit: Michael Tuexen CommitDate: 2025-06-17 04:07:13 +0000 Don't include netinet/tcp_timer.h when not needed Reviewed by: glebius MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50889 --- sbin/ipf/ipsend/iptests.c | 1 - sbin/ipf/ipsend/sock.c | 1 - usr.bin/netstat/inet.c | 1 - usr.bin/systat/netstat.c | 1 - usr.bin/systat/tcp.c | 1 - 5 files changed, 5 deletions(-) diff --git a/sbin/ipf/ipsend/iptests.c b/sbin/ipf/ipsend/iptests.c index 6f95970a83aa..6a72a0adfffd 100644 --- a/sbin/ipf/ipsend/iptests.c +++ b/sbin/ipf/ipsend/iptests.c @@ -74,7 +74,6 @@ typedef int boolean_t; # include # endif #include "ipsend.h" -# include # include #if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000000) # define USE_NANOSLEEP diff --git a/sbin/ipf/ipsend/sock.c b/sbin/ipf/ipsend/sock.c index b42f56f848da..7ffacc950d22 100644 --- a/sbin/ipf/ipsend/sock.c +++ b/sbin/ipf/ipsend/sock.c @@ -58,7 +58,6 @@ typedef int boolean_t; #include #define _WANT_INPCB #include -#include #define _WANT_TCPCB #include #include diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 56a432b30a86..269afa42e079 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -58,7 +58,6 @@ #include #define TCPSTATES #include -#include #include #include #include diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 6d188bf1dd0d..d9a0266aaea4 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -60,7 +60,6 @@ #include #define TCPSTATES #include -#include #define _WANT_TCPCB #include #include diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c index 83163a3525a8..66ccf9b11209 100644 --- a/usr.bin/systat/tcp.c +++ b/usr.bin/systat/tcp.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include From nobody Tue Jun 17 06:06:41 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 4bLxG96jJZz5ptXb; Tue, 17 Jun 2025 06:06:41 +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 4bLxG96CB9z4CMF; Tue, 17 Jun 2025 06:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750140401; 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=InXNiSPnEE1Fkfhyt/2tuCoE4wQeZrF7taw3RIBbdu8=; b=pBK/+Pqj7IQRT4TtYOnOvtZ2hhBPO3qw5MUyFX0WEFU/NlE1x62sG02GaKO/5Ls4GY/Gqe km6nUeV+VCLj0zCwZmMFou5PO6rR3+61Vk/xIoEpVE/sWtzdKVRh5X9JyeAjqzoD54Zz3M +pnBY8m4e285ti8kd2ZBlEAgUeRWgdGCzaT375HdGgOYm02GBYO/f22Fz7WG1xU1L46AF2 eEv/slmrr9hPmU06/HMNNOoShbhrc8sPuh46kQ5FFYaoVMu7xiiEk1UTwwfZ/yadNZ6tLe zbr1PdRRfVbZk1jx3/Psm3SZyDAzGrCnMZu7p8LMjeI1mqhc7POGgTONid65fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750140401; 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=InXNiSPnEE1Fkfhyt/2tuCoE4wQeZrF7taw3RIBbdu8=; b=xoSUQyJB25MjC0jrgeRrYu9GWvmpzvYnO6MC5byXuJims9Rf8SsBGuFwaEhKdMpdhIk2eb odmZNyGCwujlJoRN5TBHSFGNgNfDzVEVlw00et6wuSk2yHlDFKnF4kclIasHyjbU/UIOO6 AA+SJqbCZrEBGdHkJpbpBnZBfEqIykkplOhsd2Oh9nMClvWuJkm/HL8CbCkxkdYUNB3Hlj 8v5/G14WHMNxS68a4SddxsFOXmysyVgYApqgmPXnkT11LJ8xT5mmkE1Q9fhADHJnEWpvem uCan7MKdvb84iCWbdedmrZOk5qOT388BcE5zUwqCbC/UQZQ2s/H1T9gpVdShjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750140401; a=rsa-sha256; cv=none; b=tgF3q14exWMsoIVr9v84AtflczLh/2eRIsa/XHcEuUp7yOnFyKM437JvRewbDqEmnw2M9p +54Jla+sveOUf+X0cXxKGFRA6hVtzJqVZoggdt2kb35gOlWgkMPpkIPT1hjTjGdPOiSO6e pJjCbR9aXwItkRrj9ZOcG4WtmJGQ5k20EeP+OAS8Y1JFRf9V60E1cdkkcnkXARG5pYyqyL 3GZlFNJVa4Gfub8HZq+5QSa0h3ZN2AcsZ8xlwzC/dc+RyU7VKW9VS0T8JT1O7TE6Ri2bEB RMSlqMDRQff6cmeAbDT4+BtiyTx5QDHZ6vVrWA4hQJWqAeNE2E2OL2OyYQDUeQ== 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 4bLxG95grkzXgF; Tue, 17 Jun 2025 06:06:41 +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 55H66f22032076; Tue, 17 Jun 2025 06:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55H66fZY032073; Tue, 17 Jun 2025 06:06:41 GMT (envelope-from git) Date: Tue, 17 Jun 2025 06:06:41 GMT Message-Id: <202506170606.55H66fZY032073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7e1930480bef - main - loader: Fix loader_brand = none 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e1930480bef285cca1c14c25b4fd62abdf5dabf Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7e1930480bef285cca1c14c25b4fd62abdf5dabf commit 7e1930480bef285cca1c14c25b4fd62abdf5dabf Author: Emmanuel Vadot AuthorDate: 2025-06-16 12:23:07 +0000 Commit: Emmanuel Vadot CommitDate: 2025-06-17 06:06:29 +0000 loader: Fix loader_brand = none Setting loader_brand to none in loader.conf now result in a lua error as we try to get a non-existant table Defines it Differential Revision: https://reviews.freebsd.org/D50875 Fixes: bef6d85b6de5 ("lualoader: allow graphical bits to be disabled with loader_gfx") Reviewed by: kevans, tsoome Sponsored by: Beckhoff Automation GmbH & Co. KG --- stand/lua/drawer.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 334d8724f6bc..9d5417737489 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -470,7 +470,7 @@ branddefs = { }, }, ["none"] = { - fb = { image = none }, + ascii = { image = none }, }, } From nobody Tue Jun 17 06:11:41 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 4bLxMy3dHFz5ptv9; Tue, 17 Jun 2025 06:11:42 +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 4bLxMx72lhz4Fw1; Tue, 17 Jun 2025 06:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750140702; 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=cP9mvVxru52ZreaB3MPiV1cccOtapQ90F7RUdYXR+VU=; b=LOKnQgMYMYb/atC721RYGGIPNh15kSMPuZVm7F7pWRqnB5NxjPNU0GbzoHS/23qziu0rVA WIVLQ5Cb7H0M/bSsRb1959jtEQ8bgJMTVnfZ4+CslY6SCMoBPyytdp1Bzy0v9R0ZQssLjx sYQeMP5Iqv1EM/v9JDBDYe9OOW05YWe0mXq4qaXNOhe8Si0fbhAewcHg9V9gsItH0964Ur XFAvp/NZWhpV1xrZDpuTClJlA/EZhKZnHklSb7Hf0lOZEzhbCfs0HzQJjfn+6V5Dx3Bnu9 RtPgXuFRWsZD1FzUqN9ffiWIOud9ZgKGDhR6J+3YS/aLpU/2bv/ksbo/K0Hgdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750140702; 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=cP9mvVxru52ZreaB3MPiV1cccOtapQ90F7RUdYXR+VU=; b=Zl1Jps8zrgeoUcbXFdh4wDZyZ/CJTdFhe+/dAU6jdo0haAb3ILjFZF4q5Z/PLEOHblhTgr 0RgfxV2J7LYKqg5xiJ1wIFhMwrfQvgtv5SbJcMs3HchGCzC4neS5nCnIMMK/c1lO/AqK/8 IZhRXRf+DLuIY65TxubFiuNRYhdX14ip/Ds3zve5JCO2yQcehu9EdcUAGvKn8Q5EZIzQpH 80oJLAcHxDBZHXTo3Ao8qESBQCnlpPKNv5sSipj7O1y+jXywv7ADhscuYO2i0XvWvA+j0N urNJuVIZitt/nNHVGHrt7Hm+GAfQ+9TF+U8cyTXb+YB93pAJYDt7Gb3ySEZGpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750140702; a=rsa-sha256; cv=none; b=chzcRW8EJr2BtvPllvGnagqvnbSnwq/94uX+wT1HhMMCB+XYyDrED8wo862JEXjn60AbFj su2Sw3ITRbWVe0ZoaSy5Nyn9N+AcoZJ+NPFkS1n1NX9x8oDkbDLTTMlxGLhIOjpgL+CVLm +vRynLG3EIGYmhkewAunT+ll/6Qjr84WcGPSEj2F19bx7bNDyw2cKTerpIvy9sW61KTA7c uwgYlbwldq+Gkuy7AD6j/oCTDyv84NAxXksHH3KDDzbO8ZDpIPHVCTADRgM2cVHNXKdIeS Bgzr6ycS2IfxBR6Wh4Et8I3OCNDP71/aAYBY/Ux9smouMORmlzadMQNJQ2XudQ== 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 4bLxMx6VFfzWsj; Tue, 17 Jun 2025 06:11:41 +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 55H6BfIa044655; Tue, 17 Jun 2025 06:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55H6Bfgt044652; Tue, 17 Jun 2025 06:11:41 GMT (envelope-from git) Date: Tue, 17 Jun 2025 06:11:41 GMT Message-Id: <202506170611.55H6Bfgt044652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: f9c9122d5ab9 - main - fusefs: First take on exterrorizing 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: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9c9122d5ab9b106ddc6897454350b31de838631 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=f9c9122d5ab9b106ddc6897454350b31de838631 commit f9c9122d5ab9b106ddc6897454350b31de838631 Author: Gleb Popov AuthorDate: 2025-06-13 10:38:35 +0000 Commit: Gleb Popov CommitDate: 2025-06-17 06:11:34 +0000 fusefs: First take on exterrorizing Reviewed by: kib, asomers Approved by: kib, asomers Differential Revision: https://reviews.freebsd.org/D50831 --- sys/fs/fuse/fuse_device.c | 34 +++++++++++++++++++++------------- sys/fs/fuse/fuse_vfsops.c | 33 +++++++++++++++++++++------------ sys/sys/exterr_cat.h | 1 + 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index 0a5da63c1f54..b0c886d4b120 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -82,6 +82,8 @@ #include #include #include +#define EXTERR_CATEGORY EXTERR_CAT_FUSE +#include #include "fuse.h" #include "fuse_internal.h" @@ -193,7 +195,7 @@ fuse_device_filter(struct cdev *dev, struct knote *kn) kn->kn_fop = &fuse_device_wfiltops; error = 0; } else if (error == 0) { - error = EINVAL; + error = EXTERROR(EINVAL, "Unsupported kevent filter"); kn->kn_data = error; } @@ -319,7 +321,7 @@ again: "we know early on that reader should be kicked so we " "don't wait for news"); fuse_lck_mtx_unlock(data->ms_mtx); - return (ENODEV); + return (EXTERROR(ENODEV, "This FUSE session is about to be closed")); } if (!(tick = fuse_ms_pop(data))) { /* check if we may block */ @@ -331,7 +333,10 @@ again: err = msleep(data, &data->ms_mtx, PCATCH, "fu_msg", 0); if (err != 0) { fuse_lck_mtx_unlock(data->ms_mtx); - return (fdata_get_dead(data) ? ENODEV : err); + if (fdata_get_dead(data)) + err = EXTERROR(ENODEV, + "This FUSE session is about to be closed"); + return (err); } tick = fuse_ms_pop(data); } @@ -361,8 +366,8 @@ again: FUSE_ASSERT_MS_DONE(tick); fuse_ticket_drop(tick); } - return (ENODEV); /* This should make the daemon get off - * of us */ + /* This should make the daemon get off of us */ + return (EXTERROR(ENODEV, "This FUSE session is about to be closed")); } SDT_PROBE2(fusefs, , device, trace, 1, "fuse device read message successfully"); @@ -385,7 +390,7 @@ again: fdata_set_dead(data); SDT_PROBE2(fusefs, , device, trace, 2, "daemon is stupid, kick it off..."); - err = ENODEV; + err = EXTERROR(ENODEV, "Partial read attempted"); } else { err = uiomove(buf, buflen, uio); } @@ -403,12 +408,14 @@ fuse_ohead_audit(struct fuse_out_header *ohead, struct uio *uio) SDT_PROBE2(fusefs, , device, trace, 1, "Format error: body size " "differs from size claimed by header"); - return (EINVAL); + return (EXTERROR(EINVAL, "Format error: body size " + "differs from size claimed by header")); } if (uio->uio_resid && ohead->unique != 0 && ohead->error) { SDT_PROBE2(fusefs, , device, trace, 1, "Format error: non zero error but message had a body"); - return (EINVAL); + return (EXTERROR(EINVAL, "Format error: non zero error, " + "but message had a body")); } return (0); @@ -444,7 +451,7 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) SDT_PROBE2(fusefs, , device, trace, 1, "fuse_device_write got less than a header!"); fdata_set_dead(data); - return (EINVAL); + return (EXTERROR(EINVAL, "fuse_device_write got less than a header!")); } if ((err = uiomove(&ohead, sizeof(struct fuse_out_header), uio)) != 0) return (err); @@ -452,7 +459,7 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) if (data->linux_errnos != 0 && ohead.error != 0) { err = -ohead.error; if (err < 0 || err >= nitems(linux_to_bsd_errtbl)) - return (EINVAL); + return (EXTERROR(EINVAL, "Unknown Linux errno", err)); /* '-', because it will get flipped again below */ ohead.error = -linux_to_bsd_errtbl[err]; @@ -520,7 +527,7 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) memcpy(&tick->tk_aw_ohead, &ohead, sizeof(ohead)); tick->tk_aw_handler(tick, uio); - err = EINVAL; + err = EXTERROR(EINVAL, "Unknown errno", ohead.error); } else { memcpy(&tick->tk_aw_ohead, &ohead, sizeof(ohead)); @@ -570,7 +577,8 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) /* Unimplemented. See comments in fuse_vnops */ default: /* Not implemented */ - err = ENOSYS; + err = EXTERROR(ENOSYS, "Unimplemented FUSE notification code", + ohead.error); } vfs_unbusy(mp); } else { @@ -589,7 +597,7 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) */ err = 0; } else { - err = EINVAL; + err = EXTERROR(ENOSYS, "FUSE ticket is missing"); } } diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index 48b84d3c75af..1b858a988289 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -81,6 +81,8 @@ #include #include #include +#define EXTERR_CATEGORY EXTERR_CAT_FUSE +#include #include "fuse.h" #include "fuse_node.h" @@ -272,7 +274,7 @@ fuse_vfsop_fhtovp(struct mount *mp, struct fid *fhp, int flags, int error; if (!(fuse_get_mpdata(mp)->dataflags & FSESS_EXPORT_SUPPORT)) - return EOPNOTSUPP; + return (EXTERROR(EOPNOTSUPP, "NFS-style lookups are not supported")); error = VFS_VGET(mp, ffhp->nid, LK_EXCLUSIVE, &nvp); if (error) { @@ -321,11 +323,11 @@ fuse_vfsop_mount(struct mount *mp) opts = mp->mnt_optnew; if (!opts) - return EINVAL; + return (EXTERROR(EINVAL, "Mount options were not supplied")); /* `fspath' contains the mount point (eg. /mnt/fuse/sshfs); REQUIRED */ if (!vfs_getopts(opts, "fspath", &err)) - return err; + return (EXTERROR(err, "Mount options are missing 'fspath'")); /* * With the help of underscored options the mount program @@ -358,11 +360,12 @@ fuse_vfsop_mount(struct mount *mp) /* `from' contains the device name (eg. /dev/fuse0); REQUIRED */ fspec = vfs_getopts(opts, "from", &err); if (!fspec) - return err; + return (EXTERROR(err, "Mount options are missing 'from'")); /* `fd' contains the filedescriptor for this session; REQUIRED */ if (vfs_scanopt(opts, "fd", "%d", &fd) != 1) - return EINVAL; + return (EXTERROR(EINVAL, "Mount options contain an invalid value " + "for 'fd'")); err = fuse_getdevice(fspec, td, &fdev); if (err != 0) @@ -398,11 +401,17 @@ fuse_vfsop_mount(struct mount *mp) /* Sanity + permission checks */ if (!data->daemoncred) panic("fuse daemon found, but identity unknown"); - if (mntopts & FSESS_DAEMON_CAN_SPY) + if (mntopts & FSESS_DAEMON_CAN_SPY) { err = priv_check(td, PRIV_VFS_FUSE_ALLOWOTHER); - if (err == 0 && td->td_ucred->cr_uid != data->daemoncred->cr_uid) + EXTERROR(err, "FUSE daemon requires privileges " + "due to 'allow_other' option"); + } + if (err == 0 && td->td_ucred->cr_uid != data->daemoncred->cr_uid) { /* are we allowed to do the first mount? */ err = priv_check(td, PRIV_VFS_FUSE_MOUNT_NONUSER); + EXTERROR(err, "Mounting as a user that is different from the FUSE " + "daemon's requires privileges"); + } if (err) { FUSE_UNLOCK(); goto out; @@ -549,7 +558,7 @@ fuse_vfsop_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) * nullfs mount of a fusefs file system. */ SDT_PROBE1(fusefs, , vfsops, invalidate_without_export, mp); - return (EOPNOTSUPP); + return (EXTERROR(EOPNOTSUPP, "NFS-style lookups are not supported")); } error = fuse_internal_get_cached_vnode(mp, ino, flags, vpp); @@ -580,10 +589,10 @@ fuse_vfsop_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) * Something is very wrong with the server if "foo/." has a * different inode number than "foo". */ - fuse_warn(data, FSESS_WARN_DOT_LOOKUP, - "Inconsistent LOOKUP response: \"FILE/.\" has a different " - "inode number than \"FILE\"."); - error = EIO; + static const char exterr[] = "Inconsistent LOOKUP response: " + "\"FILE/.\" has a different inode number than \"FILE\"."; + fuse_warn(data, FSESS_WARN_DOT_LOOKUP, exterr); + error = EXTERROR(EIO, exterr); goto out; } diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h index adb474e84c1b..d770c274d7b7 100644 --- a/sys/sys/exterr_cat.h +++ b/sys/sys/exterr_cat.h @@ -15,6 +15,7 @@ #define EXTERR_CAT_FILEDESC 2 #define EXTERR_KTRACE 3 /* To allow inclusion of this file into kern_ktrace.c */ +#define EXTERR_CAT_FUSE 4 #endif From nobody Tue Jun 17 06:54:43 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 4bLyKb4K7mz5pxSJ; Tue, 17 Jun 2025 06:54:43 +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 4bLyKb3d0Yz3Nlb; Tue, 17 Jun 2025 06:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750143283; 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=9EC90CVmJ26BRtbjxl58zsUG5HObX/cdGDTVVJjtkII=; b=t4DAMqTyEtpotZzTsJ0UUfSO+1C4YAS/UL32xP/5spLantZCf6uflxvIjT/WxZlX0BTfsm n7NIJMcmgFnqXiSGpWAYSufh8Mk/P91EOzf2sTQ1DtnmPT+uAFe0AKGl4Zucqq79KgSKHS 9yShk6k313mlX1EY4sbkHvcfVR9nRfw2BVAda8qPEMn2ZGnZwqfDb2SrF5Tza1shqO/U5S k9k7ohYycFLr0hEWZex1nQBg8Zui2m53L9N9I25CwKQBmq0f+eTU1K+83WU7gwrntFH0Zj DwzL4x1LuWtxI5DdMoUd/cuuzm4Ibk+WZIXYowXxEaqBlgNjJ5d/0XzPPL5BkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750143283; 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=9EC90CVmJ26BRtbjxl58zsUG5HObX/cdGDTVVJjtkII=; b=a8zQNDNrhNeLkBZm6cjBDtzCKddERKjyOA3hzqGlPKXXROP+J9RTUvlZ6rRoZ6CnZTCy4V rcQfCf+ZlxOg6uP7+nTYqvfhU61YbtZUhWAwbysFIESWpH7q1SOZNHOwrqEQVPH89jOYgh 0MTVWo4jb5K8K8jLUQ8AfKl+Tuvi0alzx8jsxpPjnX4pMTTMDgiNABi/jEU7sajQAPFfbf fHufQO5rmNcLy128UU6sK9OtAo7OKZp792rgV2VD+kUaB0ZL2UfAA2iiBYo0CsCBx778P4 iEz3oQ7+e1mM9Zsdt4jZnjMFCGsNT4BGKX8SdKN0NjQyySua14eIt8G5o98+NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750143283; a=rsa-sha256; cv=none; b=HJlusaZhy9xrhinxYKBmz5Gwr08RoUzD3F1rDb9gFNoZldt5TtRXTJ/vd6H69raQ9xRlNg 12kFNDH/ifag7/IjK2fWIKQBgwz8pWhPyiVxdER+U5/LLWx7fT2Lh8PyKtFmtC7FRjwAur 4soZZJ5tdv5ln2+pEVBUfIS/35E4I0eiJLynwKqrjjYMb4NchcYkRLmxizHOdu+iz8Tizf pjKjQhRDyqd+BvBktAwuo2edRaHjnl0mb5N+Bz7TX3LI01OxgFa8Xg0+Zlm7K5LNjRQeCM E2HbMO4AT53yjK23srpvxfJNn66NRf+b1Cxuse32Lr/LVgxh0AEN9ePCXPL2/g== 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 4bLyKb3Cd0zZSr; Tue, 17 Jun 2025 06:54:43 +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 55H6shVq024563; Tue, 17 Jun 2025 06:54:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55H6sh9W024560; Tue, 17 Jun 2025 06:54:43 GMT (envelope-from git) Date: Tue, 17 Jun 2025 06:54:43 GMT Message-Id: <202506170654.55H6sh9W024560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5ec727ea1a1e - main - nuageinit: write a documentation 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ec727ea1a1e65f3a784d70f7392d0a75d38d0a6 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5ec727ea1a1e65f3a784d70f7392d0a75d38d0a6 commit 5ec727ea1a1e65f3a784d70f7392d0a75d38d0a6 Author: Baptiste Daroussin AuthorDate: 2025-06-16 15:44:57 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-17 06:54:39 +0000 nuageinit: write a documentation Reviewed by: imp, ziaee (both a previous version) Differential Revision: https://reviews.freebsd.org/D50878 --- libexec/nuageinit/Makefile | 1 + libexec/nuageinit/nuageinit.7 | 288 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 289 insertions(+) diff --git a/libexec/nuageinit/Makefile b/libexec/nuageinit/Makefile index 64c5ec316f3d..a4d8e0de5777 100644 --- a/libexec/nuageinit/Makefile +++ b/libexec/nuageinit/Makefile @@ -2,6 +2,7 @@ PACKAGE= nuageinit SCRIPTS= nuageinit FILES= nuage.lua yaml.lua FILESDIR= ${SHAREDIR}/flua +MAN= nuageinit.7 .include diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 new file mode 100644 index 000000000000..7e44ce208a9b --- /dev/null +++ b/libexec/nuageinit/nuageinit.7 @@ -0,0 +1,288 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Baptiste Daroussin +.\" +.Dd June 16, 2025 +.Dt NUAGEINIT 7 +.Os +.Sh NAME +.Nm nuageinit +.Nd initialize a cloud-init environment +.Sh DESCRIPTION +The +.Nm +program is used to initialize instances in a cloud environment. +.Nm +runs at the first boot after the system installation. +It is composed of 3 +.Xr rc 8 +scripts: +.Bl -tag -width "nuageinit" +.It Cm nuageinit +This script will detect the configuration disk kind of cloud environement the +system runs on and gather accordingly the configuration data. +The following cloud environements are supported right now: +.Bl -tag -width "OpenStack" +.It ondisk +A cloud agnostic environment where the disk is provided to the system +with the configuration data on it. +The disk should be formatted in one of the following formats: +.Xr cd9660 4 , +or +.Xr msdosfs 4 +and be labelled (via filesystem label) either +.Ar config-2 +or +.Ar cidata . +.It OpenStack +The system is running in an +.Lk https://www.openstack.org/ OpenStack environment . +It is detected via the +.Ar smbios.system.product +.Xr smbios 4 +description available in +.Xr kenv 2 . +.El +.Pp +Depending on the cloud environement above +.Nm +will attempt to configure the instance. +See +.Sx CONFIGURATION . +This script executes early, +after all the local filesystem are mounted but before +the network is configured. +.It Cm nuageinit_post_net +This script is reponsible processing the configurations that are network +dependant: +.Bl -bullet +.It +dealing with packages +.It +dealing with users (which can depend on shell provided by packages) +.El +.It Cm nuageinit_user_data_script +This script is responsible for executing everything which would have +been passed via the configuration to be executed, via the configuration +or because the user_data provided is a script. +.El +.Pp +The default user for nuageinit is a user named: +.Va freebsd +with a password set to +.Va freebsd +and a shell set to +.Va /bin/sh . +.Sh CONFIGURATION +The configuration of +.Nm +is typically done via metadata provided by the cloud provider. +The metadata is presented to nuageinit in different form depending on +the provider: +provider: +.Bl -tag -width "config-2" +.It nocloud +If the data is provided via a disk labelled +.Va cidata , +then the metadata is provided in the form of a file named +.Pa meta-data +in YAML format. +.Nm +Will configure the hostname of the instance according the value of the +following variables +.Va local-hostname +or +.Va hostname . +.It config-2 +If the data is provided via a disk labelled +.Va config-2 , +or if fetched from OpenStack, +the metadata is expected in two json files: +.Pp +The +.Pa meta_data.json +file supportes the following keys: +.Bl -tag -width "public_keys" +.It Ic hostname +Set the hostname of the instance. +.It Ic public_keys +Append each entry of the array to +.Nm +default user which will be created. +.El +.Pp +The +.Pa network_data.json +file supports the following keys: +.Bl -tag -width "public_keys" +.It Ic links +Array of network interfaces to be configured. +.It Ic networks +Array of network configurations to be set. +.El +.El +.Pp +Along with the metadata, a user data file is provided, either named +.Pa user_data +or +.Pa user-data +If this file starts with a +.Qq #! , +it will be executed at the end of the boot via +.Cm nuageinit_user_data_script . +If this files starts with +.Qq #!cloud-config , +it will be parsed as a YAML configuration file. +All other cases will be ignored. +.Pp +The +.Qq #!cloud-config +configuration entries supported by +.Nm : +.Bl -tag -width "config-2" +.It Ic fqdn +Specify a fully qualified domain name for the instance. +.It Ic hostname +Specify the hostname of the instance if +.Qq Ic fqdn +is not set. +.It Ic groups +An array of strings or objects to be created: +.Bl -bullet +.It +If the entry is a string, +a group using this string as a name will be created. +.It +if the entry is a an object, the +.Qq Ar key +will be used as the name of the group, the +.Qq Ar value +will is expected to be a list of members (array), specified by name. +.El +.It Ic ssh_keys +An object of multiple key/values, +.Qq Cm keys +being in the form: +.Ar algo_private +or +.Ar algo_public , +.Qq Cm values +being the actual content of the files in +.Pa /etc/ssh . +.It Ic ssh_authorized_keys +Append each entry of the array to +.Nm +default user which will be created. +.It Ic ssh_pwauth +boolean which determines the value of the +.Qq Ic PasswordAuthentication +configuration in +.Pa /etc/ssh/sshd_config +.It Ic network +.It Ic runcmd +An array of commands to be run at the end of the boot process +.It Ic packages +List of packages to be installed. +.It Ic package_update +Update the remote package metadata. +.It Ic package_upgrade +Upgrade the packages installed to their latest version. +.It Ic users +Specify a list of users to be created: +.Bl -tag -width "plain_text_passwd" +.It Ic name +Name of the user. +.It Ic gecos +GECOS for the user. +.It Ic homedir +The path of the home directory for the user. +.It Ic primary_group +The main group the user should belong to. +.It Ic groups +The list of other groups the user should belong to. +.It Ic no_create_home +A boolean which determines if the home directory should be created or not. +.It Ic shell +The shell that should be used for the user. +.It Ic passwd +The encrypted password for the user. +.It Ic plain_text_passwd +The password in plain text for the user. +Ignored if an encrypted password is already provided. +.It Ic groups +The list of other groups the user should belong to. +.It Ic locked +Boolean to determine if the user accound should be locked. +.It Ic sudo +An entry which should be appended to +.Pa /usr/local/etc/sudoers.d/90-nuageinit-users +.El +.Pp +A special case exist: if the entry is a simple string with the following value +.Qq default +The the default user is created. +.It Ic chpasswd +Change the passwords for users, it accepts the following keys: +.Bl -tag -width "expire" +.It Ic expire +Boolean to force the user to changes their password during the first login +.It Ic users +An array of objects: +.Bl -tag -width "password" +.It Ic user +Specify the user who's password will be changed. +.It Ic password +Specify a text line with the new password, or +Specify the user who's password will be changed. +.Qq Cm RANDOM +to assign the password randomly. +If the textline starts with +.Qq Cm $x$ +Where x is a number, then the password is considered encrypted, +otherwise the password is considered plaintext. +.El +.El +.El +.Sh EXAMPLES +Here is an example of a YAML configuration for +.Nm : +.Bd -literal +#cloud-config +fqdn: myhost.mynetwork.tld +users: + - default + - name: user + gecos: Foo B. Bar + sudo: ALL=(ALL) NOPASSWD:ALL + ssh-authorized-keys: + - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAr... +packages: + - neovim + - git-lite +package_update: true +package_upgrade: true +runcmd: + - logger -t nuageinit "boot finished" +ssh_keys: + ed25519_private: | + -----BEGIN OPENSSH PRIVATE KEY----- + blabla + ... + -----END OPENSSH PRIVATE KEY----- + ed25519_public: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK+MH4E8KO32N5CXRvXVqvyZVl0+6ue4DobdhU0FqFd+ +.Ed +.Sh SEE ALSO +.Xr kenv 2 , +.Xr cd9660 4 , +.Xr msdosfs 4 , +.Xr smbios 4 , +.Xr rc 8 +.Sh STANDARDS +.Nm +is believed to conform to the +.Lk https://cloud-init.io/ Cloud Init +specification. +.Sh HISTORY +.Nm +appeared in +.Fx 14.1 From nobody Tue Jun 17 08:00:34 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 4bLznZ4JF6z5q30x; Tue, 17 Jun 2025 08:00:34 +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 4bLznZ3kc4z3wKX; Tue, 17 Jun 2025 08:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750147234; 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=Q5w1q0cb2ZhRdbol4tMRAt2Snz/CaqZnfVVJoT1Vy+Y=; b=oqf0qQup6AO83Y2VmsM1ZHvZMgxR7mNySFg7N/2xXKynq55Tu3KM67Iw/5XyfMdfCUWBFZ +h2ALFIjK+m4S4ZLal1GtdhcoKxvp5E8q4wwP6oVlYwj74DoArUoQ9Vesg8C3du9IyFta/ Jmj4oGBccskH6vq7kG5UdTu7TKxCEvcO9vuW1rO/rCCPnwF41DZMcp4jqEGLCipHrV0zUG cgoeL0QF3L53RpWEPoMKKzxXyaJg3hOC+A5P4+gshn0Vf4mnoJYOLODjGEE11AbtIos32t tUteBnqngtYr+QeJqoIZg3D0L3tnGPCTNWG+Sq05LefZVAq+Seml3NgFiCPcfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750147234; 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=Q5w1q0cb2ZhRdbol4tMRAt2Snz/CaqZnfVVJoT1Vy+Y=; b=TbGgRGWNQm8gCG4eUfqSdbUJB8p3Ykp7EISm74zoMQkFNjPPSFjRsb1cnUS5JuiDdm3Jps JVgBhk7Of+ngk2iD4OOp/8lD0mdGlhNbMlVHR0Fxwkf3610SpofRQ9sL5PzbFS9Zvd+ICV 9UTB2ImEZocqVYdYLzP8dMhllCAb/uxlSSrBdl96Zyw/7AXJiyanfaTF2kHTDfMYOwEhaD PpxSVQjCagPcLLwky1iyaidS1wgbRWkd3blH2lKEcEbRbBNfOsPFbxbKu1qht/fqg7j5NS w7dtyJ8dtL2a6W705kBNFxmknMXrEEimj1xOcb2YAkdAdhU7xUJKvXTFlVveJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750147234; a=rsa-sha256; cv=none; b=JWJGTncYqglqlFna7b+PZH7V5gfGh26n6fTpxtE0dlsXWQNYnbe0r8md7zKSDe1bFbhikF J04d42XO8sELfnD0ai1VXrDEaiR0B7pOij/LmtT5UVeA7T5ccqgcT772WoGwN3mWVeai6f cpMB9yq5Lg4wlNti/uX5zRbI3NBcPM2MGHuTCK895U2wu7bbuzwh3fDqSijHu623SwMiE/ O0zO2s6EKN/Jg41gaSidsAEPy8CGN3lQortmVindTXf4sAk7RTFE3ZLMCH5MU3+jCW0G6v xH0BIuSY3nu4xvqZbOHqkxcsV8v5X9s5Tx1artQdjXvr43jMR7yWeDH76YMghA== 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 4bLznZ2ccqzbq9; Tue, 17 Jun 2025 08:00:34 +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 55H80YEP048835; Tue, 17 Jun 2025 08:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55H80Y6K048832; Tue, 17 Jun 2025 08:00:34 GMT (envelope-from git) Date: Tue, 17 Jun 2025 08:00:34 GMT Message-Id: <202506170800.55H80Y6K048832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 1049c079c013 - main - nuageinit.7: language and grammar fixes mostly 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: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1049c079c013e17b72d64f6b558e9f7e777714f1 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=1049c079c013e17b72d64f6b558e9f7e777714f1 commit 1049c079c013e17b72d64f6b558e9f7e777714f1 Author: Maxim Konovalov AuthorDate: 2025-06-17 07:59:57 +0000 Commit: Maxim Konovalov CommitDate: 2025-06-17 07:59:57 +0000 nuageinit.7: language and grammar fixes mostly --- libexec/nuageinit/nuageinit.7 | 54 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 7e44ce208a9b..dd6c7b5d0a64 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -19,15 +19,15 @@ It is composed of 3 scripts: .Bl -tag -width "nuageinit" .It Cm nuageinit -This script will detect the configuration disk kind of cloud environement the +This script will detect the configuration disk kind of cloud environment the system runs on and gather accordingly the configuration data. -The following cloud environements are supported right now: +The following cloud environments are supported right now: .Bl -tag -width "OpenStack" .It ondisk A cloud agnostic environment where the disk is provided to the system with the configuration data on it. The disk should be formatted in one of the following formats: -.Xr cd9660 4 , +.Xr cd9660 4 or .Xr msdosfs 4 and be labelled (via filesystem label) either @@ -44,17 +44,15 @@ description available in .Xr kenv 2 . .El .Pp -Depending on the cloud environement above +Depending on the cloud environment above, .Nm will attempt to configure the instance. -See -.Sx CONFIGURATION . -This script executes early, +This script executes early after all the local filesystem are mounted but before the network is configured. .It Cm nuageinit_post_net -This script is reponsible processing the configurations that are network -dependant: +This script is responsible for processing the configurations that are network +dependent: .Bl -bullet .It dealing with packages @@ -67,7 +65,7 @@ been passed via the configuration to be executed, via the configuration or because the user_data provided is a script. .El .Pp -The default user for nuageinit is a user named: +The default user for nuageinit is a user named .Va freebsd with a password set to .Va freebsd @@ -77,9 +75,8 @@ and a shell set to The configuration of .Nm is typically done via metadata provided by the cloud provider. -The metadata is presented to nuageinit in different form depending on +The metadata is presented to nuageinit in different forms depending on the provider: -provider: .Bl -tag -width "config-2" .It nocloud If the data is provided via a disk labelled @@ -88,20 +85,20 @@ then the metadata is provided in the form of a file named .Pa meta-data in YAML format. .Nm -Will configure the hostname of the instance according the value of the +will configure the hostname of the instance according the value of the following variables .Va local-hostname or .Va hostname . .It config-2 If the data is provided via a disk labelled -.Va config-2 , -or if fetched from OpenStack, +.Va config-2 +or if it is fetched from OpenStack, the metadata is expected in two json files: .Pp The .Pa meta_data.json -file supportes the following keys: +file supports the following keys: .Bl -tag -width "public_keys" .It Ic hostname Set the hostname of the instance. @@ -125,7 +122,7 @@ Array of network configurations to be set. Along with the metadata, a user data file is provided, either named .Pa user_data or -.Pa user-data +.Pa user-data . If this file starts with a .Qq #! , it will be executed at the end of the boot via @@ -153,16 +150,16 @@ An array of strings or objects to be created: If the entry is a string, a group using this string as a name will be created. .It -if the entry is a an object, the +if the entry is an object, the .Qq Ar key will be used as the name of the group, the .Qq Ar value -will is expected to be a list of members (array), specified by name. +is expected to be a list of members (array), specified by name. .El .It Ic ssh_keys An object of multiple key/values, .Qq Cm keys -being in the form: +being in the form .Ar algo_private or .Ar algo_public , @@ -212,15 +209,15 @@ Ignored if an encrypted password is already provided. .It Ic groups The list of other groups the user should belong to. .It Ic locked -Boolean to determine if the user accound should be locked. +Boolean to determine if the user account should be locked. .It Ic sudo An entry which should be appended to .Pa /usr/local/etc/sudoers.d/90-nuageinit-users .El .Pp -A special case exist: if the entry is a simple string with the following value -.Qq default -The the default user is created. +A special case exist: if the entry is a simple string with the value +.Qq default , +than the default user is created. .It Ic chpasswd Change the passwords for users, it accepts the following keys: .Bl -tag -width "expire" @@ -230,15 +227,15 @@ Boolean to force the user to changes their password during the first login An array of objects: .Bl -tag -width "password" .It Ic user -Specify the user who's password will be changed. +Specify the user whose password will be changed. .It Ic password -Specify a text line with the new password, or -Specify the user who's password will be changed. +Specify a text line with the new password or +specify the user whose password will be changed. .Qq Cm RANDOM to assign the password randomly. If the textline starts with .Qq Cm $x$ -Where x is a number, then the password is considered encrypted, +where x is a number, then the password is considered encrypted, otherwise the password is considered plaintext. .El .El @@ -276,6 +273,7 @@ ssh_keys: .Xr cd9660 4 , .Xr msdosfs 4 , .Xr smbios 4 , +.Xr ssh_config 5 , .Xr rc 8 .Sh STANDARDS .Nm From nobody Tue Jun 17 11:27:59 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 4bM4Nv4twXz5yCDg; Tue, 17 Jun 2025 11:27:59 +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 4bM4Nv3Sgyz3HXG; Tue, 17 Jun 2025 11:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750159679; 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=2B+eFSeJ013LeBqU2V7u1I0bgChNlFTXkJKj/AXwzjw=; b=sbaecocyirKUB54xFs3jAcRieDkfs4p4dTvX5ltJLhsnIVaW+SL1BQOmd1ey28KPLmoXA9 EFaQZITh1Gm3v4BDQgxLKeQrkI65EzfScf+lQXpJAiJA0HN9+yFdHHJccZQyARt0Yem/hi SODommjDITvrHAwoRJ6vstxn+z80QAsSrstZOFJG1/28gM2S+YvgxVNQujazzqqzUpoPT7 sKSHQtf0+qaRpFbslSsUX5l0jjtXX1vDmJ3XKU0dEa2ljH+WLV2HcUGOkUUop7toJT01c2 DLZm2xFIH3heroOj4EEW15L89MEYoyzpWlRF1wg0UUUhqu2Any2slhU7p+mBzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750159679; 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=2B+eFSeJ013LeBqU2V7u1I0bgChNlFTXkJKj/AXwzjw=; b=ZJBDVS0t3qprC0GllgbozYEcYKDSVBR/sIWljEESbuHF0Y8oRW1t9HHgjHCMEHOje1Swa5 h3cfoUxqMXKl7exKvvtE2xyDauakYbtgGrcRUT/eHgm8m3l33pQs1PZz3fZnVFu7WcvBZP PJlrOSnFSCmBh7nKElULirg+J1a/wuKGUau75Gy09bSmx6tDtUE4/Bl5AoeE43lvjWpOAR nYCrRDuNeLpuNTyE+ZTEmay7F4kbshj/a2jMCD0/drFRRO201JU8gDCEa93lTg4Taxzg3k 3qV19sjyabiL+7RPLIbu+gdbfYCEYdwPOpW/E6qJWY4SyM7MSsbERZwPTJncVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750159679; a=rsa-sha256; cv=none; b=EWiSWUxu6a/179PmvGi0l8iXqsqtDUoPIsuYuiSbg+1ePCy5v6oDvrtFOike1qHn98BCQ7 EN9vRQQSX7yCPFN3elH7LQMRJCJ5d+5hOL6tav6lQ5rcTaax2O1ESEgCTnq/sSlB/Uoi+6 7HtiMGp9RTe//kivPj22ZYTaW05AouqFuZt5A+r/+oQD9fMkooia5R5crXRXCi69alANZp xlouvTwZj89XEsFO4Sff/Z3m0KVXd7bG0Y4Ae6qNYAsMwUajjls0U0pDurhlQe2h0xXeEg MqcwASTAFFM+OphY5/O3Hq/Ovy5p2x4Y9vLidkDFaXD4HHBNyKiARG0q+AtdVQ== 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 4bM4Nv2bqPzhnB; Tue, 17 Jun 2025 11:27:59 +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 55HBRxfv032363; Tue, 17 Jun 2025 11:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HBRxcV032360; Tue, 17 Jun 2025 11:27:59 GMT (envelope-from git) Date: Tue, 17 Jun 2025 11:27:59 GMT Message-Id: <202506171127.55HBRxcV032360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ba3d547967c8 - main - tcp: Fix the SO_REUSEPORT_LB check 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba3d547967c8759d0b974bdac0bda394a3e84312 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ba3d547967c8759d0b974bdac0bda394a3e84312 commit ba3d547967c8759d0b974bdac0bda394a3e84312 Author: Mark Johnston AuthorDate: 2025-06-17 11:22:26 +0000 Commit: Mark Johnston CommitDate: 2025-06-17 11:22:26 +0000 tcp: Fix the SO_REUSEPORT_LB check This needs to happen in tcp_connect() rather than tcp_usr_connect(), as the latter is reachable by implied connect() via sendto(). Reviewed by: glebius Reported by: syzbot+eecc86e6952fd9ba9f11@syzkaller.appspotmail.com Fixes: c7f803c71dae ("inpcb: fix a panic with SO_REUSEPORT_LB + connect(2) misuse") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50893 --- sys/netinet/tcp_usrreq.c | 8 ++++++-- tests/sys/netinet/so_reuseport_lb_test.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index cd273803dacf..3ea561e63503 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -523,7 +523,7 @@ tcp_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td) } if ((error = prison_remote_ip4(td->td_ucred, &sinp->sin_addr)) != 0) goto out; - if (SOLISTENING(so) || so->so_options & SO_REUSEPORT_LB) { + if (SOLISTENING(so)) { error = EOPNOTSUPP; goto out; } @@ -590,7 +590,7 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td) error = EAFNOSUPPORT; goto out; } - if (SOLISTENING(so) || so->so_options & SO_REUSEPORT_LB) { + if (SOLISTENING(so)) { error = EOPNOTSUPP; goto out; } @@ -1478,6 +1478,8 @@ tcp_connect(struct tcpcb *tp, struct sockaddr_in *sin, struct thread *td) (SS_ISCONNECTING | SS_ISCONNECTED | SS_ISDISCONNECTING | SS_ISDISCONNECTED)) != 0)) return (EISCONN); + if (__predict_false((so->so_options & SO_REUSEPORT_LB) != 0)) + return (EOPNOTSUPP); INP_HASH_WLOCK(&V_tcbinfo); error = in_pcbconnect(inp, sin, td->td_ucred); @@ -1520,6 +1522,8 @@ tcp6_connect(struct tcpcb *tp, struct sockaddr_in6 *sin6, struct thread *td) if (__predict_false((so->so_state & (SS_ISCONNECTING | SS_ISCONNECTED)) != 0)) return (EISCONN); + if (__predict_false((so->so_options & SO_REUSEPORT_LB) != 0)) + return (EOPNOTSUPP); INP_HASH_WLOCK(&V_tcbinfo); error = in6_pcbconnect(inp, sin6, td->td_ucred, true); diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index a1b5a3f94f61..fa9d6e425884 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -505,6 +505,11 @@ ATF_TC_BODY(connect_not_bound, tc) ATF_REQUIRE_MSG(rv == -1 && errno == EOPNOTSUPP, "Expected EOPNOTSUPP on connect(2) not met. Got %d, errno %d", rv, errno); + rv = sendto(s, "test", 4, 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE_MSG(rv == -1 && errno == EOPNOTSUPP, + "Expected EOPNOTSUPP on sendto(2) not met. Got %d, errno %d", + rv, errno); close(p); close(s); @@ -536,6 +541,11 @@ ATF_TC_BODY(connect_bound, tc) ATF_REQUIRE_MSG(rv == -1 && errno == EOPNOTSUPP, "Expected EOPNOTSUPP on connect(2) not met. Got %d, errno %d", rv, errno); + rv = sendto(s, "test", 4, 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE_MSG(rv == -1 && errno == EOPNOTSUPP, + "Expected EOPNOTSUPP on sendto(2) not met. Got %d, errno %d", + rv, errno); close(p); close(s); From nobody Tue Jun 17 11:55:14 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 4bM50L6KSsz5yDRM; Tue, 17 Jun 2025 11:55:14 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bM50L52G0z3RFy; Tue, 17 Jun 2025 11:55:14 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750161314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kSyFZ7EiXindt81Yw1mAfzREJ1ZYsNkfGdEqVwkRJ9U=; b=eQQJ6scIaofrQiB5Gc6XFEwvwWqCX0LUv1ZgKQ4VAiYqd+P/Kq0TwcRLnmSGzv+yFJ7Exa EZXLhn62+HPfs4Wwhn4t0A4O6pvBvZeNzFeQZxZLXrvsggVtuxWOQQysfP1/gJYBecRL1v +M0pARHUl06yTdyVRuZROu4mTITByCRDp53uHWm3e3qHiXeiuUCl1CFWsbwfXc4beBF8sk xrk9WQs+QI46WxT8LJ6fqjB46J6fzLrovO1mtSPYApXtrWk5hHQ5XOp5mVLBWvCUJhwVAA 5lcjm83bw7V7k0xYO0KLiyZxDltteTBHNj/yefvaGk61ArhPv203v8rb3Usc9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750161314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kSyFZ7EiXindt81Yw1mAfzREJ1ZYsNkfGdEqVwkRJ9U=; b=BIMmUXZL0joAFrzw0U2+WWVAzgPfDoivlAWBFEPj/wmA530gw2Q3cjJKk88J80R+CwurOf 8gLMQaXmuiZzO4gdJlYBiD/jtAK8ysCW06m2h6s4usGB5TwkkQ+6HrIHUMTCeecyVJ5Voq uk8JrZ4f76FdE3kqLKTglF0DvpC+8faOKsVHudXl0hK4wyMtvT2qkOOygUS43pbDKb3fk+ zuFBWMbgsNY0TqzEmjqFpG5yc36IZ0kSUHGLt2T9OFSV6fxT+A/BKobmGghK/TPR5I68GS n/AtPGC2C4vaWYRsanoxKN/KteFD8iZyXPbsZ6peBismLpgH/IAvTN95nfhTNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750161314; a=rsa-sha256; cv=none; b=NIBMp0cyBi28wd8aOoeIN3M1LfcVMckdIQNYH+m14LNuoiFM8VEDruMHuYMkQ3DLaH97Qc rPT/UvBqkgq3mnl/uOHBNfQFlVeDJ7IoFb5Evc7wO6WZgnBKhMbS22CgceH6gr8lUn98kk tJTpOKdAqZ0XhSbInmW3nXX5CtGNoXlA5eF7eS2UUrT/MIj9aNchCP+YFV4+nZUy5McesL shFtUt65KdzhEf7Vy1XqNoD9/rdrWvH1Tw9V5SoXlXBWsVNsYLGWYzeLoEgpoxAcg1zkdB jEVLzOYLO5LbPwCqpttXv0l5bX3B4ZVIR6W5CO3n61+0ZQJnsn0lEj8+D5sIZQ== Received: by freefall.freebsd.org (Postfix, from userid 1532) id 934CB1826A; Tue, 17 Jun 2025 11:55:14 +0000 (UTC) Date: Tue, 17 Jun 2025 12:55:14 +0100 From: Lexi Winter To: Cy Schubert Cc: Ronald Klop , Cy Schubert , dev-commits-src-main@freebsd.org, dev-commits-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: git: b6e33f0cd536 - main - rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS Message-ID: Mail-Followup-To: Cy Schubert , Ronald Klop , Cy Schubert , dev-commits-src-main@freebsd.org, dev-commits-src-all@freebsd.org, src-committers@freebsd.org References: <240137891.21754.1749997280448@localhost> <20250616023154.3D2B730C@slippy.cwsent.com> 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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="4IRHxbze8FHauxFp" Content-Disposition: inline In-Reply-To: <20250616023154.3D2B730C@slippy.cwsent.com> --4IRHxbze8FHauxFp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Cy Schubert: > In message <240137891.21754.1749997280448@localhost>, Ronald Klop writes: [...] > > > + if [ "$vfstype" =3D "zfs" -a "$a" !=3D "#" ]; then > > > > Does this mean that a comment # must always be folllowed by a whitespac= e? > Yes. It's a hack but it's the only way without grep (when /usr may not be= =20 > mounted). In the very worst case rc.d/zpool will be needlessly executed. could you not check for a comment using the # variable expansion operator? i.e. if [ "${a#\#}" !=3D "$a" ] then the variable starts with a # character: $ echo $line1 #Foo bar $ echo $line2 Foo bar $ echo $line3 Foo # bar $ [ "${line1#\#}" =3D "$line1" ] || echo comment comment $ [ "${line2#\#}" =3D "$line2" ] || echo comment $ [ "${line3#\#}" =3D "$line3" ] || echo comment $ --4IRHxbze8FHauxFp Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaFFXngAKCRD1nT63mIK/ YHSfAP9+GSKp8kTHklHqe1YGaYA7diJK7ZlTOnlco+Oj0Iw1ewD6A7mpT+xhYAHs HWCcmkrRKa/C3lxhVyqEGMh4+fHHHw8= =4b11 -----END PGP SIGNATURE----- --4IRHxbze8FHauxFp-- From nobody Tue Jun 17 13:28:34 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 4bM74246Sqz5yKrW; Tue, 17 Jun 2025 13:28:34 +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 4bM7421Jwjz3vMy; Tue, 17 Jun 2025 13:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750166914; 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=mR5wUBVx1iAzrvlqP9+KJvo183Ofoi89zGcJ9WUeZqA=; b=g2A1/nLFIoDrWDHi0psQxzapeU9hg2dhGiEEEFKjZhBAWrYeMcQbr5zFHI8Pv+4dywz+1V ND031jgAxGtSFdFMfm2QP8oJkqSKUL8HWh+X9e1nIMrj+jRzN2KPJttThsKUo8ofKDM4Zb d0Jg6tVOiGYpYgMDZZi3qoeqPC7OoJ7RNN7gSe8rj7hh+JBGD/Smo9opsVd8eu+F/3t0BI QcbWIpGKnPtHME0FocW3szbfYSoGIuiUXcOqK7s99NLJQT7W6j+AC9VMeITjbrY+dpuYrb wNUgt/jI/NsNAKoqkaZb4t1v/TrOwQVnJggULt3qLgU6WIKpUVhhlf0ttFHPOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750166914; 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=mR5wUBVx1iAzrvlqP9+KJvo183Ofoi89zGcJ9WUeZqA=; b=JlyiqRPhNUOeAuKV8cJoFkWDeW/Nk5byU+zKKSgWgXxD6pwRi/NGXdtmBJH8zP1+U9GCU/ eeiEzI6DXh9S87dSzAR2XpOk17gggDLXsHI0FGekFgaD4eKNoD7ICesZLmHICrk4ctaB7s uQZ1I15tilV1hptfgIZGzeYFHWHM50iC6T91tw1gOVoqjmDN64Uvg8tLrRjxHeSSPU73x8 8kOtQfN7hsqRCyOdGdhliaD2CeeUDJRLhFaAOLfV87O14uCN1ZpiPfBvweA3qJUJaqxOvi EkmPYWy1XEtF2Od4cISe/NJsrp9ni0fJlzVC6zV5rz9LaJT+w/MgndxAL0byXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750166914; a=rsa-sha256; cv=none; b=cu8a5aGWceRpaPl8ne7Hw7WvvWCyOvEjOT1eRWfUljFNeJQKfuEOufK0p1ZGIQdG0lVGFd J+tW8dL67py+PE70upvfP82M6XubcEZk3Peq8WQQqSW0w2SgOmziUF/Datkj/zFMEiRZzH GakIoOkCpuRX8/WXmBKTj//ubYqNrwmWul7RKJFwd2ndIQqtjxGL93baMPhQsgP2P5g3Z8 sS6Z5hPZ78q9u0aLbFCH+Pn+5oVnvEAy/G40XledU4WCuAbNXi5SY5qh35XLPF3XiNYh9X iU3r2FsJIHmbO4CCQMdvThQ9vYwnycMCOAZawc6U2E2b8il7e1riBNtwuRRiTw== 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 4bM7420wZkzlck; Tue, 17 Jun 2025 13:28:34 +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 55HDSYXs057301; Tue, 17 Jun 2025 13:28:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HDSY4e057298; Tue, 17 Jun 2025 13:28:34 GMT (envelope-from git) Date: Tue, 17 Jun 2025 13:28:34 GMT Message-Id: <202506171328.55HDSY4e057298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ea8dc498aa8e - main - arm64: Create an L3 table to limit permissions 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea8dc498aa8ea91ce0364a3f0ccdb740a24dcfb4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ea8dc498aa8ea91ce0364a3f0ccdb740a24dcfb4 commit ea8dc498aa8ea91ce0364a3f0ccdb740a24dcfb4 Author: Andrew Turner AuthorDate: 2025-06-17 10:12:00 +0000 Commit: Andrew Turner CommitDate: 2025-06-17 12:48:22 +0000 arm64: Create an L3 table to limit permissions When building a 4k page kernel we use 2M blocks to map the kernel contents. As the .text section may not end on a 2M aligned address we need to split one block into level 3 pages and pad the end of the section to an appropriate boundary. With both these changes we can then mapjust the code as executable. While here also map it as read-only as none ofthis shouldbe written to directly. Reviewed by: alc Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45064 --- sys/arm64/arm64/locore.S | 62 +++++++++++++++++++++++++++++++++++++++++------- sys/conf/ldscript.arm64 | 6 +++++ 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index fcc3f948f00c..2f549a527f43 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -45,6 +45,12 @@ * space, the same as a single level 2 page with 4k pages. */ #define L3_PAGE_COUNT 32 +#elif PAGE_SIZE == PAGE_SIZE_4K +/* + * Space for a level 3 table holding the end of the executable memory and + * the start of the non-executable data. + */ +#define L3_PAGE_COUNT 1 #endif /* @@ -600,22 +606,64 @@ common: /* Get the number of blocks/pages to allocate, rounded down */ lsr x14, x8, #(PTE_SHIFT) - ldr x25, =etext + ldr x26, =etext +#if PAGE_SIZE != PAGE_SIZE_4K ldr x8, =((1 << PTE_SHIFT) - 1) - add x25, x25, x8 + add x26, x26, x8 +#endif mov x8, #(KERNBASE) - sub x25, x25, x8 + sub x25, x26, x8 lsr x25, x25, #(PTE_SHIFT) +#if PAGE_SIZE == PAGE_SIZE_4K + /* Calculate the number of executable level 3 pages to create */ + lsr x26, x26, #(L3_SHIFT) + bfc x26, #(Ln_ENTRIES_SHIFT), #(64 - Ln_ENTRIES_SHIFT) + + /* Build the L3 table holding the end of the exectuable code */ + lsl x15, x25, #(PTE_SHIFT) + adrp x6, pagetable_l3_ttbr1 + add x6, x6, :lo12:pagetable_l3_ttbr1 + ldr x7, =(ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | \ + ATTR_S1_AP(ATTR_S1_AP_RO)) + ldr x8, =(KERNBASE) + add x8, x8, x15 + add x9, x28, x15 + mov x10, x26 + bl build_l3_page_pagetable + + /* Build the remaining level 3 pages */ + ldr x7, =(ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | ATTR_S1_XN) + lsl x27, x26, #(L3_SHIFT) + add x8, x8, x27 + add x9, x28, x15 + add x9, x9, x27 + ldr x10, =(Ln_ENTRIES) + sub x10, x10, x26 + bl build_l3_page_pagetable + + /* Link the l2 -> l3 table */ + mov x9, x6 + adrp x6, pagetable_l2_ttbr1 + add x6, x6, :lo12:pagetable_l2_ttbr1 + bl link_l2_pagetable +#endif + /* Create the kernel space PTE table */ adrp x6, LL_PAGE_TABLE add x6, x6, :lo12:LL_PAGE_TABLE - mov x7, #(ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK)) + ldr x7, =(ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | \ + ATTR_S1_AP(ATTR_S1_AP_RO)) mov x8, #(KERNBASE) mov x9, x28 mov x10, x25 bl BUILD_PTE_FUNC +#if PAGE_SIZE == PAGE_SIZE_4K + /* Skip memory mapped through the L2 table */ + add x25, x25, #1 +#endif + /* Create the kernel space XN PTE table */ lsl x10, x25, #(PTE_SHIFT) ldr x7, =(ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) | ATTR_S1_XN) @@ -837,7 +885,6 @@ LENTRY(build_l2_block_pagetable) ret LEND(build_l2_block_pagetable) -#if PAGE_SIZE != PAGE_SIZE_4K /* * Builds an L2 -> L3 table descriptor * @@ -881,6 +928,7 @@ LEND(link_l2_pagetable) * VA start (x8) modulo L3C_SIZE must equal PA start (x9) modulo L3C_SIZE. */ LENTRY(build_l3_page_pagetable) + cbz x10, 2f /* * Build the L3 table entry. */ @@ -920,10 +968,10 @@ LENTRY(build_l3_page_pagetable) add x11, x11, #1 add x9, x9, #1 cbnz x10, 1b +2: ret LEND(build_l3_page_pagetable) -#endif LENTRY(start_mmu) dsb sy @@ -1054,10 +1102,8 @@ initstack_end: */ .globl pagetable_l0_ttbr1 pagetable: -#if PAGE_SIZE != PAGE_SIZE_4K pagetable_l3_ttbr1: .space (PAGE_SIZE * L3_PAGE_COUNT) -#endif pagetable_l2_ttbr1: .space PAGE_SIZE pagetable_l1_ttbr1: diff --git a/sys/conf/ldscript.arm64 b/sys/conf/ldscript.arm64 index 0d50eef431cf..ae231c3037e6 100644 --- a/sys/conf/ldscript.arm64 +++ b/sys/conf/ldscript.arm64 @@ -15,6 +15,12 @@ SECTIONS *(.gnu.warning) *(.gnu.linkonce.t*) } =0x9090 + /* + * Align to the the largest page size the kernel could be built for. + * If we don't then building page tables in locore.S could fail as it + * assumes the .text section is on a different page to later sections. + */ + . = ALIGN(CONSTANT(MAXPAGESIZE)); _etext = .; PROVIDE (etext = .); From nobody Tue Jun 17 13:49:04 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 4bM7Wh4SYlz5yMJc; Tue, 17 Jun 2025 13:49:04 +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 4bM7Wh3pSGz415P; Tue, 17 Jun 2025 13:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750168144; 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=rmUVPZQl5hTNVJY2xghsIcxOvgMYGKRTYtmA+Vu7rxQ=; b=nbq3xCxXd3kD2ZaqkzZ3nBtUzVoU9xAXNupcp7ue8bnb7X9U/y0RQI7ScYWl1H11iBdVYM Gv5aGkr9/+o7HjBWqLCTKdjWmANHWStF87+h5xAj8riwJpt5dLswcmPI9m9GDEJTv8fugC ACx6HNDQV6TvhxfN85w3mQh6Xl7bTf2ps3/UrWWDCAoZ71cxfNZLaq1UuBFvM4ZyzEHy1Q Cgd1e1shjyBIO/HF/3bNAwi9uPmREEbA0eg9p44o2LikEWD72rVYxr45sfnTcT+EoSXPsO MRL8VMrqNR461xBJd4eLGlbU8MMcxpa/g/Wiw8dRqsUFlW7zExxMMytfEcDRXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750168144; 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=rmUVPZQl5hTNVJY2xghsIcxOvgMYGKRTYtmA+Vu7rxQ=; b=cw1CbAYXtWDcRieSxpwsMOa2BxhOi14QbDtCckGIT9CsZeKVX1VDzdi4dvmVbbWLlGPAAV 5jmtfbbNkSTh4fYvcl94U51NM3VIHQajz8osRmWxf6ZfeAI8XBlAImWp+9qzIYrM0hisln 4Ss0wIlNH3XDlE3vOzKBhs9CFQIp6HnsnSAnfIRBOGWx0vzErWNAXb0hPdqFdxxOXZn8Nz Cre1AfGHaSjRapEjzyrI2lvkrqGLXdIVX3hKvR7vklRCTpZs43MsyRT4L9FR4+cx7vxqyN XEiiOrQ8fVPqJ1A7cljAwHOP9pTzCT/m5ur+1nJiR/uj7bkQJ7JzYg4yM8ukAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750168144; a=rsa-sha256; cv=none; b=dg1pb2DsvIZT4fwf+kE7LlAKVbqB0A2o5dMPFu27hOVHLtDE82hpk8ex0yinwkUjW90wYz C/R9f2BaosYte7jX3MSQt7qJUJvAelmqSDAmMtcu6DbpU9wJjZdFrGtYs3vWc8J8SYWvN4 jSsDp1lf+WXosNBZmwPO6rFZMMebJRZMmHg7OaFDF8dJnhIQiFqwgI7JFum5C5Ris3cztg obVT1w2qj6N+gSRQ6cu5waNWojpgsetZHmOmCF6zsCS3L5WEe3Qx7R0o82omq2lyfzHWak lA0bcBVexRevuBcG+dfxsmL7EiaGS3VoVpmrhZUsBkXtH2oO+QHzmch2SZRAjA== 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 4bM7Wh3G4WzmYk; Tue, 17 Jun 2025 13:49:04 +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 55HDn46O095063; Tue, 17 Jun 2025 13:49:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HDn4Kj095060; Tue, 17 Jun 2025 13:49:04 GMT (envelope-from git) Date: Tue, 17 Jun 2025 13:49:04 GMT Message-Id: <202506171349.55HDn4Kj095060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 124120d44ba2 - main - tcp: remove TCPTV_TWTRUNC 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 124120d44ba23ccc44144f9fc48d35818c660dc1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=124120d44ba23ccc44144f9fc48d35818c660dc1 commit 124120d44ba23ccc44144f9fc48d35818c660dc1 Author: Michael Tuexen AuthorDate: 2025-06-17 13:46:40 +0000 Commit: Michael Tuexen CommitDate: 2025-06-17 13:46:40 +0000 tcp: remove TCPTV_TWTRUNC It is not used anymore... Reviewed by: rscheff, Peter Lei MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50900 --- sys/netinet/tcp_timer.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index a3ca268417ba..52994c43e8e7 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -111,8 +111,6 @@ #define TCPTV_CPU_VAR ( hz/5 ) /* cpu variance allowed (200ms) */ #define TCPTV_REXMTMAX ( 64*hz) /* max allowable REXMT value */ -#define TCPTV_TWTRUNC 8 /* RTO factor to truncate TW */ - #define TCP_MAXRXTSHIFT 12 /* maximum retransmits */ #define TCPTV_DELACK ( hz/25 ) /* 40ms timeout */ From nobody Tue Jun 17 14:17:09 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 4bM8891ZvNz5yNkv; Tue, 17 Jun 2025 14:17:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bM8880s1pz3D5j; Tue, 17 Jun 2025 14:17:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of cy.schubert@cschubert.com designates 3.97.99.32 as permitted sender) smtp.mailfrom=cy.schubert@cschubert.com; dmarc=permerror reason="p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com" header.from=cschubert.com (policy=permerror) Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id RRwGuoi839JM2RX7fukeCO; Tue, 17 Jun 2025 14:17:11 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id RX7du9n3UWbOaRX7euQMpq; Tue, 17 Jun 2025 14:17:11 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Q5lx4J2a c=1 sm=1 tr=0 ts=685178e7 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=NN3ADSXLk06O8BHnmAkA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 4D6CF66A; Tue, 17 Jun 2025 07:17:09 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 194C31F0; Tue, 17 Jun 2025 07:17:09 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert , Ronald Klop , Cy Schubert , dev-commits-src-main@freebsd.org, dev-commits-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: git: b6e33f0cd536 - main - rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS In-reply-to: References: <240137891.21754.1749997280448@localhost> <20250616023154.3D2B730C@slippy.cwsent.com> Comments: In-reply-to Lexi Winter message dated "Tue, 17 Jun 2025 12:55:14 +0100." 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=us-ascii Date: Tue, 17 Jun 2025 07:17:09 -0700 Message-Id: <20250617141709.194C31F0@slippy.cwsent.com> X-CMAE-Envelope: MS4xfCcB6uQPwZLBZdAh0eRDeo83LkxsJ6EBfjOD6PzTgsgZif/C+ZZxlAc8KVDz7Y90VY+q9bzlLKw8FoCho8io+qJnZsOd225ll9F1F5/ghv8KEyv80BHU 3oFdhzHE1oMMUATELr7n+4g9B3A9T8bEJwkQr7HE/s0jYH1X4G5e8xR5KGnBrol66e/H9Vb3DkiZijS1QHKeTQrA979ufu6xPDJe73ZLuDEGuqYV2lJpGkyr xWvJBNgj88mO36IGc4T0QnbV5E0LCJ3bJLskvMHbkecYjlRq+Fuktl/Gqr9inz/8hdC+jtPlrYcrUPjwoIbP+VL4CbupILF+AIH3ZuuwRh0Pi2leg+qK3zAF gbLixQVC X-Spamd-Result: default: False [-1.18 / 15.00]; NEURAL_HAM_LONG(-0.99)[-0.995]; NEURAL_HAM_SHORT(-0.89)[-0.892]; NEURAL_SPAM_MEDIUM(0.61)[0.610]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:3.97.99.32/31]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.32:from]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; REPLYTO_EQ_FROM(0.00)[]; R_DKIM_NA(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_BAD_POLICY(0.00)[cschubert.com : p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org]; RCPT_COUNT_FIVE(0.00)[6] X-Rspamd-Queue-Id: 4bM8880s1pz3D5j X-Spamd-Bar: - In message , Lexi Winter writes: > Cy Schubert: > > In message <240137891.21754.1749997280448@localhost>, Ronald Klop writes: > [...] > > > > + if [ "$vfstype" =3D "zfs" -a "$a" !=3D "#" ]; then > > > > > > Does this mean that a comment # must always be folllowed by a whitespac= > e? > > > Yes. It's a hack but it's the only way without grep (when /usr may not be= > =20 > > mounted). In the very worst case rc.d/zpool will be needlessly executed. > > could you not check for a comment using the # variable expansion operator? > i.e. if [ "${a#\#}" !=3D "$a" ] then the variable starts with a # character: > > $ echo $line1 > #Foo bar > $ echo $line2 > Foo bar > $ echo $line3 > Foo # bar > $ [ "${line1#\#}" =3D "$line1" ] || echo comment > comment > $ [ "${line2#\#}" =3D "$line2" ] || echo comment > $ [ "${line3#\#}" =3D "$line3" ] || echo comment > $ Looks like this works! I learn something new every day. Thank you. I will do a couple of reboots with it before committing your recommended fix. Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Tue Jun 17 14:18: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 4bM89R0Q0wz5yNkj; Tue, 17 Jun 2025 14:18: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 4bM89Q5mNFz3DKc; Tue, 17 Jun 2025 14:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750169898; 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=QmhQ6Ef7UVcAZS2HdAegMEvdk+ja6TvITrU0j272U84=; b=h7QhZyib2YPm32lzvLakYmKtbxTwBCDc6JGts5Yx6oaAyJ18t7RgKI0I5THCJW17M10e0N TVXFmfdyeqUerNQPveKDbK3yCYrjupXsQxuBTyvrZCRVqCg044ORAs4DcBm0o6lMM6Robq L+fsbo1b21a+Eu/MMHT1V//73qv10Xt74L9MGDhtO/CnFOzDNqStDCNhbEJx7sklBN4rcn LnmJhkBmQNxFNnjrt2zojXHFRO5J9mtmeSjtyMZxIDC4Pp24Gf8DeBqmDZrVWbalo6K+lF 1pqV8Vrg6BFeoyNi045/AlaUt6HAW/NeloiTqLq6NV7BnU/eGrSRAR/C1DRawg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750169898; 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=QmhQ6Ef7UVcAZS2HdAegMEvdk+ja6TvITrU0j272U84=; b=eG9nE3GtP8slUfXrgSPr6NI2st5wlRrV/30XGGGKGsz5olPaSIfaGOdM04o7m6L0FU0glF XZeRbm4X9ZDye8QzdYigZrCE/t+2G+uXb/IIGZuZOVX8lVGbshkm60IWxPztslSSNrkhn8 zcelpUM+C1HxPzItHIi+kzU32P8P5FeS+tKcaQ4LV0gSr9j5WWdQ4SKA29q/1zYAolzUuo fzZvJmjBXG0s3QUMTG7ii8YeclU+WJv7WD/zVCl470IsWMn2s4OkRsG2vwOTErdS6qk7nr ll5PLIVY1QZ2jnzuBPEynPd5Pz8qK1sFIaR++ZYXAjeTKHowdjWbbvRz9sPVAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750169898; a=rsa-sha256; cv=none; b=T3NF781IzRoYeQXOwQwiQ5EW4rognoYpU1fboQS405t2NVn74LrRShk/HlkbxH11V7nBdp si8p8+RToCvd4BhzS82y4CAw63j0ZmkXT3uCUE7NJstWDisAA1Q/U1jV5WBrntpyb/RYwj yr/2akD0WPDZiGjcfA8pzKGwgjZliqc9fYXpjxlhEEXhSBmaX5YPfJlDTLXKYSK+LjhDOl 7P6PFHBGB21HxBnRo/klwAII++aT7QYiNZIQDHEObHcHku+d1QF93faf9geVHDMgPdL+Kp n/lPjvTSpyrXgWznMHC0DU+1xMu23r6doNcCjNvKNSxr5XVARhfFKHSG6vdKqA== 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 4bM89Q41T9znLG; Tue, 17 Jun 2025 14:18: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 55HEIIxt052010; Tue, 17 Jun 2025 14:18:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HEII39052007; Tue, 17 Jun 2025 14:18:18 GMT (envelope-from git) Date: Tue, 17 Jun 2025 14:18:18 GMT Message-Id: <202506171418.55HEII39052007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: e2a605e7ab7f - main - libarchive/test: fix build when memcpy() is a macro 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2a605e7ab7ff83d15b1a0b994223768169b0f1e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e2a605e7ab7ff83d15b1a0b994223768169b0f1e commit e2a605e7ab7ff83d15b1a0b994223768169b0f1e Author: Kyle Evans AuthorDate: 2025-06-17 14:17:59 +0000 Commit: Kyle Evans CommitDate: 2025-06-17 14:17:59 +0000 libarchive/test: fix build when memcpy() is a macro After importing the latest libarchive into FreeBSD, Shawn Webb @ HardenedBSD noted that the test build is broken when FORTIFY_SOURCE=2 while building the base system. Braced initializer lists are a special case that need some extra fun parentheses when we're dealing with the preprocessor. While it's not a particularly common setup, the extra parentheses don't really hurt readability all that much so it's worth fixing for wider compatibility. This corresponds to libarchive PR #2660 Reported by: Shawn Webb (HardenedBSD) --- .../test/test_write_format_mtree_preset_digests.c | 68 +++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c b/contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c index cdf789b4b002..bb8ddf49431b 100644 --- a/contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c +++ b/contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c @@ -326,10 +326,10 @@ DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_no_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.md5, (unsigned char[]) { + memcpy(ed.md5, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, - }, sizeof(ed.md5)); + }), sizeof(ed.md5)); #ifdef ARCHIVE_HAS_RMD160 assertEqualInt(ARCHIVE_OK, archive_rmd160_init(&expectedRmd160Ctx)); @@ -419,10 +419,10 @@ DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.md5, (unsigned char[]) { + memcpy(ed.md5, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, - }, sizeof(ed.md5)); + }), sizeof(ed.md5)); #ifdef ARCHIVE_HAS_RMD160 assertEqualInt(ARCHIVE_OK, archive_rmd160_init(&expectedRmd160Ctx)); @@ -519,10 +519,10 @@ DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_non_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.md5, (unsigned char[]) { + memcpy(ed.md5, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, - }, sizeof(ed.md5)); + }), sizeof(ed.md5)); #ifdef ARCHIVE_HAS_RMD160 assertEqualInt(ARCHIVE_OK, archive_rmd160_init(&expectedRmd160Ctx)); @@ -710,10 +710,10 @@ DEFINE_TEST(test_write_format_mtree_digests_rmd160_digest_set_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.rmd160, (unsigned char[]) { + memcpy(ed.rmd160, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.rmd160)); + }), sizeof(ed.rmd160)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -810,10 +810,10 @@ DEFINE_TEST(test_write_format_mtree_digests_rmd160_digest_set_non_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.rmd160, (unsigned char[]) { + memcpy(ed.rmd160, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.rmd160)); + }), sizeof(ed.rmd160)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -910,10 +910,10 @@ DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_no_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha1, (unsigned char[]) { + memcpy(ed.sha1, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha1)); + }), sizeof(ed.sha1)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1003,10 +1003,10 @@ DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha1, (unsigned char[]) { + memcpy(ed.sha1, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha1)); + }), sizeof(ed.sha1)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1103,10 +1103,10 @@ DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_non_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha1, (unsigned char[]) { + memcpy(ed.sha1, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha1)); + }), sizeof(ed.sha1)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1203,12 +1203,12 @@ DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_no_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha256, (unsigned char[]) { + memcpy(ed.sha256, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha256)); + }), sizeof(ed.sha256)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1298,12 +1298,12 @@ DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha256, (unsigned char[]) { + memcpy(ed.sha256, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha256)); + }), sizeof(ed.sha256)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1400,12 +1400,12 @@ DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_non_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha256, (unsigned char[]) { + memcpy(ed.sha256, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha256)); + }), sizeof(ed.sha256)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1502,13 +1502,13 @@ DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_no_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha384, (unsigned char[]) { + memcpy(ed.sha384, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha384)); + }), sizeof(ed.sha384)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1598,13 +1598,13 @@ DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha384, (unsigned char[]) { + memcpy(ed.sha384, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha384)); + }), sizeof(ed.sha384)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1701,13 +1701,13 @@ DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_non_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha384, (unsigned char[]) { + memcpy(ed.sha384, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha384)); + }), sizeof(ed.sha384)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1804,7 +1804,7 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_no_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha512, (unsigned char[]) { + memcpy(ed.sha512, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, @@ -1812,7 +1812,7 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_no_data) 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha512)); + }), sizeof(ed.sha512)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -1903,7 +1903,7 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha512, (unsigned char[]) { + memcpy(ed.sha512, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, @@ -1911,7 +1911,7 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_empty_data) 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha512)); + }), sizeof(ed.sha512)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); @@ -2009,7 +2009,7 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_non_empty_data) struct archive_entry *entry; struct expected_digests ed; - memcpy(ed.sha512, (unsigned char[]) { + memcpy(ed.sha512, ((unsigned char[]) { 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, @@ -2017,7 +2017,7 @@ DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_non_empty_data) 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed, 0xfe, 0xed - }, sizeof(ed.sha512)); + }), sizeof(ed.sha512)); #ifdef ARCHIVE_HAS_MD5 assertEqualInt(ARCHIVE_OK, archive_md5_init(&expectedMd5Ctx)); From nobody Tue Jun 17 14:35:30 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 4bM8YH1nFQz5yPjs; Tue, 17 Jun 2025 14:35:31 +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 4bM8YH0rRzz3KZF; Tue, 17 Jun 2025 14:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750170931; 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=oVGRvcP/j2DQ3K4h1ztC9qj3JbAa/bXND84LTIEHHO8=; b=TP9jNqHt+LcYve9BkLhfjU/uCgA8V/4Ajltq/fg0l47PCalubQhxmGP1GfyloSJidSpNTS 6RGv4rroNx7ZvuAGZCUMhQaJN2fuQp1RSjlLhQbCzpZRhiLjW6+YDKK2jKvI1NSiJCZt4v 9/QC+3iLLBQMVZgX3fnCV1OL1eMI4YyF0/8P/1Maz7nPH6oLQB7JEFNtAhkzcwKeByIkG/ gcJx2vDGDM8XZ2AepFM22F+04RuKTXSsEpluPTTjUwu5iRu1NhEKnlSuz+3GLK8Wyv63Pc sy9S0e12hGZCS3NzAigdLnbuew1ewo4OeEXOSR5/275Nhl71H26y+XyOlG28dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750170931; 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=oVGRvcP/j2DQ3K4h1ztC9qj3JbAa/bXND84LTIEHHO8=; b=g0hGDQwOsGajX9QmjnBBobL+QLnpKM61DmBp+hhTLztZmpmoKZykb+Xx4nfT4ZdsPWXTj1 11gVm1mIFWN2YNpu0u6I/ZWklz6bFcGcHQ4pJphhoAjvv+Z3HiQjSksN9c4DorAIjNWaJl YAlYmVlg/dwojzYOES4yhW2OM+cwwZfFAsnpatniAlb6QHuhSAIsngNS6eGRMWT3jNcCqe 9UZ8o6It3LOBrXlSIGTeobWKA3JH5s534q+cR22c7fxhLTBrBq6UKfbIufEEKR9vOCX2kL Y8fNeb96qtp1C/rF1zkiGlzG0nnJcVMHINaxliKqiA69OPJIYREGy8vcOCYX+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750170931; a=rsa-sha256; cv=none; b=HHhiRqgybAhBGVM4N/2nziDBsLKPrZQB5uiqGGRJHOQvMJNx+YgYu43sapgDGiVS9T708Y 8M7WiPzgDvJYFm5qS8OEBb9fyYzOep9Z+RaKt83q+60mvVoXOR4vqtUXcCmsTgGpAmEk6G TyjlBQP9ZHeIeC1gpRiL5da3df3LctKLIsOrFy16YvQQoXoi2wDGbdSrdwqNGBWKwXkJ7+ S+F5gicnB2Kge77tM1eSkF1JLdsH+kwVfngKzKadtRjjt/qsMsbzevbTBu/d1mRGJy0h6X myy3sr/op7RIjO5PZhQCEpF+PFxxbv6kyByd/7VqlJMzPi61ccmAYWiGEFTI0w== 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 4bM8YH09Y5znsK; Tue, 17 Jun 2025 14:35:31 +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 55HEZUTL087416; Tue, 17 Jun 2025 14:35:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HEZUXR087413; Tue, 17 Jun 2025 14:35:30 GMT (envelope-from git) Date: Tue, 17 Jun 2025 14:35:30 GMT Message-Id: <202506171435.55HEZUXR087413@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: 6d8cfd29d477 - main - RELNOTES: Correct hash for member_ifaddrs change 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: 6d8cfd29d477c64376b3e286946cddb93c7373c5 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6d8cfd29d477c64376b3e286946cddb93c7373c5 commit 6d8cfd29d477c64376b3e286946cddb93c7373c5 Author: Ed Maste AuthorDate: 2025-06-17 14:33:04 +0000 Commit: Ed Maste CommitDate: 2025-06-17 14:34:54 +0000 RELNOTES: Correct hash for member_ifaddrs change PR: 287587 Reported by: Graham Perrin Event: Kitchener-Waterloo Hackathon 202506 Fixes: 8ff7c4d56f21 ("RELNOTES: document bridge(4) member_ifaddrs change") Sponsored by: The FreeBSD Foundation --- RELNOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELNOTES b/RELNOTES index efac884e45f5..133d68f87df0 100644 --- a/RELNOTES +++ b/RELNOTES @@ -15,7 +15,7 @@ cd240957d7ba for localhost) is now disabled by default. This functionality can be re-enabled by setting the net.inet.ip.connect_inaddr_wild sysctl to 1. -4d618f6ced86 +b61850c4e6f6 The bridge(4) sysctl net.link.bridge.member_ifaddrs now defaults to 0, meaning that interfaces added to a bridge may not have IP addresses assigned. Refer to bridge(4) for more information. From nobody Tue Jun 17 15:50:42 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 4bMBD252tYz5yTjP; Tue, 17 Jun 2025 15:50:42 +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 4bMBD24Tytz3pP6; Tue, 17 Jun 2025 15:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175442; 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=zS54zQMnEIY88q/bG2xAef5YAO5Bk1pux6UwrI4pRlU=; b=NV705OZQzgkR8ilhcDmHIsHyh9wRck7RKsFLBf0Kcvd0mUEaWvu+UPMEHihMWFkqD1DSmy Bcw2jRdCLvE8mWe4RpqS9pmdVPnWhG6nu4/mxCgwntGmERC6IHFs4Ra9MaOfm1LwODm32K 8qDasLhNM9kZfKxcuKcCGkxstqCKMjXm4oHZN6l1DGYkWJ7BT2n1PE53+zGJe4mXGcRhWD fgD7duisE3XW54EiGL9gNYyBBKaT7iAG+sVOY2+BtjuGWAgeVXH7+idlACxlqktbuHSL4f XE9fJuxG6yBZJLzbLXHYio4jBEWVqD5nkwLNWbTcQ0YVdCsqAcTPq1fixcmppg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175442; 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=zS54zQMnEIY88q/bG2xAef5YAO5Bk1pux6UwrI4pRlU=; b=j+/ULCvpxg1dcKusMO/cZmEGbDXDihZMkZRPbpW3hK8Hc6FlMubwvSoyM9y0jcLKdqa9WH TXdZaOjOhVP7KDZtwakAtK5sA5+o66PGeLZaC2vXEI3B3uQTDFtpfeu5s7zxwMqcgz1cT7 ATp/vMjZYxcBLNmlJVmZyov0O5INpQubT3GL5qMTu75QI7amiqicBRZQIrkkgMG7j3W2TK qVmfnb9651Ys+hSu2RR25TTDtjIdeFecnTY4mtBP1FPzGRdv38V2uPhVwua7ouzNClKCAp pbbchWC+wy/uCUqb7FAmw8DuBL26FE2V1xqBd8d5NR5A85aI2MhbBiqHXuKlIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175442; a=rsa-sha256; cv=none; b=s0+5o6QNdzdT19B8xgy8DwR6tc3aS/ZxhEM9V2WvL0DiK0XBMdelA4eE9VnpXi7vMGklp7 I/e6uOOj28X/G6RDLdXDGbAmobDuLF5OvENl3bq360OKgyWSntKrE/8l1wSQ36RIOb3SWo J1xAgqdLPXk3scxZwtL1iGSIBET5JIUGgCZUoqbIA18k0clv+jWzwCYpIPQJl8U/RrKCAN jFtX20BLpudH8ZAdSWT19WT6mKwWC48Ecw1bYinx/bSXLeSzo7I9eqXABMRlMvM+RGhyKc KsIGEVQbx62ED4s0uqpTY/9Uc5+9axLF8wZ2fPbdgatoxX2yIJwhzd8qGK5k7Q== 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 4bMBD23xhvzqTH; Tue, 17 Jun 2025 15:50:42 +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 55HFogR4029453; Tue, 17 Jun 2025 15:50:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFogd3029450; Tue, 17 Jun 2025 15:50:42 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:50:42 GMT Message-Id: <202506171550.55HFogd3029450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6538742c1aac - main - tcp: rename syncookie_lookup() into syncookie_expand() and make it bool 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6538742c1aaca3ce522ccea95007dfa9686c78dd Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6538742c1aaca3ce522ccea95007dfa9686c78dd commit 6538742c1aaca3ce522ccea95007dfa9686c78dd Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:01 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:50:01 +0000 tcp: rename syncookie_lookup() into syncookie_expand() and make it bool This function always returns the same pointer it was passed. With new name and return type the code is easier to understand. Mark the hash bucket argument as pointer to const, since function doesn't modify it, just uses value as integer. No functional changes. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50895 --- sys/netinet/tcp_syncache.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 606d808676e1..bcbc028cfbdc 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -131,10 +131,10 @@ static void syncache_timer(void *); static uint32_t syncookie_mac(struct in_conninfo *, tcp_seq, uint8_t, uint8_t *, uintptr_t); static tcp_seq syncookie_generate(struct syncache_head *, struct syncache *); -static struct syncache - *syncookie_lookup(struct in_conninfo *, struct syncache_head *, - struct syncache *, struct tcphdr *, struct tcpopt *, - struct socket *, uint16_t); +static bool syncookie_expand(struct in_conninfo *, + const struct syncache_head *, struct syncache *, + struct tcphdr *, struct tcpopt *, struct socket *, + uint16_t); static void syncache_pause(struct in_conninfo *); static void syncache_unpause(void *); static void syncookie_reseed(void *); @@ -1112,7 +1112,8 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, goto failed; } bzero(&scs, sizeof(scs)); - sc = syncookie_lookup(inc, sch, &scs, th, to, *lsop, port); + if (syncookie_expand(inc, sch, &scs, th, to, *lsop, port)) + sc = &scs; if (locked) SCH_UNLOCK(sch); if (sc == NULL) { @@ -2251,8 +2252,8 @@ syncookie_generate(struct syncache_head *sch, struct syncache *sc) return (iss); } -static struct syncache * -syncookie_lookup(struct in_conninfo *inc, struct syncache_head *sch, +static bool +syncookie_expand(struct in_conninfo *inc, const struct syncache_head *sch, struct syncache *sc, struct tcphdr *th, struct tcpopt *to, struct socket *lso, uint16_t port) { @@ -2282,7 +2283,7 @@ syncookie_lookup(struct in_conninfo *inc, struct syncache_head *sch, /* The recomputed hash matches the ACK if this was a genuine cookie. */ if ((ack & ~0xff) != (hash & ~0xff)) - return (NULL); + return (false); /* Fill in the syncache values. */ sc->sc_flags = 0; @@ -2343,7 +2344,7 @@ syncookie_lookup(struct in_conninfo *inc, struct syncache_head *sch, sc->sc_port = port; TCPSTAT_INC(tcps_sc_recvcookie); - return (sc); + return (true); } #ifdef INVARIANTS @@ -2352,11 +2353,12 @@ syncookie_cmp(struct in_conninfo *inc, struct syncache_head *sch, struct syncache *sc, struct tcphdr *th, struct tcpopt *to, struct socket *lso, uint16_t port) { - struct syncache scs, *scx; + struct syncache scs, *scx = NULL; char *s; bzero(&scs, sizeof(scs)); - scx = syncookie_lookup(inc, sch, &scs, th, to, lso, port); + if (syncookie_expand(inc, sch, &scs, th, to, lso, port)) + scx = &scs; if ((s = tcp_log_addrs(inc, th, NULL, NULL)) == NULL) return (0); From nobody Tue Jun 17 15:50:43 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 4bMBD401RGz5yTgb; Tue, 17 Jun 2025 15:50:44 +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 4bMBD35QbJz3pbK; Tue, 17 Jun 2025 15:50:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175443; 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=QDPqAoiBMz9tzeAjjHh6brdQbM28CZ6Nw6fWhcmu98c=; b=A3v+z8WepoC0n2Qyk8YBreImrnPidpRQ36PUPmLIcZMNGxS89EdCO9t2Sq2VAfXwF88hQC Kpq2rR0RSQDljsgBEDJvrf5vAuPIiGJtYh3DWdJKJNErSpZKw5PKu28BnDhQqgiWuZxADK JkZs4wPzJAKenguzxaW/ImEfr+kvn4buNGByBYl9jKkyCZ1mTdwZISXDX8NA7LDkd5gSFI 139ZlzgKOXn4CmahTkBN1N2c6T6mpKskHPD/x++Tdrf/lKXGTBVUUMmcRts5uQjnFE/O9y X0b3BzqSFpkTnsAWYpHDT6mdmBKXrOysNL3MyVOEPE2QjzyN/FL3qtUq4vj2Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175443; 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=QDPqAoiBMz9tzeAjjHh6brdQbM28CZ6Nw6fWhcmu98c=; b=GKMCorNYxXIo6mOSEn7PCwcIfYPizYH/wzBvXvoGJ0M0fe7FJJhEVj2BJRRkrmpdHzoc50 YEpVhgY7Pi7gHPKeoGscUtPqqxpqYwek8CssYANfsL+LcoCvV/PdXgJsJmZjvnoiWyCYyT KgPSmzphO2r34aZqjKEu8hHKpQ6daMYiZ296fQ3bC20RrGO42NHYVRBk4Z1AccI/cpedkE wkYXC5V3hvtTMIzZcW4aTfqEBJGFWryQ+EdFIpQ36az6sZra9HmP/EEdt0gYucDxpK0Jjs pEG7953GV0l1gks2HQqZSLUtVj0MBLMHuUfEPCXUyK4Mdd+uu5Al/RboBC9Tdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175443; a=rsa-sha256; cv=none; b=SSPzs+Zjl16Pvtmd2y76hu4HRsofLzF3SIqINcLUcopOLzEIoYBkYn2Crx4qQ9Dh+4CzPQ z84nBr0Ityq5E9wieyMYf7BpEOsff1yRweakR/y4h2YtYnE6oxyrYBcqL6GS1h8IdzKyMe YRfQjUdfx5IKkyXxa+AcoR04QrMioRfEm55Pv4yypcQVIoX6k2yKSIA6UvS9rYkQJe1+U7 7TGMra2RL7bh/xbsBM+tpghykG0Oyx1Wj0EqewYomm2rQgqUD9nA0xwOCU7WWK4PO1p7Up kG/Lj4+EF4MiMRetoKCUtfWHWc3+3EceX3yH34jPM0/QGVDS9GgGiH5+dBQEaQ== 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 4bMBD351RLzqJc; Tue, 17 Jun 2025 15:50:43 +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 55HFohcg029486; Tue, 17 Jun 2025 15:50:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFohfV029483; Tue, 17 Jun 2025 15:50:43 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:50:43 GMT Message-Id: <202506171550.55HFohfV029483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e9e6a025b452 - main - tcp: refactor debug function syncookie_cmp() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9e6a025b4523c9aa2885e892495601964e03056 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e9e6a025b4523c9aa2885e892495601964e03056 commit e9e6a025b4523c9aa2885e892495601964e03056 Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:08 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:50:08 +0000 tcp: refactor debug function syncookie_cmp() - Don't bzero() the test structure. All fields checked are set by syncache_expand(). - Don't allocate TCP address logging string if there is nothing to report. - Mark hash bucket argument as pointer to const. - Make it void. Differential Revision: https://reviews.freebsd.org/D50896 --- sys/netinet/tcp_syncache.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index bcbc028cfbdc..2832825f0c40 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -139,9 +139,10 @@ static void syncache_pause(struct in_conninfo *); static void syncache_unpause(void *); static void syncookie_reseed(void *); #ifdef INVARIANTS -static int syncookie_cmp(struct in_conninfo *inc, struct syncache_head *sch, - struct syncache *sc, struct tcphdr *th, struct tcpopt *to, - struct socket *lso, uint16_t port); +static void syncookie_cmp(struct in_conninfo *, + const struct syncache_head *, struct syncache *, + struct tcphdr *, struct tcpopt *, struct socket *, + uint16_t); #endif /* @@ -2348,43 +2349,43 @@ syncookie_expand(struct in_conninfo *inc, const struct syncache_head *sch, } #ifdef INVARIANTS -static int -syncookie_cmp(struct in_conninfo *inc, struct syncache_head *sch, +static void +syncookie_cmp(struct in_conninfo *inc, const struct syncache_head *sch, struct syncache *sc, struct tcphdr *th, struct tcpopt *to, struct socket *lso, uint16_t port) { - struct syncache scs, *scx = NULL; + struct syncache scs; char *s; bzero(&scs, sizeof(scs)); - if (syncookie_expand(inc, sch, &scs, th, to, lso, port)) - scx = &scs; + if (syncookie_expand(inc, sch, &scs, th, to, lso, port) && + (sc->sc_peer_mss != scs.sc_peer_mss || + sc->sc_requested_r_scale != scs.sc_requested_r_scale || + sc->sc_requested_s_scale != scs.sc_requested_s_scale || + (sc->sc_flags & SCF_SACK) != (scs.sc_flags & SCF_SACK))) { - if ((s = tcp_log_addrs(inc, th, NULL, NULL)) == NULL) - return (0); + if ((s = tcp_log_addrs(inc, th, NULL, NULL)) == NULL) + return; - if (scx != NULL) { - if (sc->sc_peer_mss != scx->sc_peer_mss) + if (sc->sc_peer_mss != scs.sc_peer_mss) log(LOG_DEBUG, "%s; %s: mss different %i vs %i\n", - s, __func__, sc->sc_peer_mss, scx->sc_peer_mss); + s, __func__, sc->sc_peer_mss, scs.sc_peer_mss); - if (sc->sc_requested_r_scale != scx->sc_requested_r_scale) + if (sc->sc_requested_r_scale != scs.sc_requested_r_scale) log(LOG_DEBUG, "%s; %s: rwscale different %i vs %i\n", s, __func__, sc->sc_requested_r_scale, - scx->sc_requested_r_scale); + scs.sc_requested_r_scale); - if (sc->sc_requested_s_scale != scx->sc_requested_s_scale) + if (sc->sc_requested_s_scale != scs.sc_requested_s_scale) log(LOG_DEBUG, "%s; %s: swscale different %i vs %i\n", s, __func__, sc->sc_requested_s_scale, - scx->sc_requested_s_scale); + scs.sc_requested_s_scale); - if ((sc->sc_flags & SCF_SACK) != (scx->sc_flags & SCF_SACK)) + if ((sc->sc_flags & SCF_SACK) != (scs.sc_flags & SCF_SACK)) log(LOG_DEBUG, "%s; %s: SACK different\n", s, __func__); - } - if (s != NULL) free(s, M_TCPLOG); - return (0); + } } #endif /* INVARIANTS */ From nobody Tue Jun 17 15:50:44 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 4bMBD51mTVz5yTdV; Tue, 17 Jun 2025 15:50:45 +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 4bMBD46LCKz3pV1; Tue, 17 Jun 2025 15:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175444; 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=b2ZP4fo/kkcOn5t2209cF1e5KpXGmUYtQYsF28LSJxU=; b=kxzvQz8UQ9HQiIyJF2BtgWhiKFYbtLpAnhlWMFnq8n1/JPy2+YXrqZMHCF+KXPSf6rFjC/ H0t2FmIXNaS11bmj0o+6+8lQwas2YgUbaITj35vdFT5lHQW4BqvW3PomkFWkaQ85+sBOyQ DzoIXUXctq5qVs3vJOe8fySIsqlxJMedKgtP0bunGE3hbNkAZy8DD1qsfT98s6PaX86Mlb MdBlGOGNhYQ8jQPYzj5+YrDa2VwBCMrmXA/rTj3mclZfmnsWOMw4JZwMecP3ly6P9i0xws L1/5GWWm79k9z44xm5eUaxlsZ3aI8xgOTWekBIXjTUrFmkXGB+jG3+iXUPWxog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175444; 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=b2ZP4fo/kkcOn5t2209cF1e5KpXGmUYtQYsF28LSJxU=; b=iCeWvmQ0DmJqjPPRREZWVxoggLYG0p3NmlUrh2Q+tVFzDr0JHRVzR5ap9nYFft7B5xMoRp elcknZceczPXZ48uSXBPNA9+4LLvs6JGVLe/Gb09OJb/zQgkCaqvtQR+gF16MM2XUxsPXh e8GMR/8qPnsjE3StVQI0rBemUR6Np5wa4s4EpaeFz3V/kQNHw/KrYgcgdbNusw1r8GM8+T MNNajo5KJo3vmoTS3A3HhkRUn7tJHQ+1M3NnnS5p7JJfg2rCS+Sz2mUCwJyNM9osTiXYmj AoSqJcf1lesnG7OGoGGRsy6IKCsdyTusbxR7ILmfqxsb2HTlJTKLspmwY4/hzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175444; a=rsa-sha256; cv=none; b=wpff2Aw8XG3/fIBYGfi/Fp5EAL4XaHJxCgeWbvCaUvDoUJLg0bqCZ+E/kSqGbeEconTL9K Evl6b2Sh4Ifw4UyGUCx5xlq/d6GCbQPLFqzR+5hDnXkM9SZe6b59xkhGXgeFK08UXkBp4/ 4DkIYKOxdr4cOSaSqYxwhlxg5SBalJgXQAmbVS8gdgUy8OerQWYs0g8LQDA48ILy4WH5Vy vbbNUaSnN6AEmYt1HEF8huh8Deu7I2SMSr5B/UYOdiCVKsg7t+HDYlYfvHm9j1buCxIBn5 EZYjpkqCfQeRrrQQwCQebn4US1VvwE+g2clWBxXO0YPCQR6JwnBDlLbhKDfz2g== 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 4bMBD45xvgzqTJ; Tue, 17 Jun 2025 15:50:44 +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 55HFoicw029519; Tue, 17 Jun 2025 15:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFoica029516; Tue, 17 Jun 2025 15:50:44 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:50:44 GMT Message-Id: <202506171550.55HFoica029516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3ed8d5645dd4 - main - tcp: increase tcps_sc_recvcookie only in the syncache_expand() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ed8d5645dd42a7c080ba800cf6d25cb7e147d7e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed8d5645dd42a7c080ba800cf6d25cb7e147d7e commit 3ed8d5645dd42a7c080ba800cf6d25cb7e147d7e Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:17 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:50:17 +0000 tcp: increase tcps_sc_recvcookie only in the syncache_expand() The syncookie_expand() is called from syncookie_cmp() in INVARIANTS mode to confirm that values calculated via syncookies mechanism match those stored in the syncache entry. This creates a counting bug, that with INVARIANTS every successful use of syncache also counts as use of a syncookie. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50897 --- sys/netinet/tcp_syncache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 2832825f0c40..f7dfed78b0eb 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1113,8 +1113,10 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, goto failed; } bzero(&scs, sizeof(scs)); - if (syncookie_expand(inc, sch, &scs, th, to, *lsop, port)) + if (syncookie_expand(inc, sch, &scs, th, to, *lsop, port)) { sc = &scs; + TCPSTAT_INC(tcps_sc_recvcookie); + } if (locked) SCH_UNLOCK(sch); if (sc == NULL) { @@ -2344,7 +2346,6 @@ syncookie_expand(struct in_conninfo *inc, const struct syncache_head *sch, sc->sc_port = port; - TCPSTAT_INC(tcps_sc_recvcookie); return (true); } From nobody Tue Jun 17 15:50:45 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 4bMBD62BBsz5yTFN; Tue, 17 Jun 2025 15:50:46 +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 4bMBD60DLcz3pjS; Tue, 17 Jun 2025 15:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175446; 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=DxduWcxV/HhgJZ7h9ojc2iIo9Ly3HL2cFfeL7NE5+CY=; b=b2X8wUr3kWCvunEIR8+7VstlY2+SAQ3HtYLSY2oIYUOl7eINxQ6Ix0d2w7Eqj68i+Al35U IRzE9t2+TRdWumYn46TCFexrfkJQ7y57IqZtp1ERSWcHWDk2UCn0tbQWSdfYozJ48x5waO gUmhLoVHPeIa3Ftd9QzALnuks0vKnqpdzWoqtZhecScUKJUfLcq1dXKV8SoJLAoIkR8CBP mgxxzMli7S+inNfBITkck/dThMNLdwxVrpZ8mC3XFF9JoDyv0C31qG/tBT9tf1oXka2/LQ 2HbLfAu1xS6yg7Kno7UZHPF5MsFcnI1WTjrGmN01G90q0d5aqTc5MH07vBhFwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175446; 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=DxduWcxV/HhgJZ7h9ojc2iIo9Ly3HL2cFfeL7NE5+CY=; b=uwOvXy15i4uvHUmCBWXg/R8OK1VkkOUGPJYB3aGzkR8OJxjRp47y4ie8EULIeCW5zipNqi NIuzyLa3kC12XYIEIowHHiodlI7pVPyU6CfXkpR5PAASTI2e3VHYFz0NRqU3VyXFOB7p27 s2hfxiurA2IgyMDnZq08Lauu+tWNvTWxfWOGqkvWvYFnA68rauAFtAtnITc1Kkt57EXGw5 vANgIdbgwhMtVYs7EjAheJj3w6HP9HJR03dzzS4hf0dAWZ6PHid+vNB8hO7tRq/ZWLHwYi A4b7LbJCjrtrvthTf5I6pb+6DAE12jY+FpKB/dfse80qxKzSP3I0GVmqqXUcXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175446; a=rsa-sha256; cv=none; b=H35yvQRJfXC99WsjgbaClTCgHM19SfLaJLxA4WIFN/sB022xGrIjh3zjxSnCqelvFitmaX 3ArU8k951BSrFdhWAeMXIE8VSvJQ+dx9p2HyuRlR+UOZuwt+fERTk2Xy1j3LwnTxWM9ODv 73fZ4JttcF72wwsY8CA3m1khegmDNYqJTFZ5ybfYbvVPzPNdmMrd9/i+hkah3uY9c+dXut UHLI+YGjabyfKPOz9aKmDINYGN2BoB2/UOHz1Ee0mVXunD4/qfMVPpT7t8FOyUygJSjwKr Fef2bnJoftu8HKB55ToTSFtdx61uphNxLyNpeTjWXlatrF5GPd5ZuPcITFq4+Q== 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 4bMBD56v9lzqTK; Tue, 17 Jun 2025 15:50:45 +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 55HFojdU029560; Tue, 17 Jun 2025 15:50:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFojQ1029557; Tue, 17 Jun 2025 15:50:45 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:50:45 GMT Message-Id: <202506171550.55HFojQ1029557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0809d26de24d - main - tcp: unlock before syncookie_expand() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0809d26de24defdc4a2ae161357566c02dc163d1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0809d26de24defdc4a2ae161357566c02dc163d1 commit 0809d26de24defdc4a2ae161357566c02dc163d1 Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:23 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:50:23 +0000 tcp: unlock before syncookie_expand() The function doesn't need a lock on sch. It uses the pointer as value for the SipHash calculation. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50898 --- sys/netinet/tcp_syncache.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index f7dfed78b0eb..24ef871c953a 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1112,14 +1112,13 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, s, __func__); goto failed; } + if (locked) + SCH_UNLOCK(sch); bzero(&scs, sizeof(scs)); if (syncookie_expand(inc, sch, &scs, th, to, *lsop, port)) { sc = &scs; TCPSTAT_INC(tcps_sc_recvcookie); - } - if (locked) - SCH_UNLOCK(sch); - if (sc == NULL) { + } else { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Segment failed " "SYNCOOKIE authentication, segment rejected " From nobody Tue Jun 17 15:50:46 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 4bMBD773J7z5yTdX; Tue, 17 Jun 2025 15:50:47 +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 4bMBD717WFz3px5; Tue, 17 Jun 2025 15:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175447; 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=lu9WPOZeOGThhLKKQBJFSPx+Bn6jQMs/TtHX4hjLsCM=; b=S1G6JuXYQXXYi/cOtJEiu+3rN0iYXfRUjT51hi/PIo7JrsV9dS98GfmpH8uN86eTdzv0N9 lrGRis/ZIc3cV35nlVlg9URuzx5/M+zNnuSaJtitaYXd9ltkyogp4cQctA2YArhU8e89qs yCOh4cedoOd4d6QowUT1K9I/a1j8oGNOO7ZCUprU6AXQMbya089qJIDPy18KbhPfozAiga OXOvNRLIwO2jVE+XhkMKc99VRfPxcKMeFWCjC+CZHj6CQdnbjFaB43DzF1gLbouxcQKxwk IMRT7sGQPikVQfehHKUqL8qOyGTnvYbniyhWtrYIrMr9uzF8pmX1QNUqLNGVOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175447; 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=lu9WPOZeOGThhLKKQBJFSPx+Bn6jQMs/TtHX4hjLsCM=; b=qQ6qkzhHe+wrEHoQu5Yv1u0vTbIIzATKq5917MPRVx3CeB4el7ykKjc/FzXS9oXS8fchV+ qhLUxPJVbUuR5zrfQ1e4t4YYezOhnHjYVoHF+Nw49hPVcBfd0YcPTw6xOsavvba+e1aJk5 8ow3mpSVPlrHIBhghAEI2FXxdVVEtrJxPtahYtXjUfaGKZdzOd/av9qx1pbX3cuDt5JrS3 uBYvuclxd/gNwlws7s6log91c6+gcioF1+bvFqX2Eo12cgiQs9F7oWxLmCVd4y4y44XNka 06rRZI/hmOk7IFmSs9z5FuXtoZNw7rOpMKcttgFB0rMIHb/SRIWWcbsRQ5O9Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175447; a=rsa-sha256; cv=none; b=rR9+nvap6xvX+SBQypHPPGa9OIpb2GRfceFVMMayHbB0JqO5Fnn+r3q4QTobHNFEgklKrR iiDAwrUrKHbvnnbb2Fu0Z/ffWbnFgQWyB/dTdDJMAhosvj+eEia8UG/7Ve+iS3AB0ocDGv afihx93Hlfx9ShKa37gyTeAtfQ1dZDuhTRjPLsFMoeDqciJzDKB2cRDnUGuRGd2/+MXelH aH5fMcuNXjuM9PL/z0jnIIeN5kCCzLc1Dk2J2kvDYMeXOjysCxFFOKTkq1RjtogLYmUPSn U/7Bd3nb4swVHEuuGYciRIsPv58n2CPuhlO1oAGNd1zoKaEkMKzPEg1hDobozQ== 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 4bMBD70WfKzqW6; Tue, 17 Jun 2025 15:50:47 +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 55HFokMH029593; Tue, 17 Jun 2025 15:50:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFokc9029590; Tue, 17 Jun 2025 15:50:46 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:50:46 GMT Message-Id: <202506171550.55HFokc9029590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1396e87a37b6 - main - tcp: count two previously ignored kinds of syncookie failures 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1396e87a37b6d4545d2c7579c31d81d96ba8b816 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1396e87a37b6d4545d2c7579c31d81d96ba8b816 commit 1396e87a37b6d4545d2c7579c31d81d96ba8b816 Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:29 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:50:29 +0000 tcp: count two previously ignored kinds of syncookie failures Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50899 --- sys/netinet/tcp_syncache.c | 3 +++ sys/netinet/tcp_var.h | 2 ++ usr.bin/netstat/inet.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 24ef871c953a..69217ca39ee4 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1097,6 +1097,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, */ if (locked && !V_tcp_syncookies) { SCH_UNLOCK(sch); + TCPSTAT_INC(tcps_sc_spurcookie); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Spurious ACK, " "segment rejected (syncookies disabled)\n", @@ -1106,6 +1107,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, if (locked && !V_tcp_syncookiesonly && sch->sch_last_overflow < time_uptime - SYNCOOKIE_LIFETIME) { SCH_UNLOCK(sch); + TCPSTAT_INC(tcps_sc_spurcookie); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Spurious ACK, " "segment rejected (no syncache entry)\n", @@ -1119,6 +1121,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, sc = &scs; TCPSTAT_INC(tcps_sc_recvcookie); } else { + TCPSTAT_INC(tcps_sc_failcookie); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Segment failed " "SYNCOOKIE authentication, segment rejected " diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 4d49f5d2a954..d8822c40b17e 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1015,6 +1015,8 @@ struct tcpstat { uint64_t tcps_sc_zonefail; /* zalloc() failed */ uint64_t tcps_sc_sendcookie; /* SYN cookie sent */ uint64_t tcps_sc_recvcookie; /* SYN cookie received */ + uint64_t tcps_sc_spurcookie; /* SYN cookie spurious, rejected */ + uint64_t tcps_sc_failcookie; /* SYN cookie failed, rejected */ uint64_t tcps_hc_added; /* entry added to hostcache */ uint64_t tcps_hc_bucketoverflow;/* hostcache per bucket limit hit */ diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 269afa42e079..139ff9294fde 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -768,8 +768,12 @@ tcp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) p1a(tcps_sc_unreach, "\t\t{:unreachable/%ju} {N:/unreach}\n"); p(tcps_sc_zonefail, "\t\t{:zone-failures/%ju} {N:/zone failure%s}\n"); p(tcps_sc_sendcookie, "\t{:sent-cookies/%ju} {N:/cookie%s sent}\n"); - p(tcps_sc_recvcookie, "\t{:receivd-cookies/%ju} " + p(tcps_sc_recvcookie, "\t{:received-cookies/%ju} " "{N:/cookie%s received}\n"); + p(tcps_sc_spurcookie, "\t{:spurious-cookies/%ju} " + "{N:/spurious cookie%s rejected}\n"); + p(tcps_sc_failcookie, "\t{:failed-cookies/%ju} " + "{N:/failed cookie%s rejected}\n"); xo_close_container("syncache"); From nobody Tue Jun 17 15:53:30 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 4bMBHH0S7Wz5yTbD; Tue, 17 Jun 2025 15:53:31 +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 4bMBHG4NLHz3rsT; Tue, 17 Jun 2025 15:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175610; 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=RjVD5AWuCv8SPGq8CEKs+3uyMhbKPTcXor0xiL9tQRU=; b=eCAxLifcmNCXySI/DMir3P/b1xPxnFSx3QONbvHW56IMRsjchjiiK3pMf22Fn04cmyYCwc lB0BDm8Fd3Ye5tGhSLjtf8XmrE9ptX4L8V/k2mEZIa9ZgO7eztCWnVuNLu5s6dbjmVopm/ iIudqTGjxuxy161bszGw61iEqmHr8ukfeV1YAcXZ4vbjOs2lwCgUs6LYVEvTrbCjQHJOx5 OZbjE8MUUuF75jlw1iUe1aaVlTTaz6Xac35WAkNzHaW0EtfAYlZdO25R9Er7GWYBtfALkg xpqOj53+MJpRmm6w8LJsPvWHAuoqEf+3vZ1tJQ0xtk+cpLId1rO4ddeJpGMA/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175610; 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=RjVD5AWuCv8SPGq8CEKs+3uyMhbKPTcXor0xiL9tQRU=; b=lYtUfRsJHySdUc8Z2zDTbOajCDOvWtEKEYGdO25Nf+nCRVf3sVg4eaQTcM9908buxGWoWT JVRTYHOPszAJiV9u9vnDW0SwShuPBzLx6dWgmU7tTR/zOfA3i/wTlABRIzfxedgsDrAI+X YQuLOli95vb6N9jUEydwub3ZJCDmNjBgGz/01gSF2WWG4JdtLhucr4OtVybxl3QIY5H6G8 EZpnj2IJ+XeDEVWaVNR2emUkxMXFqm5sYE0miammz3bZpG2s3CnNDCG+9i8PaNqPH39wnx XGKP1WQvL+JbFmwY5Tz2b5BnGAXOXhJY7iCl31F8C/MNnSr/J1HFqGlVSB8hRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175610; a=rsa-sha256; cv=none; b=rR19zuVEzUQy8YlZvM1j1p/ZNS8YRLNCkHC1hZ8yonhchYq2DnOq6y2ewJIFgFocYqIxAi gnuRiQaNZ7jtvqgIg5j19CI/P6BNfg6CNDBjHvDG8uTP2m3LzpEzJERRertPw2v3vpI++7 COIgmcKMKI+D+j9ugoPRvKrbBTM3yJZqrIIIu3tfGeyNgdQSSXQuWFcWNqBxcMY1Gc0wVC XJlUjnbMdZUd/ye00HrPGgvkeQOEKV28D3v5TTcXTD4RmYQeYdC0NYlWx4pcWO+JbYPA68 qIkQ8OAM0oH+59bNac8UTdP5ghTaDUVIyEKY1Hn+Imxl8DgdkVmYVNTY8axP6Q== 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 4bMBHG3nSJzr2K; Tue, 17 Jun 2025 15:53:30 +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 55HFrUPH037887; Tue, 17 Jun 2025 15:53:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFrUk9037884; Tue, 17 Jun 2025 15:53:30 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:53:30 GMT Message-Id: <202506171553.55HFrUk9037884@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: 4f33d073003c - main - tests: Update for jemalloc's option parsing 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: 4f33d073003ccd91390709e14e5c1bf1f0c1c85c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4f33d073003ccd91390709e14e5c1bf1f0c1c85c commit 4f33d073003ccd91390709e14e5c1bf1f0c1c85c Author: Ed Maste AuthorDate: 2025-06-17 15:33:33 +0000 Commit: Ed Maste CommitDate: 2025-06-17 15:52:17 +0000 tests: Update for jemalloc's option parsing MALLOC_OPTIONS=J -> MALLOC_CONF=junk:true PR: 287357 Reviewed by: markj Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50910 --- bin/sh/tests/execution/func1.0 | 4 ++-- tools/regression/bpf/bpf_filter/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/sh/tests/execution/func1.0 b/bin/sh/tests/execution/func1.0 index 0dfd341f9099..bfcdd67ceb4c 100644 --- a/bin/sh/tests/execution/func1.0 +++ b/bin/sh/tests/execution/func1.0 @@ -1,3 +1,3 @@ -MALLOC_OPTIONS=J ${SH} -c 'g() { g() { :; }; :; }; g' && -MALLOC_OPTIONS=J ${SH} -c 'g() { unset -f g; :; }; g' +MALLOC_CONF=junk:true ${SH} -c 'g() { g() { :; }; :; }; g' && +MALLOC_CONF=junk:true ${SH} -c 'g() { unset -f g; :; }; g' diff --git a/tools/regression/bpf/bpf_filter/Makefile b/tools/regression/bpf/bpf_filter/Makefile index a02f2cbd5710..4daecb73ebcb 100644 --- a/tools/regression/bpf/bpf_filter/Makefile +++ b/tools/regression/bpf/bpf_filter/Makefile @@ -63,7 +63,7 @@ all: ${TEST_CASES} .if defined(BPF_BENCHMARK) @-time ${.CURDIR}/${TEST} .else - @-env MALLOC_OPTIONS=J ${.CURDIR}/${TEST} + @-env MALLOC_CONF=junk:true ${.CURDIR}/${TEST} .endif @rm -f ${.CURDIR}/${TEST} .endfor From nobody Tue Jun 17 15:54:34 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 4bMBJV29Kcz5yTpf; Tue, 17 Jun 2025 15:54:34 +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 4bMBJV1Rcxz3sKt; Tue, 17 Jun 2025 15:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175674; 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=d2QCbhzJYkAxhPPp1VpkVBYW2c2ptSj7yvAFrri4txk=; b=eH1GRUHNKfIvL3vgO1fHKlMkgeCyffLlgvoj5Pe29evqUj0Gax4VTRuhAWmTKTmpfx3Xfy xAPBnHNLvIJp+DQbsYbEDjptK3TyWy5cNC5ggDRofPlttMsf7/NsdaKMKvP87UvNrtbrKY ez2RbwT8n4F0EEqjOh/34DnM0WvKM+hQJhgEyFo8gJMeg6x2pSLnebDQaEHx0HRnMrQG8q WAhdl4Ttg3Y89D8j3L1w0C9Fl4s1S3OHUM6NPSXkvkhnhJoLF09xjF6iserciMyapuVt42 QogbyHmXRAz6Wkh9yQ6VjJF2eamQVwMRunrEUA68XAo5veZ78KRvXupFREDbnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175674; 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=d2QCbhzJYkAxhPPp1VpkVBYW2c2ptSj7yvAFrri4txk=; b=rcVO0CvZzrFVoQz+UXSDzAklTrigUfNGd3XmBHdx4KJwaQVRkXwPCC/Vn0OEiruBIINXZD DTEwWf2MDEXH4Xw+27RhM2Glr9de0zGbp84+CeVkzIinT80vQHTEfyDngYSiR4wk7EdkVV 8ONsf0O/eRDXkkb/HwruK3iZbQhlMblI/mobtVQpLQj2yJ5a6X2c/bdhShagk9eDlse1Ot LEmh6UPvZR4jMEAf+jFSai5sUyvikm8gQqKUuB/SfUCTycgWw7NpfSXhWvT82+mrp2MBOr 2iwKxI9GiJBXoQ7kK9L7w+Mmvm1eeXrsnwQKQX7GO2WOSSo2RnGWyIU1L9tORg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175674; a=rsa-sha256; cv=none; b=s/ML3lKbUZ7NB0jqw23ECUKlcx5Wa/tM6MgsJ2oNdke8cqDhiD8m5CRbQ0YDi/Urpw3nPJ cdfs7DdwSJ4R3IznjAuYuFBLVYe85QuHIsASaCllnKXye4C/yfdw/+dHcnU4fRabE+J68Z VXKkLtbn1eDaQtWrtGqnE8M23sBVfRxPDXvXshBt9NEUDmjlbu5JtvFlq7CrhUCDepxgdx 70Wqtqa2qHk8AOqMkBbxC11+W0dbPCoM/tJp8VX17Qm76YzMXUwf4fDReR5g64MM4hnO4p lYdZBCi4iMCiREKVUB81U0tCf6+s1W474PFMw7icTJPCRiZIWvHI1PfhHAeNqQ== 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 4bMBJV11HRzqJv; Tue, 17 Jun 2025 15:54:34 +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 55HFsYOE038352; Tue, 17 Jun 2025 15:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFsYsk038349; Tue, 17 Jun 2025 15:54:34 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:54:34 GMT Message-Id: <202506171554.55HFsYsk038349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: faa6aa7723aa - main - tcp: remove CTLFLAG_NEEDGIANT from sysctl(9) handlers related to timers 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faa6aa7723aa1af0aa0128acde2814563b4372d3 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=faa6aa7723aa1af0aa0128acde2814563b4372d3 commit faa6aa7723aa1af0aa0128acde2814563b4372d3 Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:52:18 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:54:18 +0000 tcp: remove CTLFLAG_NEEDGIANT from sysctl(9) handlers related to timers They all just modify a global word sized variable via sysctl_msec_to_ticks(), which is wrapper around sysctl_handle_int(). Note, they all were marked with CTLFLAG_NEEDGIANT in 7029da5c36f2 merely because it was not obvious whether they are mpsafe or not. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50890 --- sys/netinet/tcp_timer.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 4d8dafaec31d..f1d864d33bd6 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -74,39 +74,33 @@ #include int tcp_persmin; -SYSCTL_PROC(_net_inet_tcp, OID_AUTO, persmin, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, persmin, CTLTYPE_INT | CTLFLAG_RW, &tcp_persmin, 0, sysctl_msec_to_ticks, "I", "minimum persistence interval"); int tcp_persmax; -SYSCTL_PROC(_net_inet_tcp, OID_AUTO, persmax, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, persmax, CTLTYPE_INT | CTLFLAG_RW, &tcp_persmax, 0, sysctl_msec_to_ticks, "I", "maximum persistence interval"); int tcp_keepinit; -SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit, CTLTYPE_INT | CTLFLAG_RW, &tcp_keepinit, 0, sysctl_msec_to_ticks, "I", "time to establish connection"); int tcp_keepidle; -SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle, CTLTYPE_INT | CTLFLAG_RW, &tcp_keepidle, 0, sysctl_msec_to_ticks, "I", "time before keepalive probes begin"); int tcp_keepintvl; SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINTVL, keepintvl, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - &tcp_keepintvl, 0, sysctl_msec_to_ticks, "I", + CTLTYPE_INT | CTLFLAG_RW, &tcp_keepintvl, 0, sysctl_msec_to_ticks, "I", "time between keepalive probes"); int tcp_delacktime; SYSCTL_PROC(_net_inet_tcp, TCPCTL_DELACKTIME, delacktime, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, - &tcp_delacktime, 0, sysctl_msec_to_ticks, "I", + CTLTYPE_INT | CTLFLAG_RW, &tcp_delacktime, 0, sysctl_msec_to_ticks, "I", "Time before a delayed ACK is sent"); VNET_DEFINE(int, tcp_msl); @@ -116,20 +110,17 @@ SYSCTL_PROC(_net_inet_tcp, OID_AUTO, msl, "Maximum segment lifetime"); int tcp_rexmit_initial; -SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_initial, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_initial, CTLTYPE_INT | CTLFLAG_RW, &tcp_rexmit_initial, 0, sysctl_msec_to_ticks, "I", "Initial Retransmission Timeout"); int tcp_rexmit_min; -SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_min, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_min, CTLTYPE_INT | CTLFLAG_RW, &tcp_rexmit_min, 0, sysctl_msec_to_ticks, "I", "Minimum Retransmission Timeout"); int tcp_rexmit_slop; -SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_slop, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_slop, CTLTYPE_INT | CTLFLAG_RW, &tcp_rexmit_slop, 0, sysctl_msec_to_ticks, "I", "Retransmission Timer Slop"); @@ -144,8 +135,7 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, fast_finwait2_recycle, CTLFLAG_RW, "Recycle closed FIN_WAIT_2 connections faster"); int tcp_finwait2_timeout; -SYSCTL_PROC(_net_inet_tcp, OID_AUTO, finwait2_timeout, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, finwait2_timeout, CTLTYPE_INT | CTLFLAG_RW, &tcp_finwait2_timeout, 0, sysctl_msec_to_ticks, "I", "FIN-WAIT2 timeout"); @@ -162,8 +152,7 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, rexmit_drop_options, CTLFLAG_RW, "Drop TCP options from 3rd and later retransmitted SYN"); int tcp_maxunacktime = TCPTV_MAXUNACKTIME; -SYSCTL_PROC(_net_inet_tcp, OID_AUTO, maxunacktime, - CTLTYPE_INT|CTLFLAG_RW | CTLFLAG_NEEDGIANT, +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, maxunacktime, CTLTYPE_INT | CTLFLAG_RW, &tcp_maxunacktime, 0, sysctl_msec_to_ticks, "I", "Maximum time (in ms) that a session can linger without making progress"); From nobody Tue Jun 17 15:54:35 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 4bMBJW6Dyyz5yTmG; Tue, 17 Jun 2025 15:54:35 +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 4bMBJW2jdLz3sKv; Tue, 17 Jun 2025 15:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175675; 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=SMAbZanhQaz7but9WF6DGOFFB6jTzX7Nr+PBLwfghYE=; b=tuW3CewdZjnqY/MLEyulsrPdM9E5RgIP8s+mEDcFV2Ds8c3Yrwx6lJs8AoPyZAh7hqhzxW obQpUwSVbdgEmM6pWgrm8KKvp5u4bITsvAEQhaopCLN5Z6rkUdtZkx1G81k2c23TUBxZwu BNpEzM7jVKUhd7Qw25WJ92Bb7DewXUXTWp1rbn0CeqnS75YkXfl0dWi/N4KIbt4LXHRiAg xTCk5vau+xvV6M2riJQIQQZM+kLZSCvDXLy6tHyfP0iNvphH2djLl9vI53+9R1tnT7hyXp E8NLabg5zsoB7iev6aNN+pgtLTGLybNogQEn016Nz90UMCtPFSyfGKoKxyXLbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175675; 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=SMAbZanhQaz7but9WF6DGOFFB6jTzX7Nr+PBLwfghYE=; b=nyvAN5+ud/n8QhvPqaMt2cHlOGe1Rg0dISKYLKKo1vTeMlZ8chFjuj8IDb7Wmac6Ri8lLd pEy+OGG7XTUlNf55r+9ctrFhrDJ97xm9x9XxT6KLceDD6o+YavA4x5aUY0HvV3Gn2DvKss qgn2hysMkF0J2xAGeFhyzt0Sadr6hh74kpaq2U56y4TIhZSzZYBFq2yIcpcSeb3oHfwQY9 o9zQrzrSAC9ngrBX2aBOaVD3YN/jXnX+viAsy4sbYtBfyiqkm745m6AHI0yv1m2u7gJP+A sLOzxcON60NqAj/MFPjg0Vx8J6maJPLX+/hYhgF2s7RR2+Se4aIgjnUKoY0gvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175675; a=rsa-sha256; cv=none; b=jz39D73hegTGZXfzjX1e733rqm/wskoqLbvD2Xn+tkjJ7ujG9OyuYmmDZ9pMIRxW/JU9M3 /e3Om7ZfVBHd0xgay6w3Cg+g3JTut/ekMXwDjfbZpugbVEzSDSNteLRzwP2eu5OfL9OTcN 5nBhslB5p3YHhqUD0uwzDEszmzms+Vgn/YSPjt6+oCD6+PmFD7kErgOrAGVNUQkOQp03Ry TS/sDoKzJJHBddB5v3WbLjEgs5Wq7p+v2yDwp8u9o7u45oN3MZZhjW5Jk0paDzAhpJj2b6 CQam3Mxwat6yEO0h1DTysTy/WVlaJUysOW0p2WlJzfJArmWxeVpRFD7HpGibFw== 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 4bMBJW2GPjzqmF; Tue, 17 Jun 2025 15:54:35 +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 55HFsZJe038394; Tue, 17 Jun 2025 15:54:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFsZR8038391; Tue, 17 Jun 2025 15:54:35 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:54:35 GMT Message-Id: <202506171554.55HFsZR8038391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 552d17804629 - main - tcp: provide sysctl for the maximum retransmission timeout 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 552d17804629685a5b6b8fdc01f17e97d77e716c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=552d17804629685a5b6b8fdc01f17e97d77e716c commit 552d17804629685a5b6b8fdc01f17e97d77e716c Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:53:41 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:54:18 +0000 tcp: provide sysctl for the maximum retransmission timeout Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50891 --- share/man/man4/tcp.4 | 14 +++++++++++--- sys/netinet/tcp_input.c | 4 ++-- sys/netinet/tcp_stacks/bbr.c | 2 +- sys/netinet/tcp_stacks/rack.c | 2 +- sys/netinet/tcp_subr.c | 4 +++- sys/netinet/tcp_syncache.c | 2 +- sys/netinet/tcp_timer.c | 8 ++++++-- sys/netinet/tcp_timer.h | 1 + 8 files changed, 26 insertions(+), 11 deletions(-) diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index d53d8086e8c0..4c00c78bb2b1 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 10, 2025 +.Dd June 16, 2025 .Dt TCP 4 .Os .Sh NAME @@ -871,10 +871,13 @@ segment is lost (default and maximum is 12). .It Va rexmit_drop_options Drop TCP options from third and later retransmitted SYN segments of a connection. -.It Va rexmit_initial , rexmit_min , rexmit_slop +.It Va rexmit_initial , rexmit_min , rexmit_slop , rexmit_max Adjust the retransmit timer calculation for .Tn TCP . -The slop is +A new connection starts with timer set to +.Va rexmit_initial . +The +.Va rexmit_slop typically added to the raw calculation to take into account occasional variances that the .Tn SRTT @@ -894,6 +897,11 @@ For this reason, we use 200ms of slop and a near-0 minimum, which gives us an effective minimum of 200ms (similar to .Tn Linux ) . The initial value is used before an RTT measurement has been performed. +The +.Va rexmit_min +and +.Va rexmit_max +set minimum and maximum timer values that a connection may have. .It Va rfc1323 Implement the window scaling and timestamp options of RFC 1323/RFC 7323 (default is 1). diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 1c617b85ef89..7c032e13f37a 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -383,7 +383,7 @@ cc_conn_init(struct tcpcb *tp) } TCPT_RANGESET(tp->t_rxtcur, ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1, - tp->t_rttmin, TCPTV_REXMTMAX); + tp->t_rttmin, tcp_rexmit_max); } if (metrics.hc_ssthresh) { /* @@ -3732,7 +3732,7 @@ tcp_xmit_timer(struct tcpcb *tp, int rtt) * the minimum feasible timer (which is 2 ticks). */ TCPT_RANGESET(tp->t_rxtcur, TCP_REXMTVAL(tp), - max(tp->t_rttmin, rtt + 2), TCPTV_REXMTMAX); + max(tp->t_rttmin, rtt + 2), tcp_rexmit_max); /* * We received an ack for a packet that wasn't retransmitted; diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 17a0744961ce..e2cfec5c9275 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -10150,7 +10150,7 @@ bbr_init(struct tcpcb *tp, void **ptr) tcp_change_time_units(tp, TCP_TMR_GRANULARITY_TICKS); TCPT_RANGESET(tp->t_rxtcur, ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1, - tp->t_rttmin, TCPTV_REXMTMAX); + tp->t_rttmin, tcp_rexmit_max); bbr_start_hpts_timer(bbr, tp, cts, 5, 0, 0); return (0); } diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 1d4bc3124058..0388d73098a0 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -6347,7 +6347,7 @@ activate_tlp: if (to < rack_tlp_min) { to = rack_tlp_min; } - if (to > TICKS_2_USEC(TCPTV_REXMTMAX)) { + if (to > TICKS_2_USEC(tcp_rexmit_max)) { /* * If the TLP time works out to larger than the max * RTO lets not do TLP.. just RTO. diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index f766bf25ad66..7cd2168d262b 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1052,7 +1052,8 @@ tcp_default_fb_init(struct tcpcb *tp, void **ptr) if (tp->t_rxtshift == 0) tp->t_rxtcur = rexmt; else - TCPT_RANGESET(tp->t_rxtcur, rexmt, tp->t_rttmin, TCPTV_REXMTMAX); + TCPT_RANGESET(tp->t_rxtcur, rexmt, tp->t_rttmin, + tcp_rexmit_max); /* * Nothing to do for ESTABLISHED or LISTEN states. And, we don't @@ -1478,6 +1479,7 @@ tcp_init(void *arg __unused) tcp_rexmit_min = TCPTV_MIN; if (tcp_rexmit_min < 1) tcp_rexmit_min = 1; + tcp_rexmit_max = TCPTV_REXMTMAX; tcp_persmin = TCPTV_PERSMIN; tcp_persmax = TCPTV_PERSMAX; tcp_rexmit_slop = TCPTV_CPU_VAR; diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 69217ca39ee4..80e6b53d10df 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -443,7 +443,7 @@ syncache_timeout(struct syncache *sc, struct syncache_head *sch, int docallout) else TCPT_RANGESET(rexmt, tcp_rexmit_initial * tcp_backoff[sc->sc_rxmits], - tcp_rexmit_min, TCPTV_REXMTMAX); + tcp_rexmit_min, tcp_rexmit_max); sc->sc_rxttime = ticks + rexmt; sc->sc_rxmits++; if (TSTMP_LT(sc->sc_rxttime, sch->sch_nextc)) { diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index f1d864d33bd6..a9046e5725d5 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -119,6 +119,11 @@ SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_min, CTLTYPE_INT | CTLFLAG_RW, &tcp_rexmit_min, 0, sysctl_msec_to_ticks, "I", "Minimum Retransmission Timeout"); +int tcp_rexmit_max; +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_max, CTLTYPE_INT | CTLFLAG_RW, + &tcp_rexmit_max, 0, sysctl_msec_to_ticks, "I", + "Maximum Retransmission Timeout"); + int tcp_rexmit_slop; SYSCTL_PROC(_net_inet_tcp, OID_AUTO, rexmit_slop, CTLTYPE_INT | CTLFLAG_RW, &tcp_rexmit_slop, 0, sysctl_msec_to_ticks, "I", @@ -618,8 +623,7 @@ tcp_timer_rexmt(struct tcpcb *tp) rexmt = tcp_rexmit_initial * tcp_backoff[tp->t_rxtshift]; else rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift]; - TCPT_RANGESET(tp->t_rxtcur, rexmt, - tp->t_rttmin, TCPTV_REXMTMAX); + TCPT_RANGESET(tp->t_rxtcur, rexmt, tp->t_rttmin, tcp_rexmit_max); /* * We enter the path for PLMTUD if connection is established or, if diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 52994c43e8e7..875f1584988c 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -163,6 +163,7 @@ extern int tcp_maxunacktime; /* max time without making progress */ extern int tcp_maxpersistidle; extern int tcp_rexmit_initial; extern int tcp_rexmit_min; +extern int tcp_rexmit_max; extern int tcp_rexmit_slop; extern int tcp_ttl; /* time to live for TCP segs */ extern int tcp_backoff[]; From nobody Tue Jun 17 15:54:36 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 4bMBJX5x26z5yTmM; Tue, 17 Jun 2025 15:54:36 +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 4bMBJX3qMHz3sbj; Tue, 17 Jun 2025 15:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175676; 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=FyPiWnQFewtCZK9qSsbVs2wSupY01Uwe9mU2n7WV0qw=; b=PvbetbYWMVbWlC/HNsa8SlC88UKQTrnc0iFYiA+hojBlefd5NwRIbjKh6628CPafap5Hs7 dNBbCq6Se9pdl6IWTCfnpq0elJax2HUzE5INYkfcnIv4uVOMa+A204Z5kfMSQm4vs+cCwZ qKevIA6hogMwBDoLQa8zP0Q0SVC7yDvvX43dWAqpi6OBAk0/l578P0oUsmcBBpy3S/wjvn OFDxfyWeNlAb3uAqdc9aiYc+1/vqlPsvtntaDAaq6N0qyYqny3svYxiMhYpC8m7wDgCcdQ nPnSkd83mK6xt4PFcC+JsyAkeR+lZisI+YDVowzmFekgCw/3Ny4VRejxjt7Vsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175676; 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=FyPiWnQFewtCZK9qSsbVs2wSupY01Uwe9mU2n7WV0qw=; b=xvYusKRCRBYtMG+Jr5vgdFLQl+qwUqPX4prG9PCBINmvTBbvuFGtSMjITuyXs/PnrContK TOfKaSOQrvL4iWhpu5UNl2TwHIOsZ61jpmSmT67JmXzbJ5aBiOcWwuhp2wR9IM02Malamx Mrw9lTNtK32Oe09ovIGIDXIzZXeitH878PrRnyZ6eqHVR7M1+Cly9tPUzDCsXyJSdnji2W gt/7Vq5N1Gl6avgNpL9SBCDqcQp+mfpYQStwfiqdeXpN6PUQvIEwUFOHbteV+t5rcVjnsU 9ecZL/fJCZrg6XyXVyR8+x5Qwm20nJLu8pCMvT+NSNcxjISwQvMWabMnJznZTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175676; a=rsa-sha256; cv=none; b=xJ0HUoMK7qZcwlXHOEtvq3h/Cg3SBf4pHNBh4+9S+PNvjEuCVm6htbhUODMF4I1n4gmNi/ IPZBaoqgGNNGC/o5kdrifOvEdWhzbUm180JNpLXVNG45TJFnNb8iLOEHzINKRtDLI349in GudRUPTT+ZosT8U14fqXkmEZuFDVEHE3p8OFehMqih6rWnXmpJaSW8tzFrDf3c/6yGXr9w EXWWeH2m1TKdPdf2rF4j2UrODboHIXpbSDRKsyz8nFGsjbqmIoeBna7NC6YXjhuw149idu a+YGsnqiiDHAw/J+rVSVOYWbjIt8Bh5WYLLYVr9JP9yx8OTEGnkbhCv2PCLUlA== 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 4bMBJX3BTczqmG; Tue, 17 Jun 2025 15:54:36 +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 55HFsaCv038431; Tue, 17 Jun 2025 15:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFsa5B038428; Tue, 17 Jun 2025 15:54:36 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:54:36 GMT Message-Id: <202506171554.55HFsa5B038428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: df4b9fa460ab - main - snmp_mibII: use sysctl(3) to read min/max TCP retransmission timeouts 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df4b9fa460ab7f31d11b046d6f3335be101bc576 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=df4b9fa460ab7f31d11b046d6f3335be101bc576 commit df4b9fa460ab7f31d11b046d6f3335be101bc576 Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:53:50 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:54:18 +0000 snmp_mibII: use sysctl(3) to read min/max TCP retransmission timeouts Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50892 --- contrib/bsnmp/snmp_mibII/mibII_tcp.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/contrib/bsnmp/snmp_mibII/mibII_tcp.c b/contrib/bsnmp/snmp_mibII/mibII_tcp.c index e6d5920d9f88..551db06e9f0f 100644 --- a/contrib/bsnmp/snmp_mibII/mibII_tcp.c +++ b/contrib/bsnmp/snmp_mibII/mibII_tcp.c @@ -36,7 +36,6 @@ #include #include #include -#include #include struct tcp_index { @@ -51,7 +50,8 @@ static uint64_t tcps_states[TCP_NSTATES]; static struct xinpgen *xinpgen; static size_t xinpgen_len; static u_int tcp_total; - +static int tcp_rexmit_min; +static int tcp_rexmit_max; static u_int oidnum; static struct tcp_index *tcpoids; @@ -90,6 +90,28 @@ fetch_tcp_stats(void) return (-1); } + len = sizeof(tcp_rexmit_min); + if (sysctlbyname("net.inet.tcp.rexmit_min", &tcp_rexmit_min, &len, + NULL, 0) == -1) { + syslog(LOG_ERR, "net.inet.tcp.rexmit_min: %m"); + return (-1); + } + if (len != sizeof(tcp_rexmit_min)) { + syslog(LOG_ERR, "net.inet.tcp.rexmit_min: wrong size"); + return (-1); + } + + len = sizeof(tcp_rexmit_max); + if (sysctlbyname("net.inet.tcp.rexmit_max", &tcp_rexmit_max, &len, + NULL, 0) == -1) { + syslog(LOG_ERR, "net.inet.tcp.rexmit_max: %m"); + return (-1); + } + if (len != sizeof(tcp_rexmit_max)) { + syslog(LOG_ERR, "net.inet.tcp.rexmit_max: wrong size"); + return (-1); + } + tcp_stats_tick = get_ticks(); return (0); @@ -211,16 +233,13 @@ op_tcp(struct snmp_context *ctx __unused, struct snmp_value *value, value->v.integer = 4; /* Van Jacobson */ break; -#define hz clockinfo.hz - case LEAF_tcpRtoMin: - value->v.integer = 1000 * TCPTV_MIN / hz; + value->v.integer = tcp_rexmit_min; break; case LEAF_tcpRtoMax: - value->v.integer = 1000 * TCPTV_REXMTMAX / hz; + value->v.integer = tcp_rexmit_max; break; -#undef hz case LEAF_tcpMaxConn: value->v.integer = -1; From nobody Tue Jun 17 16:10:11 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 4bMBfY72Ptz5yVs1; Tue, 17 Jun 2025 16:10:13 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMBfY6Bdmz3xZp; Tue, 17 Jun 2025 16:10:13 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750176613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yfuuCShOMHK1hBhZGj356WzmT9pMoAPPBSZYB1YRIn8=; b=XAq7t+AnkrGzl1Wn9zGVGNeiZideLIEDAZndI7kRb5eeCHvKvizv45MyymuHg1OCVbNDzi yFLeeWux/8w3M+wdcOHnQ+JSDGgj4e5QxPtr97UIMoPogEGtFrz1bjQjQPrWHaHyPFDcGB 5baLL+05c6xLiDpb8LRGvel+wRTmRm8sHkzyey9bKBTDPcRnlHA7jl7KvHeDnUoGp9hrya Rt2J0g6uUCqIeBA9xf6Ei2ee7134xmjrsOUled40TstYXEOIJG7lrt+SrgmeLeKDYDC9Km yjrMYT685NENiZ/Xos4CSdyMo7ZHOMkzIowpM2BhAZaY3uy4d/LtxNGx/GKTMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750176613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yfuuCShOMHK1hBhZGj356WzmT9pMoAPPBSZYB1YRIn8=; b=ripdJrmGWYPi+0nUohZlIKj+/E13FA2TGPEDhJtgiVLgepdAhmj2+qZtn3ynWKdrXZugzB vae7m6wx+Su8efv+k5fa/ghJ1VEvEpPggz2gIDR9RorXNbgn7ZowjzOuXoHC+PsPRjl52N TWIxarKOgDnpsQ23s/Afha2Cr6YaUbPVV+HkETnYGtOyr7MNOd8sD3b+J68qgPo9UHT2yk j09h1IqCjmHTmu8oZk4YhWO2Q7dUkvxE62LTvdxofM5XX/HsXOHBKB9bRpNJhGHlowosr7 s/bmQS6L+01TdeQaRZIMiK3b/eB0g5giZdV+sdgm/VfFi3Y7NLnwO4XmFwh8yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750176613; a=rsa-sha256; cv=none; b=Dmwbbh+WlMVURJFz7vBgtUHb/BJFZHhePlTym1o0KZjdaKMfWSLLZeBBlTgxDth+kLyO3F gxvdF5SsiT3VnNLM1fwd58s9OpPWvJUcJzaQ4ntMFCl46CcsrUEc0ZeWdIeh9CtuXCK2uK V/R/R0lsU+ztsNfgmHdtz/D4HOkNMrAeUHo/zLNBdeaT34HZ02dpp3lHj7cahw3BPGLFNp A7DmQxA4wuAxuXWMDwl1DHihRu5MC4UogT0ZBNnoqgLdFwY7YWUO6+apYkm0X1tblljAjI 2RRVLI1FLu4ESChlxxiM8SvPA/M2hEQ2BGr1jevuOJibftC02KtgX/33IMBOzw== Received: from b.nours.eu (b.nours.eu [54.38.177.57]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bMBfY4rbsz38t; Tue, 17 Jun 2025 16:10:13 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by b.nours.eu (Postfix, from userid 1001) id 8E010137F8A; Tue, 17 Jun 2025 18:10:11 +0200 (CEST) Date: Tue, 17 Jun 2025 18:10:11 +0200 From: Baptiste Daroussin To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 552d17804629 - main - tcp: provide sysctl for the maximum retransmission timeout Message-ID: References: <202506171554.55HFsZR8038391@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202506171554.55HFsZR8038391@gitrepo.freebsd.org> On Tue 17 Jun 15:54, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=552d17804629685a5b6b8fdc01f17e97d77e716c > > commit 552d17804629685a5b6b8fdc01f17e97d77e716c > Author: Gleb Smirnoff > AuthorDate: 2025-06-17 15:53:41 +0000 > Commit: Gleb Smirnoff > CommitDate: 2025-06-17 15:54:18 +0000 > > tcp: provide sysctl for the maximum retransmission timeout > > Reviewed by: tuexen > Differential Revision: https://reviews.freebsd.org/D50891 This breaks pkgbase building: /home/pkgbuild/worktrees/main/sys/netinet/tcp_syncache.c:1100:4: error: use of undeclared identifier 'sdt_mib_tcp_count_tcps_sc_spurcookie'; did you mean 'sdt_mib_tcp_count_tcps_sc_sendcookie'? 1100 | TCPSTAT_INC(tcps_sc_spurcookie); | ^ /home/pkgbuild/worktrees/main/sys/netinet/tcp_var.h:1111:27: note: expanded from macro 'TCPSTAT_INC' 1111 | #define TCPSTAT_INC(name) TCPSTAT_ADD(name, 1) | ^ /home/pkgbuild/worktrees/main/sys/netinet/tcp_var.h:1108:3: note: expanded from macro 'TCPSTAT_ADD' 1108 | MIB_SDT_PROBE1(tcp, count, name, (val)); \ | ^ /home/pkgbuild/worktrees/main/sys/sys/sdt.h:361:29: note: expanded from macro 'MIB_SDT_PROBE1' 361 | #define MIB_SDT_PROBE1(...) SDT_PROBE1(mib, __VA_ARGS__) | ^ Best regards, Bapt From nobody Tue Jun 17 16:11:30 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 4bMBh25qwnz5yW5y; Tue, 17 Jun 2025 16:11:30 +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 4bMBh22jKqz40QZ; Tue, 17 Jun 2025 16:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750176690; 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=fnh2w605+A69fvGgR0USaT3gR4xjghQ8DeVjSTrbxI4=; b=Es2isIb58LQXk7pEUAOVcbazK+P6Ln/DXVLttfvUKt7iQ8ArKMGn4s27YpzgTc+P/CS/cL qWGYC1dGwCU+dG3fhj9g/zZbuz8wjBxIvC9f8etMbejIzhlu1esrJFowE/cjDblpszOiJ4 8hFlnug7i5Ou+hkhMKQVKcmkD+H/Ldv3Dp2w1WPucWVkIEsoPnEBIuYCVukX3WqESvNnbF DUq787RfdUMBab2sAkk5RWVKKkAefT81Oy9OkTmyw4Bz/JhDiusNHOKtIus/t68FZMetv7 FXLs2vtkgXaG2MPqOE8kv3WbrVFDk145T+UyI5UZikcWOJlPRKIPLwVCSB08rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750176690; 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=fnh2w605+A69fvGgR0USaT3gR4xjghQ8DeVjSTrbxI4=; b=FU1wtX/3Hfo0XAgDH0frFcR1LxMQLrVNdLOejunDjrQJVJTpXX7tN+vdDxrEnmWCT3t/R1 x+QZzxSxjy9mQOq1GU4mzekGtdeXibkj8d+UVNLABD9rO9OUzpLr8DH+JcQYIGhjmEG/2e PGlR5U8eY5esQKOCE18FMwZwJiahtfRm7M9yA29iz3LqGXq5mQ4bk1bt1T83Qj0Ry520cD LLUSZuIL6tKjOrsREtO4rWa/o8++WlrvrrYyvLg+zZyhZc9gIEn/tatcbbB7j8Hd0LCrN3 bQkSmuuGKuyhqDI3WtYGN9wRC2BBW0PQ2MDOsxGcp3KCa8yG9o6b5YyQ7C9SjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750176690; a=rsa-sha256; cv=none; b=ACakMhEsoRXU6Deab7KKhSo9mM7Fg7YKf+GT+Vul+mBmbT3nQqhFkguwtr6GllmLWT81Oq mIG2I8dfS6xGURVNALY3nSHlN1uPHHFLN3zLA8G6KkEAN7TW1TimN4F92j0+mtQvH/ojCl VRSM7E0UwPzPxjzKuEOW1UhEInFl51p6b7oe+h+srwoHp2xu1BSPhX8b+q1VOT1p9l3byJ bBX52MGQm5b5UABYiwPzSs+NuIWvWmKcvJmUd6cNuB5z93J/opA3OQGrq2Hi5TwYU4zUO6 mPeAIdIp4dEgW63nfSFouHab/cDCpY3pZi1quAyhrrQubebqkFmAkXHITIiKJQ== 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 4bMBh223ZfzrHQ; Tue, 17 Jun 2025 16:11:30 +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 55HGBUma074807; Tue, 17 Jun 2025 16:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HGBUQu074804; Tue, 17 Jun 2025 16:11:30 GMT (envelope-from git) Date: Tue, 17 Jun 2025 16:11:30 GMT Message-Id: <202506171611.55HGBUQu074804@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: c54534e60263 - main - capsicum.4: Add some more detail from the Capsicum paper 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: c54534e60263954fac4db5ebb041ed4597df1195 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c54534e60263954fac4db5ebb041ed4597df1195 commit c54534e60263954fac4db5ebb041ed4597df1195 Author: Ed Maste AuthorDate: 2025-06-14 17:57:33 +0000 Commit: Ed Maste CommitDate: 2025-06-17 16:09:53 +0000 capsicum.4: Add some more detail from the Capsicum paper Adapt some language from "Capsicum: practical capabilities for UNIX" https://www.cl.cam.ac.uk/research/security/capsicum/papers/2010usenix-security-capsicum-website.pdf Reviewed by: markj Discussed with: rwatson Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50855 --- share/man/man4/capsicum.4 | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/share/man/man4/capsicum.4 b/share/man/man4/capsicum.4 index 6aefae9d6df2..31e6f02b8893 100644 --- a/share/man/man4/capsicum.4 +++ b/share/man/man4/capsicum.4 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 5, 2025 +.Dd June 17, 2025 .Dt CAPSICUM 4 .Os .Sh NAME @@ -37,6 +37,12 @@ .Nm is a lightweight OS capability and sandbox framework implementing a hybrid capability system model. +.Nm +is designed to blend capabilities with UNIX. +This approach achieves many of the benefits of least-privilege operation, while +preserving existing UNIX APIs and performance, and presents application authors +with an adoption path for capability-oriented design. +.Pp Capabilities are unforgeable tokens of authority that can be delegated and must be presented to perform an action. .Nm @@ -59,6 +65,34 @@ namespaces) is restricted; only explicitly delegated rights, referenced by memory mappings or file descriptors, may be used. Once set, the flag is inherited by future children processes, and may not be cleared. +.Pp +Access to system calls in capability mode is restricted: some system calls +requiring global namespace access are unavailable, while others are +constrained. +For instance, +.Xr sysctl 2 +can be used to query process-local information such as address space layout, +but also to monitor a system’s network connections. +.Xr sysctl 2 +is constrained by explicitly marking ≈60 of over 15000 parameters as permitted +in capability mode; all others are denied. +.Pp +The system calls which require constraints are +.Xr sysctl 2 , +.Xr shm_open 2 +.Pq which is permitted to create anonymous memory objects but not named ones +and the +.Xr openat 2 +family of system calls. +The +.Xr openat 2 +calls already accept a file descriptor argument as the directory to perform the +.Xr open 2 , +.Xr rename 2 , +etc. relative to; in capability mode the +.Xr openat 2 +family of system calls are constrained so that they can only operate on +objects “under” the provided file descriptor. .It capabilities Limit operations that can be called on file descriptors. For example, a file descriptor returned by @@ -152,3 +186,14 @@ and .An Kris Kennaway Aq Mt kris@FreeBSD.org at Google, Inc., and .An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net . +Portions of this manual page are drawn from +.Rs +.%A Robert N. M. Watson +.%A Jonathan Anderson +.%A Ben Laurie +.%A Kris Kennaway +.%T Capsicum: practical capabilities for UNIX +.%J USENIX Security Symposium +.%D August 2010 +.%O DOI: 10.5555/1929820.1929824 +.Re From nobody Tue Jun 17 16:47:02 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 4bMCTC3MSNz5yXdl; Tue, 17 Jun 2025 16:47:11 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4bMCTB4hXMz4DCK; Tue, 17 Jun 2025 16:47:10 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sdaoden.eu; s=citron; t=1750178823; x=1750845489; h=date:author:from:to:cc:subject: message-id:in-reply-to:references:mail-followup-to:openpgp:blahblahblah: mime-version:content-type:content-transfer-encoding:author:from:subject: date:to:cc:resent-author:resent-date:resent-from:resent-sender:resent-to: resent-cc:resent-reply-to:resent-message-id:in-reply-to:references: mime-version:content-type:content-transfer-encoding:content-disposition: content-id:content-description:message-id:mail-followup-to:openpgp: blahblahblah; bh=MqpWSVhYCpFkLdfU2AY2Nw9/i0q+PocpY6nGaj3Vsrw=; b=QGYiaJQqSfn5nS0JRzjz6eez1g0tBv8YiwpW/bASTH3HMK0mNQDSN/prf4wiw2aP6x2SX09E Ec1zesNMTR3g1xjLc3/SdPL3mCT6sQmKyVClVGWqmbR+nCzLJ4NfOCHXb6GyJ7hCEWzVAQljn/ 1AEI15szpvGm9qHdx0ZcLvw5nBZx8q2c7bwa0smj9zuO2j9x8OFRlCCfSHpwHIhQxe2U/JgAqB Q+FKIxNnxClDMPHsOuw9c7bXyIzwGqNfmorJdBsuk+wTtsKdv0OylTCOxK7XsDKfDP1DkiyooV CDFnizbAtedAN1DxP+2n7Rvma56HFYV1UzTQHQ2XfXGEtK5w== DKIM-Signature: v=1; a=adaed25519-sha256; c=relaxed/relaxed; d=sdaoden.eu; s=orange; t=1750178823; x=1750845489; h=date:author:from:to:cc:subject: message-id:in-reply-to:references:mail-followup-to:openpgp:blahblahblah: mime-version:content-type:content-transfer-encoding:author:from:subject: date:to:cc:resent-author:resent-date:resent-from:resent-sender:resent-to: resent-cc:resent-reply-to:resent-message-id:in-reply-to:references: mime-version:content-type:content-transfer-encoding:content-disposition: content-id:content-description:message-id:mail-followup-to:openpgp: blahblahblah; bh=MqpWSVhYCpFkLdfU2AY2Nw9/i0q+PocpY6nGaj3Vsrw=; b=JXwVoUzPOyPHpohKqGnfmXQs3IzRzWw8H+0nZhk7uFoKf4lOwGR4k+o461fgR9Ul4AmAh+1D umsoD5yyNHHnDw== Date: Tue, 17 Jun 2025 18:47:02 +0200 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c54534e60263 - main - capsicum.4: Add some more detail from the Capsicum paper Message-ID: <20250617164702.NrL-sA3d@steffen%sdaoden.eu> In-Reply-To: <202506171611.55HGBUQu074804@gitrepo.freebsd.org> References: <202506171611.55HGBUQu074804@gitrepo.freebsd.org> Mail-Followup-To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org User-Agent: s-nail v14.9.25-663-g0c41f463ef OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. 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: quoted-printable X-Rspamd-Queue-Id: 4bMCTB4hXMz4DCK X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] Ed Maste wrote in <202506171611.55HGBUQu074804@gitrepo.freebsd.org>: |URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc54534e60263954fac4db5ebb0= 4\ |1ed4597df1195 | |commit c54534e60263954fac4db5ebb041ed4597df1195 |Author: Ed Maste |AuthorDate: 2025-06-14 17:57:33 +0000 |Commit: Ed Maste |CommitDate: 2025-06-17 16:09:53 +0000 | | capsicum.4: Add some more detail from the Capsicum paper ... |+is constrained by explicitly marking =E2=89=8860 of over 15000 parameter= s \ That is \(~~. Not in CSTR#54, but in groff from the beginning (of my git repo (^351da0dcdf) as $ git grep -E 'approxequal|~~' 351da0dcdf 351da0dcdf:doc/chars.tr:.tr --^^~~ 351da0dcdf:doc/chars.tr:.C2 ~~ approxequal 351da0dcdf:doc/chars.tr:.C2 ~=3D approxequal 351da0dcdf:dvi/devdvi/S:~~ 815562,506590,-17698 2 0031 351da0dcdf:dvi/devdvi/texsy.map:25 ~~ 351da0dcdf:ps/devps/S:~~ 549,394 2 0273 approxequal 351da0dcdf:ps/devps/SS:--- 489,351,0,133,-7,99 2 0273 a= pproxequal 351da0dcdf:ps/devps/symbolsl.afm:C 187 ; WX 489 ; N approxequal ; B 57 12= 0 572 351 ; 351da0dcdf:ps/devps/textmap:approxequal ~~ 351da0dcdf:ps/devps/textmap:approxequal ~=3D 351da0dcdf:xditview/DviChar.c:{ "~=3D", "~~", /* 187 */}, commit 351da0dcdf702cf243d26ffa998961bce2aa8653 (tag: refs/tags/1.02) Author: James Clark AuthorDate: 1991-06-02 04:20:34 -0500 Commit: James Clark CommitDate: 1991-06-02 04:20:34 -0500 groff before CVS: release 1.02 (Fantastic, would not even know how to produce the real symbol with my keyboard!) (Not that i look all the time, it just occurred like this.) --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) From nobody Tue Jun 17 16:53:55 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 4bMCd00xWYz5VbKL; Tue, 17 Jun 2025 16:53:56 +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 4bMCcz4j0fz4JCv; Tue, 17 Jun 2025 16:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750179235; 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=bMLfI/uhE1Ike5y2sQFXX+MRSPng3B1taOXenpQDIf0=; b=IZH2hDtv0tETVz4nqfKHIc2IeBiGZ3bpHN6R9UVat0K8U6ajS320QLR587wcyNRmWS49p/ q4OfqqLwA8EQeUb/Ri+W0iu8VEBkuT74QPJbyOV0IyS4CSHwSfNigl1KZVVdbhon7VuHob JkDJVBSGBhDdNspgRvCiMqLTsXv67GO9F3eZp9QoktCfp3e18IStxxIsriQAN4yBDN917u CG2k9I18pZrPIv4LwQtzZzSShxSOcLM5w8ZkOuuV1R3FAKKwh3yUshiyTn+1C2YLsc5jzj XQ/04IolAdUv19ZjzJMwrA9lcdP3KugdtVCqe9fm3D9SRr82kBQNSV0TruX6Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750179235; 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=bMLfI/uhE1Ike5y2sQFXX+MRSPng3B1taOXenpQDIf0=; b=htrTfcnJ1UXUesxqGaZDWUVPS98NUXuum0qT+OHCa9KzYmGcsGdZSOi9GafB2Hl/j/mYA8 W1hMYmHBhgRMCXb16iSHISG1iNqzIhjJ2ogjoJgcQ06/a9arin54DBTYjo/u/HKjfTlGKb L8goV9Vy7bbMPFkRIsYUBJdJZq9i8bsCYHkT0XUY/MLEAySoN+Km7gqGXo4tG0HHpCot+p D53d5Q1GZ7g9lIJU/3VEJomeCVc9ku7kxB1awW3JLXJwHf/6Suc4MDG+oMjikQkpJ+9OID esTluWwpGKSK3eCPkXFjWOLaZgRgzBFY/aLO97WsinUtIlY310RJtfnQlGYGHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750179235; a=rsa-sha256; cv=none; b=Uhgz2qPf/zxAdyKzmlgcgzoCJMx6Xeae0cP1W3Z+F8xlMEsy/r5xYLQ1XWjgARO0lciLay dFcxjNshkf7UGkUBQkZkrvqnt41I9DTHSWoK3czjJJUJc92HaI1OfzfZeMl5bEoGkDRg73 G3LJFzkObBjE+7HyvxbqAvzqnnIkAA/STNqlNwUG9jsxqhz/B5wsz0dLURA98i9Z8XzWOE pST8/AAG/CFp/fsMn2Hw55ZrRXds6lSdDABv3mjbQQ6mlxKwiwsMTtPpPAuFlQ4JSEFXkn LAX068w89wxdWxJoWRKPWc0tCs/O11CT1SeBx5WFNB2TK/XtJoOsn/yM4PRmmg== 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 4bMCcz4CQvzs0k; Tue, 17 Jun 2025 16:53:55 +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 55HGrtte051746; Tue, 17 Jun 2025 16:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HGrtwg051743; Tue, 17 Jun 2025 16:53:55 GMT (envelope-from git) Date: Tue, 17 Jun 2025 16:53:55 GMT Message-Id: <202506171653.55HGrtwg051743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 2d300d376d5b - main - tcp: add missing SDT probes 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d300d376d5b974999d6a2471eef7565877e7508 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2d300d376d5b974999d6a2471eef7565877e7508 commit 2d300d376d5b974999d6a2471eef7565877e7508 Author: Gleb Smirnoff AuthorDate: 2025-06-17 16:46:14 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 16:52:51 +0000 tcp: add missing SDT probes Fixes: 1396e87a37b6d4545d2c7579c31d81d96ba8b816 --- sys/netinet/in_kdtrace.c | 2 ++ sys/netinet/in_kdtrace.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/netinet/in_kdtrace.c b/sys/netinet/in_kdtrace.c index 7e0b9a6a9373..de2a98ce541c 100644 --- a/sys/netinet/in_kdtrace.c +++ b/sys/netinet/in_kdtrace.c @@ -286,6 +286,8 @@ MIB_PROBE_TCP(tcps_sc_unreach); MIB_PROBE_TCP(tcps_sc_zonefail); MIB_PROBE_TCP(tcps_sc_sendcookie); MIB_PROBE_TCP(tcps_sc_recvcookie); +MIB_PROBE_TCP(tcps_sc_spurcookie); +MIB_PROBE_TCP(tcps_sc_failcookie); MIB_PROBE_TCP(tcps_hc_added); MIB_PROBE_TCP(tcps_hc_bucketoverflow); diff --git a/sys/netinet/in_kdtrace.h b/sys/netinet/in_kdtrace.h index 7b0d433c60d8..a203b660d777 100644 --- a/sys/netinet/in_kdtrace.h +++ b/sys/netinet/in_kdtrace.h @@ -278,6 +278,8 @@ SDT_PROBE_DECLARE(mib, tcp, count, tcps_sc_unreach); SDT_PROBE_DECLARE(mib, tcp, count, tcps_sc_zonefail); SDT_PROBE_DECLARE(mib, tcp, count, tcps_sc_sendcookie); SDT_PROBE_DECLARE(mib, tcp, count, tcps_sc_recvcookie); +SDT_PROBE_DECLARE(mib, tcp, count, tcps_sc_spurcookie); +SDT_PROBE_DECLARE(mib, tcp, count, tcps_sc_failcookie); SDT_PROBE_DECLARE(mib, tcp, count, tcps_hc_added); SDT_PROBE_DECLARE(mib, tcp, count, tcps_hc_bucketoverflow); From nobody Tue Jun 17 16:53:56 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 4bMCd13cxqz5VbLY; Tue, 17 Jun 2025 16:53:57 +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 4bMCd05x0Bz4J7Z; Tue, 17 Jun 2025 16:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750179236; 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=ANpIYJNAjjHRRID7LUROjBvMyBOcH19Q6kzGVEV6X7Q=; b=rmhq+jGPvHftKPe1ThOxEr4SEAaUp40q3+4pFAbNoIsteJqNOp6aA43HZEIQiJmUtlQ4P9 cEDXAa6kps6mGrC01VQudW3Sgl5aWqH2iVhsyhX0gsEGsGfhDMFztlC6GZoo4m025CbvO+ H/s+w70wSmR5+kmp+0sm/5BvTBfbxQHRd//oLY0rRD4JJD/whqMwxvSt4DJijhYrYlM+Gv z7PYQvaJP+V1LChjMD3ldHqlx7ez5KqX721HnTqrrYJz1yZvvzkowTCWR0HH3i11L2LafP tlMvokDx3qvQR6zd/hPHELTbA853HvWdmamM2qDjfCUQoGWi7neoqO314riixg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750179236; 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=ANpIYJNAjjHRRID7LUROjBvMyBOcH19Q6kzGVEV6X7Q=; b=lt5O+w+MOaj1Gs4mLTIyUkDhwMdY1do52EdACVabFY43P65AT8IdvLhn3iiActOHzlL+1S z5ElllEktGFMGifIoNORn1AOLKOvX6PpYQtbB9TtqOh77j7jnWmJzNXnlRDqvNm/Q4g8M1 myxnAs4CqTGNynvNOcDQ/enwq7cbLtA4UmgpDJ8KnYva0muULstFYjt9XyKO+MJbVmQC7A jbPm9n6ZyxHVgkGk7TFMZWbwWpySIgj5ZmNxuqSoJW4zDb4m8i1AU7Ma3mTBhl7d+MWiR0 ARl4JTupuwDwr6k7LC/v9Yn27gxsZM3n+uaVIWulblenpYhomQjRKSyz02Llyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750179236; a=rsa-sha256; cv=none; b=NeL4b+8yFL37PvDu+z7DchoWQRZjwaTI7N4wGpJNBglErhaDW3/NYnBT3cVOkad30wcA+S WX1zV5M5UwBfIUCGhWlkwmu0tgurkXawpCYx43/ak/rocZMIKrNwMiU+If0LWAdIH2G5KI /E+gGUIBhoWngEDG6qExZZWd/Qh2jpaj9y3LGIVaIdClLM2DBCkYSraCtqTWYncv/Yqbeb yt2XXjJylftAxV26O1FTt00NKfyk9YFVt41PO9WC6fUn8144LRdqbrEtGTe4W/hIbUNarD v9I2bSF/LX8OnGCibxSOxKwtCFpCMW84Mt4Bxa4yP8vcOOvTKhYehKoQkfEsaQ== 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 4bMCd0581jzs0l; Tue, 17 Jun 2025 16:53:56 +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 55HGrut7051781; Tue, 17 Jun 2025 16:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HGruXD051778; Tue, 17 Jun 2025 16:53:56 GMT (envelope-from git) Date: Tue, 17 Jun 2025 16:53:56 GMT Message-Id: <202506171653.55HGruXD051778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b59753f1d55d - main - tcp: provide a useful comment for struct tcpstat 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b59753f1d55da6c6d4b73252444212e6895ce913 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b59753f1d55da6c6d4b73252444212e6895ce913 commit b59753f1d55da6c6d4b73252444212e6895ce913 Author: Gleb Smirnoff AuthorDate: 2025-06-17 16:46:41 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 16:52:51 +0000 tcp: provide a useful comment for struct tcpstat --- sys/netinet/tcp_var.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index d8822c40b17e..da4094b8ea4c 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -927,9 +927,12 @@ struct in_conninfo; + (tp)->t_rttvar) >> TCP_DELTA_SHIFT) /* - * TCP statistics. - * Many of these should be kept per connection, - * but that's inconvenient at the moment. + * Global (per-VNET) TCP statistics. The below structure represents what we + * export to the userland, but in the kernel we have an array of counter_u64_t + * with as many elements as there are members in the structure. The counters + * shall be increased by TCPSTAT_INC() or KMOD_TCPSTAT_INC(). Adding new a + * new counter also requires adding corresponding SDT probes into in_kdtrace.h + * and into in_kdtrace.c. */ struct tcpstat { uint64_t tcps_connattempt; /* connections initiated */ From nobody Tue Jun 17 16:53:57 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 4bMCd231wxz5Vbtx; Tue, 17 Jun 2025 16:53:58 +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 4bMCd170kLz4JB3; Tue, 17 Jun 2025 16:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750179238; 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=S70c6nGMKh5Ty11CFAuXyHf0fCvFH9t1o711y/hclc0=; b=Szfs6gNdMfs+F53ErwKVWU094JYl26nKnJH8MZPtJRqU8w4q0/kNIxgG6K1jdFFNWUNMLX VDx4f8ih4z6cEgIkIJ7hR+gLKlHM5KpKFgzwKTzO7xSwvxDxobOc0SIPOuf6lBXk1gPFaK vdnwZXA05mH4XJO+6VQQcRwtrqI8kkamzXBTonrzmxtiWly0LP2Ulmtw4Aa781z2AMqFUa Vm+3Zx05TipN5oR5PpqBPhITqlY+Fznl15YNGbxOq9DDDkcYt3RnB1kYMduSBNN7e6t8Dm GqeVfCq8tRMqTA0qA6Eu7YmQtSZD/L8bgxBw8jlMfJKtrXsO9aE9UC5AnybGuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750179238; 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=S70c6nGMKh5Ty11CFAuXyHf0fCvFH9t1o711y/hclc0=; b=rDnYMdHni9sF+OPEKUEe/saJt0wQ5REiCZ15UDdo63JB2dqa29PbIgkH6e6nrEgyOnVfkr GPODvlFs1n4aVVPXNn5SkzImYRiVqw3jlgmann/85AilxbAc4zk5w2FHqQj5+oPwQz8wym 9APWSbWwoLwfGmEK6/8H3SNXBzt5f5sL41dp1MkTXAfZSl5EugMHX67OvCpJ2EG6GIREzX W85cp6zUBFwyrB9Gi1Dp0H9F7JuCgYYRVmZCTEK+BUtIdASpGeyduLUAFlFjeMzzWGcSFt r/052qQLJ2sMW+aBsNDXGXekOM7tuJe2btQDO9xQ+iz0PiesVsHUDJVnWkd1Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750179238; a=rsa-sha256; cv=none; b=EpMrBPMi7EWnvUsPzQzaG0pYDgmOs+F7rTkxI5Hz8djtJvi5feUbu+CxFBQC6wXwwwufJX cCVbjAEm2v6sLw1op8t0EMp8nhk4L0cy6fGA8AWIw/M08ZMb/RJ6QoBnlLl5RPF7+gzvcy rC1uQM+8GBnMI/CvuFxQwuBdFVkJQiKEwPf90ImO7ZpCOSYZ6Kxd09Xu8pH0cp65S6w0iv qLp4I/ulCKFhK25nUdRyvq8/h+q0/HNZZeK1oCNEVrHw67vzx7WY/Ef58GRPxw0fVXEWze S8vIrbi2rAtaZj7aHR8p9wb8MIsUbduMQz8f2VQ726MVYAnb24W/ZWgAYnNEuQ== 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 4bMCd1650dzs0m; Tue, 17 Jun 2025 16:53:57 +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 55HGrvhS051820; Tue, 17 Jun 2025 16:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HGrvZ9051817; Tue, 17 Jun 2025 16:53:57 GMT (envelope-from git) Date: Tue, 17 Jun 2025 16:53:57 GMT Message-Id: <202506171653.55HGrvZ9051817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b3d0562dd845 - main - LINT: add KDTRACE_MIB_SDT to catch inconsistencies with struct tcpstat 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3d0562dd84540be2fd98e6a457cdcb232e9f915 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b3d0562dd84540be2fd98e6a457cdcb232e9f915 commit b3d0562dd84540be2fd98e6a457cdcb232e9f915 Author: Gleb Smirnoff AuthorDate: 2025-06-17 16:47:06 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 16:53:44 +0000 LINT: add KDTRACE_MIB_SDT to catch inconsistencies with struct tcpstat Why only arm64? We want LINT coverage for kernels with DTrace and without. Global NOTES doesn't have KDTRACE_HOOKS, but most machine dependent NOTES have it. Except the x86 NOTES, which intentionally doesn't have KDTRACE_HOOKS, so that there is coverage for a kernel without DTrace. So lets use arm64, our second Tier 1 platform, to have a LINT with maximum DTrace features enabled. See also: daad0b6501359, 2f915345634e --- sys/arm64/conf/NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 5f29112d535d..e773253da6d7 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -16,6 +16,7 @@ # kernel modules. # options KDTRACE_HOOKS +options KDTRACE_MIB_SDT # # Most of the following is copied from ARM64 GENERIC. From nobody Tue Jun 17 17:23:16 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 4bMDGs1QWkz5VdpB; Tue, 17 Jun 2025 17:23:17 +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 4bMDGs0rN5z3JJL; Tue, 17 Jun 2025 17:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750180997; 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=Pb0dtvf/zonQOCcoiD7TcxsoRGE0PyeRpBGX+2thUbQ=; b=nIsRGd9lyCnD90eN0YGl+z7d9cSC1dLE/7fu1nZeu9QUzQmDVZCMn++xdpJZGTj5cA50ZS /BrDnk3WguZ6ceet7RY2jsvFIEnWbpJPEflnAi4tLtNHRuCsE05edyoUToJaGcGmEAKL3I CJ6tA4zws5W5LHqjp85SyRD2o1+zMUjc+/SiBKcfvHL8U8xjnxJfJwKoKcp199BUw9UW6U omtOBA7Pvl1cQQB6Key2PelK/77U08Q8r1/MnSQuDTOxPxu/dqU7vXgzCBVoPbOaOaEIDg drJ6P9Yea2ABMk5S4xGwMi63bHi3NtUsOLa7MEcZPxrnp08arJQEeMkzj2tyvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750180997; 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=Pb0dtvf/zonQOCcoiD7TcxsoRGE0PyeRpBGX+2thUbQ=; b=nDIOXx24706KJ3uKbgGsxlOF5UFV+/JdgGH0o1QDgjQohpqWgGii1cu9Nce60tmu5Nu6L1 UotpR7mdLBokm56LQqXybFk58J3o5RsbBRMFilWxc6YEuTDweaYgzTb1zMdlttp6FfizxH y22hd6LGwFlMakBeXwzPlnq2SqyYobcrlQhEeZ4DVdue5NkdE6raZOAJpc8koww8HoBXvM 2zgmBGfYp6L79nbu6yB4veZ+vG5Wp48YibVjRGnatNlf6v+AE0W9MNGfKKVcN9XA+NaWBU jJP15FEENMSFykYv8Y+GSNHqYcYB4+Ho9TRX7fbuBDLSrKL0OZBYFU2Ak3q9dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750180997; a=rsa-sha256; cv=none; b=o9wFprBZ5NdbhV/+K6n2qVVYE2KIXricQNBGZKth80HlXjx7oQpqbS2aPwAhR/mBcz18Ht F1WzQkL+l8LclCeJS5/oqvuTbN0FVT+6ckm9y3UzWHz7nemrs3jdwiwhvrM/Lz+Bvvjovz yoXIYM2/s/7agPYY7Yj19UwabbrXJBKZxierx2ILYmKoFyIboBT7phFVB1Ax5ZKbIr+yAe 9uFmhY9KoxLxmA7gu3WfB7PL3LjAIyv0nx4lPybW6Hhab7T2w/AATumiwNdGVIRXL/OMp5 kBmOBDTQ08KHkSy/MXsGX/UH7C59qJZSHxFiMeXwH632+D3AldouSz00cn9gew== 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 4bMDGs0RJxztGV; Tue, 17 Jun 2025 17:23:17 +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 55HHNGGB008488; Tue, 17 Jun 2025 17:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HHNGIP008485; Tue, 17 Jun 2025 17:23:16 GMT (envelope-from git) Date: Tue, 17 Jun 2025 17:23:16 GMT Message-Id: <202506171723.55HHNGIP008485@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: b8ae4def0fc0 - main - release: Refactor dist set logic 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: b8ae4def0fc088fa411e53083f10d69f2d368bac Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b8ae4def0fc088fa411e53083f10d69f2d368bac commit b8ae4def0fc088fa411e53083f10d69f2d368bac Author: Ed Maste AuthorDate: 2025-05-20 20:49:02 +0000 Commit: Ed Maste CommitDate: 2025-06-17 17:15:52 +0000 release: Refactor dist set logic Add to the METALOG immediately following the operation itself to make the logic easier to follow. Fuse adjacent identical loops. Both of these are now possible as we no longer have separate paths for NO_ROOT builds. Move MANIFEST out of the loops for disc1 and dvd1 and copy it explicitly, so that all three MANIFEST operations are identical, and shared by pkgbase and legacy code paths for disc1 and dvd1. Reviewed by: jrm Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50383 --- release/Makefile | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/release/Makefile b/release/Makefile index a7549284ac35..4de2fe5264a6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -210,20 +210,17 @@ disc1: packagesystem ${PKGBASE_REPO} mtree -c -p ${.TARGET}/usr/freebsd-packages | \ mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG -# Copy manifest only (no distfiles) to get checksums +.endif + # Copy MANIFEST to provide legacy dist checksums in both modes mkdir -p ${.TARGET}/usr/freebsd-dist - cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG + cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.else +.if !defined(PKGBASE) # Copy distfiles - mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ - do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ - done - echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ - do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ + for dist in $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); do \ + cp $${dist} ${.TARGET}/usr/freebsd-dist; \ + echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) @@ -302,20 +299,18 @@ dvd: packagesystem ${PKGBASE_REPO} mtree -c -p ${.TARGET}/usr/freebsd-packages | \ mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG -# Copy manifest only (no distfiles) to get checksums +.endif + # Copy MANIFEST to provide legacy dist checksums in both modes mkdir -p ${.TARGET}/usr/freebsd-dist - cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG + cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.else +.if !defined(PKGBASE) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v container); \ - do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ - done - echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -v container); \ - do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ + for dist in $$(ls *.txz | grep -v container); do \ + cp $${dist} ${.TARGET}/usr/freebsd-dist; \ + echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) From nobody Tue Jun 17 17:28:12 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 4bMDNX41LTz5Vf9k; Tue, 17 Jun 2025 17:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMDNX3BwDz3Kqy; Tue, 17 Jun 2025 17:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750181292; 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=nyxfcQOEhnzVDQooC0XHAuhG4WCMVxly/QuRQhYpdIg=; b=tZYBFPDhhipCvWVktBXqrMhCaTrLviKI0+NUM7PccOU6UKyCn1s3rxRJumR3a8inRjshVG bO1rBnclhojjAMIA1VaX+Bvn8Z2DTTyfnV5vSF6P+2Mlk71e1naursGqRxXF1DMIK4Z1KK PhLuEPKV5Nyot6ZkTMYuZkjCPiSt5zIHLYfYFouDrU6zLBWUskdvi7/LGRwnAYBQ7BcGiC 5Usd24YzK7qv5hhwoVIIgha/xGjGTRmHU49LRi/6T+6/YLhLlDWtW8a+8DXqPUgRzZ+l6f vK2EX81wp2K1PEGdqUW28wTLnlA32IZwA8KrBfix6rxj2xTMDQlbdFJLJHPQlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750181292; 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=nyxfcQOEhnzVDQooC0XHAuhG4WCMVxly/QuRQhYpdIg=; b=HSyMZBBy0rfHkhJ274zKBh9nz+uAgni/aj/d0mjQUQ+TDqGFPm2mNv8GYo0muY/6yvR9Vx zX0iH47qDOKqUzSpkdPS4eVEdrP159KXjCnurtkeDgOOTKbymoWCduHWPCXSPUg0GgAUEH cfh0TPMZPso6/ZgHxL0pUzabou/vOvSew95tvZkdv9EoME8T29VQ2MuxH9vbgQ/VK660va gmqtDttyOJtQxy9byqEcLo9Mxu96o/mMADVgfAcWEfHux+uL3efoY/6Wa9m3cmMI7u0UJl cHzGJJrr6Eel/m+6plnlVOl1NezuhloIkSWjgN6y75ro/6LQ21rreW+odoz4wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750181292; a=rsa-sha256; cv=none; b=SG4eTVJSJ+YwzhpwxvMCJdgMHRKMGMzioZjKf/zF2g7NSTRiQOLBCiZ79nJuGzBglFndPU LItaJCI+rGIVE3JMsw62VA9uhHdlDK9105ZET1YSREkHsGrtIHKHoghOq93zMunhctyYSM GrW4HAk8caoTVXsQs9jZWaGUGLlVPXOOJgjFRz2Lx9o0b1WN5ead1/V5xUYopqcLTj3m0X 7o91LBUadaION+Hwgb0fDY9zf34DmQCk5qOCFERHTPuIuD7DJQ1kLVHOcumNEHzb/+3TUo m11iV8COOp0CksbJTOHxTsPAPKnATEMuVKb0N6ajoGSqfDzDekfygd6f/Pbsaw== 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 4bMDNX2jRHzsmt; Tue, 17 Jun 2025 17:28:12 +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 55HHSCaq010036; Tue, 17 Jun 2025 17:28:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HHSCVx010033; Tue, 17 Jun 2025 17:28:12 GMT (envelope-from git) Date: Tue, 17 Jun 2025 17:28:12 GMT Message-Id: <202506171728.55HHSCVx010033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a7596f6c63e9 - main - snmp_mibII: gc fetching of kern.clockrate 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7596f6c63e9c7571f2446f82587b9626cab5167 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a7596f6c63e9c7571f2446f82587b9626cab5167 commit a7596f6c63e9c7571f2446f82587b9626cab5167 Author: Gleb Smirnoff AuthorDate: 2025-06-17 17:26:30 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 17:28:00 +0000 snmp_mibII: gc fetching of kern.clockrate No longer used since df4b9fa460ab. --- contrib/bsnmp/snmp_mibII/mibII.c | 15 --------------- contrib/bsnmp/snmp_mibII/mibII.h | 4 ---- 2 files changed, 19 deletions(-) diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c index 2a4e3756bdc5..59f3836d1ede 100644 --- a/contrib/bsnmp/snmp_mibII/mibII.c +++ b/contrib/bsnmp/snmp_mibII/mibII.c @@ -99,9 +99,6 @@ int mib_netsock; /* last time refreshed */ uint64_t mibarpticks; -/* info on system clocks */ -struct clockinfo clockinfo; - /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); @@ -1755,20 +1752,8 @@ mibII_start(void) static int mibII_init(struct lmodule *mod, int argc __unused, char *argv[] __unused) { - size_t len; - module = mod; - len = sizeof(clockinfo); - if (sysctlbyname("kern.clockrate", &clockinfo, &len, NULL, 0) == -1) { - syslog(LOG_ERR, "kern.clockrate: %m"); - return (-1); - } - if (len != sizeof(clockinfo)) { - syslog(LOG_ERR, "kern.clockrate: wrong size"); - return (-1); - } - if ((route = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC)) == -1) { syslog(LOG_ERR, "PF_ROUTE: %m"); return (-1); diff --git a/contrib/bsnmp/snmp_mibII/mibII.h b/contrib/bsnmp/snmp_mibII/mibII.h index e84be682d7ae..44e985eb4096 100644 --- a/contrib/bsnmp/snmp_mibII/mibII.h +++ b/contrib/bsnmp/snmp_mibII/mibII.h @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -201,9 +200,6 @@ extern int mib_iflist_bad; /* last time refreshed */ extern uint64_t mibarpticks; -/* info on system clocks */ -extern struct clockinfo clockinfo; - /* baud rate of fastest interface */ extern uint64_t mibif_maxspeed; From nobody Tue Jun 17 17:41:10 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 4bMDgV4hsqz5Vfp1; Tue, 17 Jun 2025 17:41:10 +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 4bMDgV3jcfz3Qmw; Tue, 17 Jun 2025 17:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750182070; 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=hUBxq4Vh1vP7MKARK6VdhTTf9pcH6ujCI5Yy4dmBweE=; b=TK8dzt5Hwz0pqTe1809S+xBgO0pss2eP3stRcuEDA8T720aqUMegA0abPEwUH76HX138Eu wAPQC1Aa4fKexPvndm6DLy8rWjNcuWU2JwDlxuEFO/0MebK/9yUtsMBzrcP8aMHrgomg6i Bro1PO46M/TYpsi9krM8/Yg86b/Te352csse5mxen4FfuXzDfWB1yKiRz1UztA6QS5rJR/ znaasu4qD8+BOkFW3SRb1WX9MRlhHgYOZLPClkMjl5GJFCSVCPCMhc+gnjP7LUqMtD009l OaLxto2SD7zApVSprdqVbIOZtPboAxE3URBf3m2sSmRqNGAf4OgW3uES6/GRqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750182070; 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=hUBxq4Vh1vP7MKARK6VdhTTf9pcH6ujCI5Yy4dmBweE=; b=ddAiGYDZ1gMotCSubY1BawrVxukRXTylNK29c8QbOsHDorb1fCD9PiQnW9OxBJh84hDuCz Jw300MKR8KA+c4GL6JXfYDeJiuArMQZ1wbppLVpVrIRGfDpnlcNpwVklxFnSJmaQGl0rVs m5YThXXuJ/xQUg/55En+tQy6RE/B0YLPyWtDa7x5YJvbM9quLWTYTfdL4nBUBm+r1QfGlk i4kUPoZJGtZXmj/WDL6imepclO0WIEy2/YREWcm1+BJ7ba4s4ajQVeWdy3L7VHcJoZO6sM 0PNqUB8PmbtNp7z3gtB6xKH0E0VzSj3fVIWseSWkupH85QULD3vbJSEpfF7P+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750182070; a=rsa-sha256; cv=none; b=N3GxxgeEpME0a6ILWgPKz36w1qsumf+I1s4yFdnobWnvl5EO9ORlT1o3tlAvc3U5l/61qJ oz4jECIGmv40rH2uvkwJWtnJxs0mmKXIsBfJyq1iWp1sQMYJPG3UyEsu0yRYfW7Q4xPROh LIv267ufU/SQwEvWmLVWV62GhjBvVLns5xJ8f4IKFCqvpmfkZiBglvLSyaPlcgsSNL1kQ4 WMpgTEuJec6BQU/eRq3fPfoggWqYeVuoiQnfgkj7BM5I3e8OQS/oWklZgE9cRYCszJJP0H dj7GiWusBTV10RyCy70kASRY58R+1yeHIfos30oJzE5CvsByQcok9sCTSJzskw== 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 4bMDgV36qDztYj; Tue, 17 Jun 2025 17:41:10 +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 55HHfAWU040829; Tue, 17 Jun 2025 17:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HHfAZL040826; Tue, 17 Jun 2025 17:41:10 GMT (envelope-from git) Date: Tue, 17 Jun 2025 17:41:10 GMT Message-Id: <202506171741.55HHfAZL040826@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: 611c1457ff32 - main - release: Add set -e to abort upon failure 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: 611c1457ff32cbb39263139b599eb9b6058709fb Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=611c1457ff32cbb39263139b599eb9b6058709fb commit 611c1457ff32cbb39263139b599eb9b6058709fb Author: Ed Maste AuthorDate: 2025-06-05 18:50:03 +0000 Commit: Ed Maste CommitDate: 2025-06-17 17:40:33 +0000 release: Add set -e to abort upon failure We don't want to blindly continue and produce broken VM images if something goes wrong. Reviewed by: cperciva Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50711 --- release/scripts/mk-vmimage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index 3ca369b04d8e..d9197de66695 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -29,6 +29,7 @@ # mk-vmimage.sh: Create virtual machine disk images in various formats. # # +set -e usage() { echo "${0} usage:" From nobody Tue Jun 17 18:09:28 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 4bMFJ951JSz5Vl5Q; Tue, 17 Jun 2025 18:09:29 +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 4bMFJ90Lyrz3DbJ; Tue, 17 Jun 2025 18:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750183769; 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=2Ks6R6UPp6Pu4sHVzyBNtMkyTjXKLFDC0bxm8egOWQ8=; b=IfPvO3FVieYMPap+l5Vp92T0lPcC+BDXhcMRU6AMGi5XV+Yw438Jupiy4fT790PsyIF2mv NJex8gEUOs/8IjSiXJF396v0Jh0jGfmNVCL/sesbbKiNqOC+j7/UC4Cdl08gOn5FhnZVRK sZezxaKUJiktrN3Q9PrKPbZ/JuVYy50I6dqmR/+XVBkItBavVHWBT1kXN+JC4b47V+dlU/ mY4QzOw4Sj7+oIsLQTTiRfLI+8aOcD8RAWTt56v1rarOcC5Op4dtkZAKXfFyiou690gEK4 UYAWRJyYnEugOUJIzMq62DIWP9t/Pv2MJURL/sbk2VS8ALV6H9pQJArW9MDQEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750183769; 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=2Ks6R6UPp6Pu4sHVzyBNtMkyTjXKLFDC0bxm8egOWQ8=; b=njU//dw+j98EsuP0QlJrqp8EhzArGQhuWhKC6e2Jc43R85lAltJNtn+hZMJ/sJ3fzVhsad o6+/yA1jAZY3VcOVoUTt5firUoEVJI1pdHsQ0+9nfYKNTrsEwxCGJJshZQxIKWsstwQre7 eZwEoAaWWYsoMEUf5kikKEikAzHVnCA3v16jN6P+yVnaoCHU4djSnJYUurtTWy8EfiGh8N r7VWGSIoYfrhSGK/QUkl4F4sq4aKMlaY5MiJvNo8HkyO5pHPsvEOty8N9oEJEI1WJeOZyu 6d4+V7HxzEFdGh/tcU5lFwyiXnX9Nkzc/Ll+D04Cki/sGF+/Qvc4IN6SHczunQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750183769; a=rsa-sha256; cv=none; b=x5g+MryD/qF107A8aiInOljJE9tpsGXzn/kBmZPGl4EcgazPC3KP3To0f3+g5cDUNoNpl6 ZRK0KuZSQrROH6c49kTVbjyL/6cqdxlDUFgyoaANPB7qK5G6jskvVde1tnVMgobrmKI3p3 hS9aKoB9rb8CZzBBRvUbWr1AcBrv8yS84yaU/9Z2gUwUJ8lSKsxS7PtLzHRxdxIRjs939l kQJkU9dpMzWuuitv9G9agWSLfvuXZz1iBJHr5AGAFIrSz8SFHkka8l5STLkctjoxNJBKyb 4sGV/OEN/aaoB9+qtRlVqW7qhzvkAUHaiLjJ0ATJlssdu3jOJWpRB2c7+Wry2w== 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 4bMFJ84JzMztd9; Tue, 17 Jun 2025 18:09:28 +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 55HI9SlX008386; Tue, 17 Jun 2025 18:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HI9SHd008383; Tue, 17 Jun 2025 18:09:28 GMT (envelope-from git) Date: Tue, 17 Jun 2025 18:09:28 GMT Message-Id: <202506171809.55HI9SHd008383@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: ce65ff203a4f - main - capsicum.4: Use markup for "almost equal" special char 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: ce65ff203a4f7ce59c8782f87d90a657f7ccbc46 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ce65ff203a4f7ce59c8782f87d90a657f7ccbc46 commit ce65ff203a4f7ce59c8782f87d90a657f7ccbc46 Author: Ed Maste AuthorDate: 2025-06-17 18:07:15 +0000 Commit: Ed Maste CommitDate: 2025-06-17 18:09:01 +0000 capsicum.4: Use markup for "almost equal" special char Reported by: Steffen Nurpmeso Event: Kitchener-Waterloo Hackathon 202506 Fixes: c54534e60263 ("capsicum.4: Add some more detail from the Capsicum paper") Sponsored by: The FreeBSD Foundation --- share/man/man4/capsicum.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/capsicum.4 b/share/man/man4/capsicum.4 index 31e6f02b8893..1de8e4531f4f 100644 --- a/share/man/man4/capsicum.4 +++ b/share/man/man4/capsicum.4 @@ -74,7 +74,7 @@ For instance, can be used to query process-local information such as address space layout, but also to monitor a system’s network connections. .Xr sysctl 2 -is constrained by explicitly marking ≈60 of over 15000 parameters as permitted +is constrained by explicitly marking \(~~60 of over 15000 parameters as permitted in capability mode; all others are denied. .Pp The system calls which require constraints are From nobody Tue Jun 17 18:10:04 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 4bMFK72mNLz5Vl32; Tue, 17 Jun 2025 18:10:19 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMFK55Dgrz3FHw; Tue, 17 Jun 2025 18:10:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.45 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none) Received: by mail-io1-f45.google.com with SMTP id ca18e2360f4ac-86a464849c2so208748039f.1; Tue, 17 Jun 2025 11:10:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750183816; x=1750788616; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=v8x9kQlLjYetzUlnsB1k4G4teIeU6OmUMERZEoxAWX0=; b=J95f9JgrlDyEHzg9OQj3RWoUawk6kt9JKof6vK/TgRAliZQ0srfV4w/JwlnKlFdOTY /e46NkV4BgnHJNj9AD2fK25KTcIOq+v449kPkB/GbrGsdF6Jdw3/DUpayMRWLZRcIBbH BSJfX+BpviuFcb40AgfmIhO+znUNPDQOr4MPQvyTxT/3n+QMAMZC6vCA4/PPkVDU91T6 DnjDTELIwY/KczMoziegnXDS2iTQvOfsb0yQ82a7yXCLy2Oh8HF55ZnV2Od/8sLEZ8Bp iU3fSuhusVzzeOaAenWe0BdxSN6siXS7xYFR3lf6FGf/BZZ7/GJwflF9WWX51VyrThIA ISkQ== X-Forwarded-Encrypted: i=1; AJvYcCUaSmZ1O9b6vmhk669ZoHOPP+EAHAFxPYzasVKS2ya4EpcX+N5fgW3rwuUTaStrPHOfacOq0FI7kT+MnDxyIB0=@freebsd.org, AJvYcCVq1j23V8QE9oWGFZuTHAwGQhy+thEPFo9y95DAZOrhnBx/+XN/YYwO2wgi+D5aM5JYhJOecefr9/un+b08UREaxQBTh30=@freebsd.org, AJvYcCWdCopaYun6w5kwjismFS25g08/SjIQb4UAw/370A0X3fuxa0s4EpbU/4vXsbnKhbyFm9rrAB7zaMlf11VT0lTuC/W0@freebsd.org X-Gm-Message-State: AOJu0YztazTpF6HMfOMpK7kywrzGWs3vjSfRoFPg3CP0j7sMfOSdoedm LtlaEmMP42L/Kom0WsbNAzZeYHyzQttLBAqRRmNqunXWv1XV/I0QXR+eA7Bz4IH/o4g/PCCN/i6 MFYhIfaukncWoVpHOxkDvdQLS+3TzFyq9O36N X-Gm-Gg: ASbGncvk/4VEPdgRzlg/uOntWfUghl9kNvQdat9AaElk9zFrVUP9LSmwGSPnzuXKwZC fO+xu+NRwpmEoimBpWfbIJoOO40m4y03LEWW7JWgADpVuNmkfYdTtEll1zS8XkMnhVGtGD/bErV Z4AdkFSC1Zk2qgBRG1lLJMbxS3Umj7RpDBcR+UT1BFcA== X-Google-Smtp-Source: AGHT+IGxusOKFSTvfs6sPglvH233ci+HnfbSQqw9hBqh9zTOeNNVDIUzxTvvD+p7NLLj14zH+C565w52Icme33yNniE= X-Received: by 2002:a5d:9b13:0:b0:86a:441:25ca with SMTP id ca18e2360f4ac-876035db1d9mr343110239f.6.1750183815978; Tue, 17 Jun 2025 11:10:15 -0700 (PDT) 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 References: <202506171611.55HGBUQu074804@gitrepo.freebsd.org> <20250617164702.NrL-sA3d@steffen%sdaoden.eu> In-Reply-To: <20250617164702.NrL-sA3d@steffen%sdaoden.eu> From: Ed Maste Date: Tue, 17 Jun 2025 14:10:04 -0400 X-Gm-Features: AX0GCFvuxFqSyTzcvaGytkch5DUSdUP6bQjmYtfdGVakIeBXNCl1EQGkVz3T8Ok Message-ID: Subject: Re: git: c54534e60263 - main - capsicum.4: Add some more detail from the Capsicum paper To: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [0.23 / 15.00]; NEURAL_HAM_LONG(-0.99)[-0.986]; NEURAL_SPAM_MEDIUM(0.91)[0.910]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; NEURAL_SPAM_SHORT(0.21)[0.211]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; FREEFALL_USER(0.00)[carpeddiem]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_ONE(0.00)[1]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.45:from]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.45:from] X-Rspamd-Queue-Id: 4bMFK55Dgrz3FHw X-Spamd-Bar: / On Tue, 17 Jun 2025 at 12:47, Steffen Nurpmeso wrote: > > That is \(~~. Not in CSTR#54, but in groff from the beginning (of > my git repo (^351da0dcdf) as Thanks, fixed in ce65ff203a4f From nobody Tue Jun 17 18:27:17 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 4bMFhk1mrLz5Vm7Z; Tue, 17 Jun 2025 18:27:18 +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 4bMFhj6K7nz3W8w; Tue, 17 Jun 2025 18:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750184837; 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=h0cpxDbcRUtQ72gtlCmAa4Y2ohOy2LXVFYVIs2AYDZ4=; b=lGU4jjvxM5zcczzfGK1oapMSsl36a4u2QoIvJ8XKi0+eKLVymITgPmbCs6lKYiDBH7VJYN r8LlFDIwAmoyO1NNnc/KE5t+68KTgs9C+pE69V73bO6czVsYNtVUQYPgtT6oZDuVawCktm IDjgZyfbUlpqJQviD78y42kpK5PHcJ+c1Fa6vOrasYFmjv7L5beBTGwEFSlhFJ3lZ+IRhN Eu5p3vUQQXjdWQLW98woCEnNK3N6hQv6o0h+kuv9vxrFLg5Fse8RNWrki+4bjaj7Q3RgPu M0rWF42E1QPMJNMB23+ke3MdLcBWZpVQ3D6jaPVE+I1iZwDtap3UKTLijnU4AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750184837; 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=h0cpxDbcRUtQ72gtlCmAa4Y2ohOy2LXVFYVIs2AYDZ4=; b=UKLXWW+XsO+x9KYp4U9U2oErBn2NHRftDSmIVY2V87JcaL2GqMVVCrh68RjzQwZw8c2IEy Cfe0txuIkSzbKRpg3/SFK1jXe7DgjDmqibno5zFA6i9U3I4/htssK+7KDoCpxhnEbIddLG wUXiZnq04OQWLEf2m96EDxiSLugE0bWcqCFBdur/lRciqQqeo+vn1KRqPlRcLkd9UAghc0 WgqtkO3qv/KK6IcEBLKPAFA4atLO+hZfLq2ElLjY/nKewjHxh239XOUM90Zm2zxszcJFxe VZZZkKSpVjsmksxvJQ5wgptELUCqK4vjMgarVz0aBnDZzBMvLQFZa8dsINlpVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750184837; a=rsa-sha256; cv=none; b=N7Qj6L0ssq9op5yXstZ1aMRONnvUFjdoVD7kLVljp/SEDujnovZ8C4VfgsVobC3clbvVZ0 hisRTvX1AY1rtvhWW5DC5UUQwvBjdFml6xJ6zBTXqb3i/DtNfEUm9pdM6v7FVjvnvbTcXe NuK5fqPLbspY3PEznzDDCArPUAhqU4MkdNHquIEuSs7Ow778HtO+9SAOZUKzVaLOPvNJoJ PD33z1gdavwrfPVBXuYO0u/mkjFh0ucSfeZz6slPYIfK7Vs1JlauCVDOnQ6VnYXqanrNLg 0rJGmP5ao3pARg9KfQfXbRckd/FVIFGhQkLmHvx5YSjy/uN6LVSRd3Ad9W2PHw== 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 4bMFhj5wNszvYG; Tue, 17 Jun 2025 18:27:17 +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 55HIRH0g044970; Tue, 17 Jun 2025 18:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HIRH63044967; Tue, 17 Jun 2025 18:27:17 GMT (envelope-from git) Date: Tue, 17 Jun 2025 18:27:17 GMT Message-Id: <202506171827.55HIRH63044967@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: 76279bb21dc3 - main - release: Remove extra blank comment lines 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: 76279bb21dc30487af3eada7d2a2a1e49b585258 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=76279bb21dc30487af3eada7d2a2a1e49b585258 commit 76279bb21dc30487af3eada7d2a2a1e49b585258 Author: Ed Maste AuthorDate: 2025-06-03 12:03:43 +0000 Commit: Ed Maste CommitDate: 2025-06-17 18:26:42 +0000 release: Remove extra blank comment lines --- release/Makefile.ec2 | 2 -- release/Makefile.gce | 2 -- release/Makefile.oci | 2 -- release/Makefile.vagrant | 1 - 4 files changed, 7 deletions(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 27e6340dca2b..47561feefc23 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -1,6 +1,4 @@ # -# -# # Makefile for creating an EC2 AMI from a disk image. # diff --git a/release/Makefile.gce b/release/Makefile.gce index 51dc5e3436e2..06b76857ae88 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -1,6 +1,4 @@ # -# -# # Makefile for uploading Google Compute Engine disk images. # diff --git a/release/Makefile.oci b/release/Makefile.oci index 2290f2acbcff..a6f998002f92 100644 --- a/release/Makefile.oci +++ b/release/Makefile.oci @@ -1,6 +1,4 @@ # -# -# # Makefile for building OCI container images. # diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index d8f3c14e9498..83433778b028 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -1,5 +1,4 @@ # -# # Makefile for producing and uploading Vagrant boxes to Hashicorp Atlas # # Usage Example: From nobody Tue Jun 17 19:21:58 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 4bMGvq017kz5VqMc; Tue, 17 Jun 2025 19:21:59 +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 4bMGvp4lRrz43MB; Tue, 17 Jun 2025 19:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750188118; 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=f18AIDwDXNfvuQjR5v6yOss8UlJEggUUnzEPP319sNA=; b=Y/UN6j5TYOj+bJszk4+uZlavBFTrUzioUBLrc136KoeseCdFJstO3N6gxkTe4mtXr0mWi0 2T/kJ5rFXavmQFBky4DT6v1aotkV1JdXm+TkfVhzDOkFlYNXQmkonZOJqq54Qll7LxTkeN swCc8IFdA3GsUfXpbL9bQOzxNuK5KUTRjtK8XjHbXAYPIOi7sPnUo9O70odnK81vlfJJfv rN8rpafsk6mmAPrpYu0N7drXkUO6XZlMMkU3+AaJcM/rDyNwLb7tazK4/zocIXgQnOos4f OnWV0jVSZnGlcDN4SeCtRuYhzVtFs1kgmuqQW27SOJLXnz4yk1XV5TA5mrt/YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750188118; 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=f18AIDwDXNfvuQjR5v6yOss8UlJEggUUnzEPP319sNA=; b=qOr8M/zIDDmNP/wEAYgXsZ10XvPRjAnUfhP3fGc9yqzFrQ5RJWRgehI62EUEEaqWdAlidA g7KoMPlW6N3LJFjtcoCh1TtkjvevHnllwEtHgjjvjCVaHCsgV/ZMCp2gZ0Cz1D0NRwqA6+ 0bYDDs9zsXvml9Vpa1qtJ0jBBU27Da6YpbgFpsqrGGf5rusp7giECAkZ17W9107HRMR2ID 0EnuVOkcuxmaUopScT8mFZ27Cymp03F1HNGCwXZW/6m1WI7ZjSLlga8VAdZyeksQMuVO3t cSCDTfTJeMnEDG7l1nSF5t607ga68+V9RR2ef21viv85SCTaGsX+Yij8q5isJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750188118; a=rsa-sha256; cv=none; b=e/HdN7nMYr0cosqzFLybBYy89WZhx5NIRgs+bMtH/Iu6jv44qgEBHZw7aeHcuKFx4H+/Em 8SOA43nty+vXAOY+lXLh4kYPS0UqjfaGiLsULdiNtyGGtRDmS5oVOETTcnhdJ36FzJtnBi nAQDAzB45npbIjsiL8xfGU0VpAFXhjRSyvLh25YbGkNcy5W6lPj1oJGBhQfxdwwEY3Twrr SNP5gptsEoXMSpAZOk8mcyiJdd8m8EvvhUDvUftQN15DVRcSpfMTmTqsWDDMcmLN2gNljR dvDYXm99aFz6sQudTkB4iD92pARJDjBgYVyw2J4x7N1ey4rsv3QvH82JXUTIrA== 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 4bMGvp46hdzxXw; Tue, 17 Jun 2025 19:21:58 +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 55HJLwVZ057458; Tue, 17 Jun 2025 19:21:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HJLwsa057455; Tue, 17 Jun 2025 19:21:58 GMT (envelope-from git) Date: Tue, 17 Jun 2025 19:21:58 GMT Message-Id: <202506171921.55HJLwsa057455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 7ffe1a1f6318 - main - pci: Save MSIX ctrl value before pci_mask_msix call 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: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ffe1a1f6318bb0116900114950114e5f81418fd Auto-Submitted: auto-generated The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=7ffe1a1f6318bb0116900114950114e5f81418fd commit 7ffe1a1f6318bb0116900114950114e5f81418fd Author: Krzysztof Galazka AuthorDate: 2025-06-17 19:17:02 +0000 Commit: Krzysztof Galazka CommitDate: 2025-06-17 19:17:21 +0000 pci: Save MSIX ctrl value before pci_mask_msix call Function pci_mask_msix uses cached value of MSI-X CTRL register to verify if vector index is valid. Update that value in pci_alloc_msix_method before it is used to avoid kernel panic. Signed-off-by: Krzysztof Galazka Reviewed by: jhb Approved by: kbowling (mentor) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D49484 --- sys/dev/pci/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 27355c335915..f94438cda041 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1927,7 +1927,11 @@ pci_alloc_msix_method(device_t dev, device_t child, int *count) } } - /* Mask all vectors. */ + /* + * Mask all vectors. Note that the message index assertion in + * pci_mask_msix requires msix_ctrl to be set. + */ + cfg->msix.msix_ctrl = ctrl; for (i = 0; i < msgnum; i++) pci_mask_msix(child, i); From nobody Tue Jun 17 19:42:00 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 4bMHLx15gfz5pgWn; Tue, 17 Jun 2025 19:42:01 +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 4bMHLw6BZDz3Gl1; Tue, 17 Jun 2025 19:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750189320; 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=IhJzzmNlXQItOk7bSI0e1LiFhsfhcxeyPc6n3Kmj8e8=; b=Djx78JzciLGw7Vd1k1ualeR77cFR46CHHoa/n7XaWkWsxnx+Z/JBf2OtGF/wiKWjZOGALp tM7KqCXPxdWoHvVOE4DeHfw4kGkpmtMeVAVY6e/OVvyHHFNJMVcp56tQ11jV9SoHs6Laix tTArHMm3uIA8eESo3By/SN9l1Zxia/A99KHVIOh6aS9cetp+yg3xjNfy0QggL0Zhtz3sx1 D2+ggqOjQDhJRl8otJOq/qxoLF8yOcbWGF+Pd7PVVcYYsqkOALgXyo7MaxYBUCE47D+H/r NXpAkUaxMYwOJaVYzkPu80MDVpJ92Wj/9NRVs3yWKJF7SazlwU9i9TpBrODq5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750189320; 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=IhJzzmNlXQItOk7bSI0e1LiFhsfhcxeyPc6n3Kmj8e8=; b=m+Ii+6Hkm3e+7MRaTEt8YiBCfiCFznIMKOoNDhS1YAu0FfJToS9BPQc2YNyi00VIbeTkf2 h2BE+cGBRN8xyZGUDr9u7jSryW2zp82YH5Cv9TT2ovQCNPTJAaSV2wPK5ZzK/TmAXqGTJo UXU+NLixn6SPyyzlWv9VLKEK5/OjhFTvUShHHQAIkfhw8rVRV50wAhErKl7SWMghLDSNxc B6u6fmAkPFDPmJpmogXDUlW18uEJTWznM+KAvwRg0xobwh0X/wQ4IJxTkslEsy4m88HrAI EmFK+0GSi+D2mRj2WrSsz1SvAINeWi74tAyNr/sncdRUhqFqhv8MMcfVBoRp4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750189320; a=rsa-sha256; cv=none; b=jmoeZ/9cr9U+HHmOWjBCLap0VVKf8TsJW6bBXhWt74/McPkz3poSrPWLzbErdwCliHJ7Jm Cnq6p368nzksAr2CTmwtWgke668RwXOpYwtZjWqqRbe9SZUzwIKkcHbUm2UsEgtCojRdMc tEvl2BGUDaI21Wq+OFG3l+J+sRhg3SXfsl6P1N+NJF58PFKUeus4ZocZjZwUaGJDGKu4+W bEjiVnQs3rUQ7qAI8bG/2lnPSz+mcDeeQLBdelN21NweDJi64IsVf3gMfSKDr7YH4gx2H2 BUKhri+bYayE0D1h/EYgFu038fkyXoPrTypn2z/NG9bOWcrGumJYsVupYRRA7g== 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 4bMHLw5kYNzxTZ; Tue, 17 Jun 2025 19:42:00 +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 55HJg0Aw094395; Tue, 17 Jun 2025 19:42:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HJg0tH094392; Tue, 17 Jun 2025 19:42:00 GMT (envelope-from git) Date: Tue, 17 Jun 2025 19:42:00 GMT Message-Id: <202506171942.55HJg0tH094392@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: 54eda43cc1e6 - main - beep: Capsicumize 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: 54eda43cc1e6b1d73804b6c397a15002e3519555 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=54eda43cc1e6b1d73804b6c397a15002e3519555 commit 54eda43cc1e6b1d73804b6c397a15002e3519555 Author: Ed Maste AuthorDate: 2025-06-05 23:44:05 +0000 Commit: Ed Maste CommitDate: 2025-06-17 19:41:05 +0000 beep: Capsicumize While it's unlikely that beep(1) will be used in a context where a sandbox is particularly valuable, it does offer a simple demonstration of entering a capability sandbox after opening required fds, and is trivial to do. Reviewed by: christos Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50709 --- usr.bin/beep/beep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/beep/beep.c b/usr.bin/beep/beep.c index 0bdfe2cf97a7..9d274770ad75 100644 --- a/usr.bin/beep/beep.c +++ b/usr.bin/beep/beep.c @@ -25,6 +25,7 @@ #include +#include #include #include #include @@ -204,6 +205,9 @@ main(int argc, char **argv) if (f < 0) err(1, "Failed to open '%s'", oss_dev); + if (caph_enter() == -1) + err(1, "Failed to enter capability mode"); + c = 1; /* mono */ if (ioctl(f, SOUND_PCM_WRITE_CHANNELS, &c) != 0) errx(1, "ioctl SOUND_PCM_WRITE_CHANNELS(1) failed"); From nobody Tue Jun 17 19:51:33 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 4bMHYx5cCjz5pglx; Tue, 17 Jun 2025 19:51:33 +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 4bMHYx4PWmz3Ms4; Tue, 17 Jun 2025 19:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750189893; 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=pISh4LjAqqmjxDUf0GHCMaBccThxtgWf6BMbH8g2fdI=; b=izx1Xnq4f+4HC6pITVZlrSTF4updGFudzswLkb0DnW5NJvzR7oLwpWEweek8/AAeFTrmvz oXzhRNyvR1+p7LdrFPQoJFGclntUxucRwKsMaio+pjwLNH3oNfDBnqpHIfOktRyU+8hnL2 Wil8NH2+9IL5JFXr0HAyzLBhp1LHoYxUUhfm3qu4lPlJMGdJAfAtfTwp3GZfcz8UQbzVrP G3jasHpAMFAinisWz1wat37gCLHiORl17vm8nf9fu7H12GrwJXOINvBu6u6BSXIH25AK2J xJ6K68WUtjHeAJ9skaGyediloXWl9qssRQXKr5dJpXFnrrkIzPPgvM5af8QoNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750189893; 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=pISh4LjAqqmjxDUf0GHCMaBccThxtgWf6BMbH8g2fdI=; b=eA4yz4GyCeVrbcrbVu2MxpLcr/t8k0U3Imq4/tsMYIXoxbrFwDMeOw4uO7gMy1ugZvpZd/ iTMmuuMGVqAeoBAT+9OELPisoIA0WnKs8rzbh/Pwd8htOETAnsJpPG+lO1vKiFuXThMrv+ 7gXc0p09AsEnATZolKnLPA2D6H7ynTelPPRNehUaOyM9CsGfJNz0zNsLv15dWW3eeseI8e DLNkWFQxqHZ38LMQXiQALxXX9gBj6TdqRzjElr2Erk5vl+4TE/UeDcsGWWahEKCkHq24he p3cVFeuF9v2l1UBog/KVGl3ZxxiR0DDkpU6jRmRgTs/hPDF7QmrtpL+GfCpfwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750189893; a=rsa-sha256; cv=none; b=kiPKm4USV4Je42A0A0smwNJqsRd1E9JEJVfGFxpntJ+hXciQTHOz4auIZfkkPJHVbk6F5i BGu1Swgalrw7K6ksYGilvQx0shexAXgtcWhDesEHE0LDeAL6J0xQS1LwnyHbzVCaWeu1vg yl1rftEoQHyAnTGpw8TJB0f2tut9F2GpziT/bjVnF6+cDBcLdib51QZU+c8dyzhPlcN6Ns P1mOuIzyXhoZXqMx2FhcsPZpjE4oZiZAEAjzbw6sOKo4haJ8IWhGd8hPqdGK91eZlSJRWv 2jhyYm2WwNHGEBTpjRqHFnDfbiBzNW40d/cHZVUYLe/yeEFR9/62Qc891dZwTg== 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 4bMHYx3qbCzxNC; Tue, 17 Jun 2025 19:51:33 +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 55HJpXnF007160; Tue, 17 Jun 2025 19:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HJpXGq007157; Tue, 17 Jun 2025 19:51:33 GMT (envelope-from git) Date: Tue, 17 Jun 2025 19:51:33 GMT Message-Id: <202506171951.55HJpXGq007157@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: fc77abfd1e62 - main - etc: Avoid duplicate gss files installation 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: fc77abfd1e62751b0c76cd5d8ef3299b8ca398c6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fc77abfd1e62751b0c76cd5d8ef3299b8ca398c6 commit fc77abfd1e62751b0c76cd5d8ef3299b8ca398c6 Author: Ed Maste AuthorDate: 2025-06-17 19:46:33 +0000 Commit: Ed Maste CommitDate: 2025-06-17 19:50:01 +0000 etc: Avoid duplicate gss files installation From Cirrus-CI su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua \ -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG" error: ./etc/gss/mech file repeated with same meta: line 2127,40175 error: ./etc/gss/qop file repeated with same meta: line 2128,40176 Prior to 1b735665f45a the Heimdal versions were installed via distribution: ${_+_}cd ${.CURDIR}/gss; ${MAKE} install 1b735665f45a added a conditional for MK_MITKRB5 but also added gss or gss-krb5 to SUBDIRS, causing these files to be installed twice. Fixes: 1b735665f45a ("etc/gss: Add MIT GSS glue") Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation --- etc/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index da9288bddaae..ab799b2f6c80 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -15,12 +15,6 @@ SUBDIR+=termcap SUBDIR+=sendmail .endif -.if ${MK_MITKRB5} != "no" -SUBDIR+=gss-krb5 -.else -SUBDIR+=gss -.endif - # NB: keep these sorted by MK_* knobs ETCMAIL=aliases From nobody Tue Jun 17 20:01:35 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 4bMHnZ5PWWz5phR8; Tue, 17 Jun 2025 20:01:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMHnZ1BZhz3Tvn; Tue, 17 Jun 2025 20:01:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id RSjCuojEl9JM2RcUzuw0bP; Tue, 17 Jun 2025 20:01:37 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id RcUxuEiRVJhBPRcUyun28j; Tue, 17 Jun 2025 20:01:37 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=6851c9a1 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=JDuXeeMnMLsuX0sUteMA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 31C837C3; Tue, 17 Jun 2025 13:01:35 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 2BB8B268; Tue, 17 Jun 2025 13:01:35 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ed Maste cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: fc77abfd1e62 - main - etc: Avoid duplicate gss files installation In-reply-to: <202506171951.55HJpXGq007157@gitrepo.freebsd.org> References: <202506171951.55HJpXGq007157@gitrepo.freebsd.org> Comments: In-reply-to Ed Maste message dated "Tue, 17 Jun 2025 19:51:33 +0000." 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=us-ascii Date: Tue, 17 Jun 2025 13:01:35 -0700 Message-Id: <20250617200135.2BB8B268@slippy.cwsent.com> X-CMAE-Envelope: MS4xfDk2sVfBAtcRqaeQGzAl6WEsEpc4rQjDLsB9ycaiDXv1vjbAtB7Agn7Qm4W90sD4AtnfQD9d4+xXOhfi0yhU8YPxUbdtTkRBUQjXEbmu6IsLINvgMyzm I9Q6wKXWovXM6AM1fFoP5aaMKV6acqCALODb8y8rQiorwS9NoacOKxPGmDOYKQU0IHN6pmCxvHKaopjk/aUI2EAneUToquFeRJq3oM1ZoUskgVj7DdQz+RLI KTv8nkB32hOKOeq73ANrzJEN7cHINrQnqM/J07ikvCRWk7RSA76ebclZPPW/vtTzPfB1nPT6oNq5wg6At4URz3jWuVupdpbDXNAZw2rf8f0= X-Rspamd-Queue-Id: 4bMHnZ1BZhz3Tvn X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message <202506171951.55HJpXGq007157@gitrepo.freebsd.org>, Ed Maste writes: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fc77abfd1e62751b0c76cd5d8ef3299b > 8ca398c6 > > commit fc77abfd1e62751b0c76cd5d8ef3299b8ca398c6 > Author: Ed Maste > AuthorDate: 2025-06-17 19:46:33 +0000 > Commit: Ed Maste > CommitDate: 2025-06-17 19:50:01 +0000 > > etc: Avoid duplicate gss files installation > > From Cirrus-CI > su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua \ > -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG" > error: ./etc/gss/mech file repeated with same meta: line 2127,40175 > error: ./etc/gss/qop file repeated with same meta: line 2128,40176 > > Prior to 1b735665f45a the Heimdal versions were installed via > > distribution: > ${_+_}cd ${.CURDIR}/gss; ${MAKE} install > > 1b735665f45a added a conditional for MK_MITKRB5 but also added gss or > gss-krb5 to SUBDIRS, causing these files to be installed twice. > > Fixes: 1b735665f45a ("etc/gss: Add MIT GSS glue") > Event: Kitchener-Waterloo Hackathon 202506 > Sponsored by: The FreeBSD Foundation > --- > etc/Makefile | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/etc/Makefile b/etc/Makefile > index da9288bddaae..ab799b2f6c80 100644 > --- a/etc/Makefile > +++ b/etc/Makefile > @@ -15,12 +15,6 @@ SUBDIR+=termcap > SUBDIR+=sendmail > .endif > > -.if ${MK_MITKRB5} != "no" > -SUBDIR+=gss-krb5 > -.else > -SUBDIR+=gss > -.endif > - > # NB: keep these sorted by MK_* knobs > > ETCMAIL=aliases > Thank you. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Tue Jun 17 20:21:20 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 4bMJDN72Hbz5pjTH; Tue, 17 Jun 2025 20:21:24 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4bMJDN1Zrjz3h66; Tue, 17 Jun 2025 20:21:24 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sdaoden.eu; s=citron; t=1750191681; x=1750858347; h=date:author:from:to:cc:subject: message-id:in-reply-to:references:mail-followup-to:openpgp:blahblahblah: author:from:subject:date:to:cc:resent-author:resent-date:resent-from: resent-sender:resent-to:resent-cc:resent-reply-to:resent-message-id: in-reply-to:references:mime-version:content-type: content-transfer-encoding:content-disposition:content-id: content-description:message-id:mail-followup-to:openpgp:blahblahblah; bh=AfnNGKVogRumER37PTEWsK+ARnemgs1/iO0l0l5U4rA=; b=DXgQNNFlY3lrAuSjkpaW3HWirVFv5DnbFfpRBfDnEdTmq+mLE4hQPeZMpYYjy6yYcyNxMics rveOzEm4kv8xiwFFgU+BMcZ9QfKBz5whhnJJJmoXiRi2vAzmlAGK86mXFHHDUGrhGzkwMACX7y 957sWXy78JkodUBY8RqxQbHiSC+LBAG5t+B5/xGw9mz5fQp+mAM1hZ6XWa/H7y/UCGttrINcrG vGLLd3FDinYgsRrcKhP9JPS7CBD0hspvN2x0NwOF1k/858V+qlZF81XmXlFIrQ+INKqAQRcpvi ecUWjbj1+oXyaS9Z1M64iSmWAuu07J5f1l3q+y9vNrtV9K4A== DKIM-Signature: v=1; a=adaed25519-sha256; c=relaxed/relaxed; d=sdaoden.eu; s=orange; t=1750191681; x=1750858347; h=date:author:from:to:cc:subject: message-id:in-reply-to:references:mail-followup-to:openpgp:blahblahblah: author:from:subject:date:to:cc:resent-author:resent-date:resent-from: resent-sender:resent-to:resent-cc:resent-reply-to:resent-message-id: in-reply-to:references:mime-version:content-type: content-transfer-encoding:content-disposition:content-id: content-description:message-id:mail-followup-to:openpgp:blahblahblah; bh=AfnNGKVogRumER37PTEWsK+ARnemgs1/iO0l0l5U4rA=; b=9rERTV+DCkklDvWPQqMrv6XM6hJJazDYM0k3bXBRT4aO4sqv4YLqy7WSW+zNvFMq7QomcrJM S/6SnYWaexUADg== Date: Tue, 17 Jun 2025 22:21:20 +0200 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Gleb Smirnoff Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b59753f1d55d - main - tcp: provide a useful comment for struct tcpstat Message-ID: <20250617202120.2DBgf81t@steffen%sdaoden.eu> In-Reply-To: <202506171653.55HGruXD051778@gitrepo.freebsd.org> References: <202506171653.55HGruXD051778@gitrepo.freebsd.org> Mail-Followup-To: Gleb Smirnoff , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org User-Agent: s-nail v14.9.25-663-g0c41f463ef OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. X-Rspamd-Queue-Id: 4bMJDN1Zrjz3h66 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] 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 i have a run today.. Gleb Smirnoff wrote in <202506171653.55HGruXD051778@gitrepo.freebsd.org>: |The branch main has been updated by glebius: | |URL: https://cgit.FreeBSD.org/src/commit/?id=b59753f1d55da6c6d4b73252444\ |212e6895ce913 | |commit b59753f1d55da6c6d4b73252444212e6895ce913 |Author: Gleb Smirnoff |AuthorDate: 2025-06-17 16:46:41 +0000 |Commit: Gleb Smirnoff |CommitDate: 2025-06-17 16:52:51 +0000 | | tcp: provide a useful comment for struct tcpstat ... |+ * shall be increased by TCPSTAT_INC() or KMOD_TCPSTAT_INC(). Adding \ |new a |+ * new counter also requires adding corresponding SDT probes into \ "Adding new a new" can be contracted. Statistics are expensive.. Ciao and greetings, --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) From nobody Tue Jun 17 20:26:47 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 4bMJLb43bnz5pk7L; Tue, 17 Jun 2025 20:26:47 +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 4bMJLb2x7jz3n06; Tue, 17 Jun 2025 20:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750192007; 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=8NQqQBvycjcrmqnNOZjaumdYJh4QnzFaruDQImgskUY=; b=RZr56K37AkHOh1HcOcvnOL+M2x0CGep5ZzwWI8APvlpLw9cp8kPEaoYDFAS4BGseIq8v/6 cDYbRUwcxEx4gebLNp8ACa2CEU4YJxaFZR2LdZ/COxiPV9NcKDoBf3wpoTskTQ+1vWcikT epHxqsXtiy4DQRoRXCPl/M6YSlj447tiNAF8PboN9oxvhlhd2uHRxSEpvkh/5SOng1NxKO Tmv6KTIejzvFOQ/p8dtoTEXVqZ0o1dEbmbtENaqqWHCbZ0b1Ko/I0y8ZM+z3ShcAwQpch8 M8ezPtVSo8buf7m7Fqzli8j9Y0O7VhKRRpnr7PyeQJ3YDXa6JsROsI9TQrLdnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750192007; 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=8NQqQBvycjcrmqnNOZjaumdYJh4QnzFaruDQImgskUY=; b=ulDmkBLyFKqggDbmpW2glNtHtQe6LftgvWhcH7qGaj4m8pt1Rd3z+88bFoh/cZsn7Wiwms QeB4/0z8JfcdxzQphxrp3ij0Cz3vjnYqbFbvMhRorsmCkhl8MaMUwdah5CdEuGp9Qi2lKA /M470CebYA8URp+c9ShP1fIRh4Otte2SlfuS95sCsQhgCjvqcvpYbxdTAPVrUkkrDPb/MM WqiyunNfcgyyAdYKfY6hwTx6XjwkXJrNAWmC6gcs1FY1CtuYaAhyUi1fsl3p31sq09FPW0 /mcFNYSrZf1HmxBOWj3fmc2rQtq8vSxvZMbQ7tiHo94uiTymbjOQdLSGA6N27w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750192007; a=rsa-sha256; cv=none; b=KkZyt3s1vWXec5ANMaX3NHj7/XIpqqqMERc5hjOs2Fx2LAg8vyqor8OS+HvN+er8VYE5+3 1ohD9vNrHbrRBeqiEcXOIgqBWon+QFiWDtDl+A1ZAlQwV9QiwZmE0HtdWb8SRp5YQEZphc s/YBpC1t4FWycXiuQ3aCNacXrPyvTm6WV4KZBcVEr3RItK48jmjqStpgtSbAlAmJGKdkFT DIyLgLCiDoUPfEZ33Xs6Q9QGfWLpArr5oRsdPbrlstKbrwMfxpXrPJEd4BnzPOeDD0yYX4 KdX920FyY+m0DYBxBKdyB+3lX17GrXiN8cO95EzuAri0/IWGXfcVm2DaJkqHJg== 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 4bMJLb2VyNzyfx; Tue, 17 Jun 2025 20:26:47 +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 55HKQldP073158; Tue, 17 Jun 2025 20:26:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HKQlje073155; Tue, 17 Jun 2025 20:26:47 GMT (envelope-from git) Date: Tue, 17 Jun 2025 20:26:47 GMT Message-Id: <202506172026.55HKQlje073155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 6d669a5d7759 - main - pam-krb5: Add manpage 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d669a5d7759ef7657dcc959b826e30d7a5f098b Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6d669a5d7759ef7657dcc959b826e30d7a5f098b commit 6d669a5d7759ef7657dcc959b826e30d7a5f098b Author: Cy Schubert AuthorDate: 2025-06-17 16:19:35 +0000 Commit: Cy Schubert CommitDate: 2025-06-17 19:59:37 +0000 pam-krb5: Add manpage To build the man page one must run pod2man on contrib/pam-krb5/docs/pam_krb5.pod and copy it to ${.CURDIR}. --- lib/libpam/modules/pam_krb5/Makefile | 3 + lib/libpam/modules/pam_krb5/pam-krb5.8 | 1025 ++++++++++++++++++++++++++++++++ 2 files changed, 1028 insertions(+) diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile index ddd5c17ad259..b537bf37b7f3 100644 --- a/lib/libpam/modules/pam_krb5/Makefile +++ b/lib/libpam/modules/pam_krb5/Makefile @@ -57,6 +57,9 @@ SRCS= account.c \ support.c \ vector.c +MAN= pam-krb5.8 +MLINKS= pam-krb5.8 pam_krb5.8 + CFLAGS= -I${SRCDIR} \ -I${.CURDIR} \ -fno-strict-aliasing \ diff --git a/lib/libpam/modules/pam_krb5/pam-krb5.8 b/lib/libpam/modules/pam_krb5/pam-krb5.8 new file mode 100644 index 000000000000..3413748c7850 --- /dev/null +++ b/lib/libpam/modules/pam_krb5/pam-krb5.8 @@ -0,0 +1,1025 @@ +.\" -*- mode: troff; coding: utf-8 -*- +.\" Automatically generated by Pod::Man 5.0102 (Pod::Simple 3.45) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>. +.ie n \{\ +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds C` +. ds C' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is >0, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{\ +. if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. if !\nF==2 \{\ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" ======================================================================== +.\" +.IX Title "PAM_KRB5 1" +.TH PAM_KRB5 1 2025-06-05 "perl v5.40.2" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH NAME +pam_krb5 \- Kerberos PAM module +.SH SYNOPSIS +.IX Header "SYNOPSIS" +.Vb 4 +\& auth sufficient pam_krb5.so minimum_uid=1000 +\& session required pam_krb5.so minimum_uid=1000 +\& account required pam_krb5.so minimum_uid=1000 +\& password sufficient pam_krb5.so minimum_uid=1000 +.Ve +.SH DESCRIPTION +.IX Header "DESCRIPTION" +The Kerberos service module for PAM, typically installed at +\&\fI/lib/security/pam_krb5.so\fR, provides functionality for the four PAM +operations: authentication, account management, session management, and +password management. \fIpam_krb5.so\fR is a shared object that is +dynamically loaded by the PAM subsystem as necessary, based on the system +PAM configuration. PAM is a system for plugging in external +authentication and session management modules so that each application +doesn't have to know the best way to check user authentication or create a +user session on that system. For details on how to configure PAM on your +system, see the PAM man page, often \fBpam\fR\|(7). +.PP +Here are the actions of this module when called from each group: +.IP auth 4 +.IX Item "auth" +Provides implementations of \fBpam_authenticate()\fR and \fBpam_setcred()\fR. The +former takes the username from the PAM session, prompts for the user's +password (unless configured to use an already-entered password), and then +performs a Kerberos initial authentication, storing the obtained +credentials (if successful) in a temporary ticket cache. The latter, +depending on the flags it is called with, either takes the contents of the +temporary ticket cache and writes it out to a persistent ticket cache +owned by the user or uses the temporary ticket cache to refresh an +existing user ticket cache. +.Sp +Passwords as long or longer than PAM_MAX_RESP_SIZE octets (normally 512 +octets) will be rejected, since excessively long passwords can be used as +a denial of service attack. +.Sp +After doing the initial authentication, the Kerberos PAM module will +attempt to obtain tickets for a key in the local system keytab and then +verify those tickets. Unless this step is performed, the authentication +is vulnerable to KDC spoofing, but it requires that the system have a +local key and that the PAM module be running as a user that can read the +keytab file (normally \fI/etc/krb5.keytab\fR. You can point the Kerberos PAM +module at a different keytab with the \fIkeytab\fR option. If that keytab +cannot be read or if no keys are found in it, the default (potentially +insecure) behavior is to skip this check. If you want to instead fail +authentication if the obtained tickets cannot be checked, set +\&\f(CW\*(C`verify_ap_req_nofail\*(C'\fR to true in the [libdefaults] section of +\&\fI/etc/krb5.conf\fR. Note that this will affect applications other than +this PAM module. +.Sp +By default, whenever the user is authenticated, a basic authorization +check will also be done using \fBkrb5_kuserok()\fR. The default behavior of +this function is to check the user's account for a \fI.k5login\fR file and, +if one is present, ensure that the user's principal is listed in that +file. If \fI.k5login\fR is not present, the default check is to ensure that +the user's principal is in the default local realm and the user portion of +the principal matches the account name (this can be changed by configuring +a custom aname to localname mapping in \fIkrb5.conf\fR; see the Kerberos +documentation for details). This can be customized with several +configuration options; see below. +.Sp +If the username provided to PAM contains an \f(CW\*(C`@\*(C'\fR and Kerberos can, +treating the username as a principal, map it to a local account name, +\&\fBpam_authenticate()\fR will change the PAM user to that local account name. +This allows users to log in with their Kerberos principal and let Kerberos +do the mapping to an account. This can be disabled with the +\&\fIno_update_user\fR option. Be aware, however, that this facility cannot be +used with OpenSSH. OpenSSH will reject usernames that don't match local +accounts before this remapping can be done and will pass an invalid +password to the PAM module. Also be aware that several other common PAM +modules, such as pam_securetty, expect to be able to look up the user with +\&\fBgetpwnam()\fR and cannot be called before pam_krb5 when using this feature. +.Sp +When \fBpam_setcred()\fR is called to initialize a new ticket cache, the +environment variable KRB5CCNAME is set to the path to that ticket cache. +By default, the cache will be named \fI/tmp/krb5cc_UID_RANDOM\fR where UID is +the user's UID and RANDOM is six randomly-chosen letters. This can be +configured with the \fIccache\fR and \fIccache_dir\fR options. +.Sp +pam\-krb5 does not use the default ticket cache location or +\&\fIdefault_cc_name\fR in the \f(CW\*(C`[libdefaults]\*(C'\fR section of \fIkrb5.conf\fR. The +default cache location would share a cache for all sessions of the same +user, which causes confusing behavior when the user logs out of one of +multiple sessions. +.Sp +If \fBpam_setcred()\fR initializes a new ticket cache, it will also set up that +ticket cache so that it will be deleted when the PAM session is closed. +Normally, the calling program (\fBlogin\fR, \fBsshd\fR, etc.) will run the +user's shell as a sub-process, wait for it to exit, and then close the PAM +session, thereby cleaning up the user's session. +.IP session 4 +.IX Item "session" +Provides implementations of \fBpam_open_session()\fR, which is equivalent to +calling \fBpam_setcred()\fR with the PAM_ESTABLISH_CRED flag, and +\&\fBpam_close_session()\fR, which destroys the ticket cache created by +\&\fBpam_setcred()\fR. +.IP account 4 +.IX Item "account" +Provides an implementation of \fBpam_acct_mgmt()\fR. All it does is do the same +authorization check as performed by the \fBpam_authenticate()\fR implementation +described above. +.IP password 4 +.IX Item "password" +Provides an implementation of \fBpam_chauthtok()\fR, which implements password +changes. The user is prompted for their existing password (unless +configured to use an already entered one) and the PAM module then obtains +credentials for the special Kerberos principal \f(CW\*(C`kadmin/changepw\*(C'\fR. It +then prompts the user for a new password, twice to ensure that the user +entered it properly (again, unless configured to use an already entered +password), and then does a Kerberos password change. +.Sp +Passwords as long or longer than PAM_MAX_RESP_SIZE octets (normally 512 +octets) will be rejected, since excessively long passwords can be used as +a denial of service attack. +.Sp +Unlike the normal Unix password module, this module will allow any user to +change any other user's password if they know the old password. Also, +unlike the normal Unix password module, root will always be prompted for +the old password, since root has no special status in Kerberos. (To +change passwords in Kerberos without knowing the old password, use +\&\fBkadmin\fR\|(8) instead.) +.PP +Both the account and session management calls of the Kerberos PAM module +will return PAM_IGNORE if called in the context of a PAM session for a +user who did not authenticate with Kerberos (a return code of \f(CW\*(C`ignore\*(C'\fR in +the Linux PAM configuration language). +.PP +Note that this module assumes the network is available in order to do a +Kerberos authentication. If the network is not available, some Kerberos +libraries have timeouts longer than the timeout imposed by the login +process. This means that using this module incautiously can make it +impossible to log on to console as root. For this reason, you should +always use the \fIignore_root\fR or \fIminimum_uid\fR options, list a local +authentication module such as \fBpam_unix\fR first with a control field of +\&\f(CW\*(C`sufficient\*(C'\fR so that the Kerberos PAM module will be skipped if local +password authentication was successful. +.PP +This is not the same PAM module as the Kerberos PAM module available from +Sourceforge, or the one included on Red Hat systems. It supports many of +the same options, has some additional options, and doesn't support some of +the options those modules do. +.SH CONFIGURATION +.IX Header "CONFIGURATION" +The Kerberos PAM module takes many options, not all of which are relevant +to every PAM group; options that are not relevant will be silently +ignored. Any of these options can be set in the PAM configuration as +arguments listed after \f(CW\*(C`pam_krb5.so\*(C'\fR. Some of the options can also be +set in the system \fIkrb5.conf\fR file; if this is possible, it will be noted +below in the option description. +.PP +To set a boolean option in the PAM configuration file, just give the name +of the option in the arguments. To set an option that takes an argument, +follow the option name with an equal sign (=) and the value, with no +separating whitespace. Whitespace in option arguments is not supported in +the PAM configuration. +.PP +To set an option for the PAM module in the system \fIkrb5.conf\fR file, put +that option in the \f(CW\*(C`[appdefaults]\*(C'\fR section. All options must be followed +by an equal sign (=) and a value, so for boolean options add \f(CW\*(C`= true\*(C'\fR. +The Kerberos PAM module will look for options either at the top level of +the \f(CW\*(C`[appdefaults]\*(C'\fR section or in a subsection named \f(CW\*(C`pam\*(C'\fR, inside or +outside a section for the realm. For example, the following fragment of a +\&\fIkrb5.conf\fR file would set \fIforwardable\fR to true, \fIminimum_uid\fR to +1000, and set \fIignore_k5login\fR only if the realm is EXAMPLE.COM. +.PP +.Vb 8 +\& [appdefaults] +\& forwardable = true +\& pam = { +\& minimum_uid = 1000 +\& EXAMPLE.COM = { +\& ignore_k5login = true +\& } +\& } +.Ve +.PP +For more information on the syntax of \fIkrb5.conf\fR, see \fBkrb5.conf\fR\|(5). +Note that options that depend on the realm will be set only on the basis +of the default realm, either as configured in \fBkrb5.conf\fR\|(5) or as set by +the \fIrealm\fR option described below. If the user authenticates to an +account qualified with a realm, that realm will not be used when +determining which options will apply. +.PP +There is no difference to the PAM module whether options are specified at +the top level or in a \f(CW\*(C`pam\*(C'\fR section; the \f(CW\*(C`pam\*(C'\fR section is supported in +case there are options that should be set for the PAM module but not for +other applications. +.PP +If the same option is set in \fIkrb5.conf\fR and in the PAM configuration, +the latter takes precedent. Note, however, that due to the configuration +syntax, there's no way to turn off a boolean option in the PAM +configuration that was turned on in \fIkrb5.conf\fR. +.PP +The start of each option description is annotated with the version of +pam\-krb5 in which that option was added with the current meaning. +.SS Authorization +.IX Subsection "Authorization" +.IP alt_auth_map= 4 +.IX Item "alt_auth_map=" +[3.12] This functions similarly to the \fIsearch_k5login\fR option. The + argument is used as the authentication Kerberos principal, with +any \f(CW%s\fR in replaced with the username. If the username +contains an \f(CW\*(C`@\*(C'\fR, only the part of the username before the realm is used +to replace \f(CW%s\fR. If contains a realm, it will be used; +otherwise, the realm of the username (if any) will be appended to the +result. There is no quote removal. +.Sp +If this option is present, the default behavior is to try this alternate +principal first and then fall back to the standard behavior if it fails. +The primary usage is to allow alternative principals to be used for +authentication in programs like \fBsudo\fR. Most examples will look like: +.Sp +.Vb 1 +\& alt_auth_map=%s/root +.Ve +.Sp +which attempts authentication as the root instance of the username first +and then falls back to the regular username (but see \fIforce_alt_auth\fR and +\&\fIonly_alt_auth\fR). +.Sp +This option also allows a cheap way to attempt authentication in an +alternative realm first and then fall back to the primary realm. A +setting like: +.Sp +.Vb 1 +\& alt_auth_map=%s@EXAMPLE.COM +.Ve +.Sp +will attempt authentication in the EXAMPLE.COM realm first and then fall +back on the local default realm. This is more convenient than running the +module multiple times with multiple default realms set with \fIrealm\fR, but +it is very limited: only two realms can be tried, and the alternate realm +is always tried first. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR, although +normally it doesn't make sense to do that; normally it is used in the PAM +options of configuration for specific programs. It is only applicable to +the auth and account groups. If this option is set for the auth group, be +sure to set it for the account group as well or account authorization may +fail. +.IP force_alt_auth 4 +.IX Item "force_alt_auth" +[3.12] This option is used with \fIalt_auth_map\fR and forces authentication +as the mapped principal if that principal exists in the KDC. Only if the +KDC returns principal unknown does the Kerberos PAM module fall back to +normal authentication. This can be used to force authentication with an +alternate instance. If \fIalt_auth_map\fR is not set, it has no effect. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP ignore_k5login 4 +.IX Item "ignore_k5login" +[2.0] Never look for a \fI.k5login\fR file in the user's home directory. +Instead, only check that the Kerberos principal maps to the local account +name. The default check is to ensure the realm matches the local realm +and the user portion of the principal matches the local account name, but +this can be customized by setting up an aname to localname mapping in +\&\fIkrb5.conf\fR. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth and account groups. +.IP ignore_root 4 +.IX Item "ignore_root" +[1.1] Do not do anything if the username is \f(CW\*(C`root\*(C'\fR. The authentication +and password calls will silently fail (allowing that status to be ignored +via a control of \f(CW\*(C`optional\*(C'\fR or \f(CW\*(C`sufficient\*(C'\fR), and the account and +session calls (including pam_setcred) will return PAM_IGNORE, telling the +PAM library to proceed as if they weren't mentioned in the PAM +configuration. This option is supported and will remain, but normally you +want to use \fIminimum_uid\fR instead. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR. +.IP minimum_uid= 4 +.IX Item "minimum_uid=" +[2.0] Do not do anything if the authenticated account name corresponds to +a local account and that local account has a UID lower than . If +both of those conditions are true, the authentication and password calls +will silently fail (allowing that status to be ignored via a control of +\&\f(CW\*(C`optional\*(C'\fR or \f(CW\*(C`sufficient\*(C'\fR), and the account and session calls +(including pam_setcred) will return PAM_IGNORE, telling the PAM library to +proceed as if they weren't mentioned in the PAM configuration. +.Sp +Using this option is highly recommended if you don't need to use Kerberos +to authenticate password logins to the root account (which isn't +recommended since Kerberos requires a network connection). It provides +some defense in depth against user principals that happen to match a +system account incorrectly authenticating as that system account. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR. +.IP only_alt_auth 4 +.IX Item "only_alt_auth" +[3.12] This option is used with \fIalt_auth_map\fR and forces the use of the +mapped principal for authentication. It disables fallback to normal +authentication in all cases and overrides \fIsearch_k5login\fR and +\&\fIforce_alt_auth\fR. If \fIalt_auth_map\fR is not set, it has no effect and +the standard authentication behavior is used. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP search_k5login 4 +.IX Item "search_k5login" +[2.0] Normally, the Kerberos implementation of pam_authenticate attempts +to obtain tickets for the authenticating username in the local realm. If +this option is set and the local user has a \fI.k5login\fR file in their home +directory, the module will instead open and read that \fI.k5login\fR file, +attempting to use the supplied password to authenticate as each principal +listed there in turn. If any of those authentications succeed, the user +will be successfully authenticated; otherwise, authentication will fail. +This option is useful for allowing password authentication (via console or +\&\fBsshd\fR without GSS-API support) to shared accounts. If there is no +\&\fI.k5login\fR file, the behavior is the same as normal. Using this option +requires that the user's \fI.k5login\fR file be readable at the time of +authentication. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.SS "Kerberos Behavior" +.IX Subsection "Kerberos Behavior" +.IP anon_fast 4 +.IX Item "anon_fast" +[4.6] Attempt to use Flexible Authentication Secure Tunneling (FAST) by +first authenticating as the anonymous user (WELLKNOWN/ANONYMOUS) and using +its credentials as the FAST armor. This requires anonymous PKINIT be +enabled for the local realm, that PKINIT be configured on the local +system, and that the Kerberos library support FAST and anonymous PKINIT. +.Sp +FAST is a mechanism to protect Kerberos against password guessing attacks +and provide other security improvements. To work, FAST requires that a +ticket be obtained with a strong key to protect exchanges with potentially +weaker user passwords. This option uses anonymous authentication to +obtain that key and then uses it to protect the subsequent authentication. +.Sp +If anonymous PKINIT is not available or fails, FAST will not be used and +the authentication will proceed as normal. +.Sp +To instead use an existing ticket cache for the FAST credentials, use +\&\fIfast_ccache\fR instead of this option. If both \fIfast_ccache\fR and +\&\fIanon_fast\fR are set, the ticket cache named by \fIfast_ccache\fR will be +tried first, and the Kerberos PAM module will fall back on attempting +anonymous PKINIT if that cache could not be used. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth and password groups. +.Sp +The operation is the same as if using the \fIfast_ccache\fR option, but the +cache is created and destroyed automatically. If both \fIfast_ccache\fR and +\&\fIanon_fast\fR options are used, the \fIfast_ccache\fR takes precedent and no +anonymous authentication is done. +.IP fast_ccache= 4 +.IX Item "fast_ccache=" +[4.3] The same as \fIanon_fast\fR, but use an existing Kerberos ticket cache +rather than anonymous PKINIT. This allows use of FAST with a realm that +doesn't support PKINIT or doesn't support anonymous authentication. +.Sp + should be a credential cache containing a ticket obtained +using a strong key, such as the randomized key for the host principal of +the local system. If names a ticket cache that is readable +by the authenticating process and has tickets then FAST will be attempted. +The easiest way to use this option is to use a program like \fBk5start\fR to +maintain a ticket cache using the host's keytab. This ticket cache should +normally only be readable by root, so this option will not be able to +protect authentications done as non-root users (such as screensavers). +.Sp +If no credentials are present in the ticket cache, or if the ticket cache +does not exist or is not readable, FAST will not used and authentication +will proceed as normal. However, if the credentials in that ticket cache +are expired, authentication will fail if the KDC supports FAST. +.Sp +To use anonymous PKINIT to protect the FAST exchange, use the \fIanon_fast\fR +option instead. \fIanon_fast\fR is easier to configure, since no existing +ticket cache is required, but requires PKINIT be available and configured +and that the local realm support anonymous authentication. If both +\&\fIfast_ccache\fR and \fIanon_fast\fR are set, the ticket cache named by +\&\fIfast_ccache\fR will be tried first, and the Kerberos PAM module will fall +back on attempting anonymous PKINIT if that cache could not be used. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth and password groups. +.IP forwardable 4 +.IX Item "forwardable" +[1.0] Obtain forwardable tickets. If set (to either true or false, +although it can only be set to false in \fIkrb5.conf\fR), this overrides the +Kerberos library default set in the [libdefaults] section of \fIkrb5.conf\fR. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP keytab= 4 +.IX Item "keytab=" +[3.0] Specifies the keytab to use when validating the user's credentials. +The default is the default system keytab (normally \fI/etc/krb5.keytab\fR), +which is usually only readable by root. Applications not running as root +that use this PAM module for authentication may wish to point it to +another keytab the application can read. The first principal found in the +keytab will be used as the principal for credential verification. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP realm= 4 +.IX Item "realm=" +[2.2] Set the default Kerberos realm and obtain credentials in that realm, +rather than in the normal default realm for this system. If this option +is used, it should be set for all groups being used for consistent +results. This setting will affect authorization decisions since it +changes the default realm. This setting will also change the service +principal used to verify the obtained credentials to be in the specified +realm. +.Sp +If you only want to set the realm assumed for user principals without +changing the realm for authorization decisions or the service principal +used to verify credentials, see the \fIuser_realm\fR option. +.IP renew_lifetime= 4 +.IX Item "renew_lifetime=" +[2.0] Obtain renewable tickets with a maximum renewable lifetime of +. should be a Kerberos lifetime string such as +\&\f(CW\*(C`2d4h10m\*(C'\fR or a time in minutes. If set, this overrides the Kerberos +library default set in the [libdefaults] section of \fIkrb5.conf\fR. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP ticket_lifetime= 4 +.IX Item "ticket_lifetime=" +[3.0] Obtain tickets with a maximum lifetime of . +should be a Kerberos lifetime string such as \f(CW\*(C`2d4h10m\*(C'\fR or a time in +minutes. If set, this overrides the Kerberos library default set in the +[libdefaults] section of \fIkrb5.conf\fR. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP user_realm 4 +.IX Item "user_realm" +[4.6] Obtain credentials in the specified realm rather than in the default +realm for this system. If this option is used, it should be set for all +groups being used for consistent results (although the account group +currently doesn't care about realm). This will not change authorization +decisions. If the obtained credentials are supposed to allow access to a +shell account, the user will need an appropriate \fI.k5login\fR file entry or +the system will have to have a custom aname_to_localname mapping. +.SS "PAM Behavior" +.IX Subsection "PAM Behavior" +.IP clear_on_fail 4 +.IX Item "clear_on_fail" +[3.9] When changing passwords, PAM first does a preliminary check through +the complete password stack, and then calls each module again to do the +password change. After that preliminary check, the order of module +invocation is fixed. This means that even if the Kerberos password change +fails (or if one of the other password changes in the stack fails), other +password PAM modules in the stack will still be called even if the failing +module is marked required or requisite. When using multiple password PAM +modules to synchronize passwords between multiple systems when they +change, this behavior can cause unwanted differences between the +environments. +.Sp +Setting this option provides a way to work around this behavior. If this +option is set and a Kerberos password change is attempted and fails (due +to network errors or password strength checking on the KDC, for example), +this module will clear the stored password in the PAM stack. This will +force any subsequent modules that have \fIuse_authtok\fR set to fail so that +those environments won't get out of sync with the password in Kerberos. +The Kerberos PAM module will not meddle with the stored password if it +skips the user due to configuration such as minimum_uid. +.Sp +Unfortunately, setting this option interferes with other desirable PAM +configurations, such as attempting to change the password in Kerberos +first and falling back on the local Unix password database if that fails. +It therefore isn't the default. Turn it on (and list pam_krb5 first after +pam_cracklib if used) when synchronizing passwords between multiple +environments. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the password group. +.IP debug 4 +.IX Item "debug" +[1.0] Log more verbose trace and debugging information to syslog at +LOG_DEBUG priority, including entry and exit from each of the external PAM +interfaces (except pam_close_session). +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR. +.IP defer_pwchange 4 +.IX Item "defer_pwchange" +[3.11] By default, pam\-krb5 lets the Kerberos library handle prompting for +a password change if an account's password is expired during the auth +group. If this fails, \fBpam_authenticate()\fR returns an error. +.Sp +According to the PAM standard, this is not the correct way to handle +expired passwords. Instead, \fBpam_authenticate()\fR should return success +without attempting a password change, and then \fBpam_acct_mgmt()\fR should +return PAM_NEW_AUTHTOK_REQD, at which point the calling application is +responsible for either rejecting the authentication or calling +\&\fBpam_chauthtok()\fR. However, following the standard requires that all +applications call \fBpam_acct_mgmt()\fR and check its return status; otherwise, +expired accounts may be able to successfully authenticate. Many +applications do not do this. +.Sp +If this option is set, pam\-krb5 uses the fully correct PAM mechanism for +handling expired accounts instead of failing in \fBpam_authenticate()\fR. Due +to the security risk of widespread broken applications, be very careful +about enabling this option. It should normally only be turned on to solve +a specific problem (such as using Solaris Kerberos libraries that don't +support prompting for password changes during authentication), and then +only for specific applications known to call \fBpam_acct_mgmt()\fR and check its +return status properly. +.Sp +This option is only supported when pam\-krb5 is built with MIT Kerberos. +If built against Heimdal, this option does nothing and normal expired +password change handling still happens. (Heimdal is missing the required +API to implement this option, at least as of version 1.6.) +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP fail_pwchange 4 +.IX Item "fail_pwchange" +[4.2] By default, pam\-krb5 lets the Kerberos library handle prompting for +a password change if an account's password is expired during the auth +group. If this option is set, expired passwords are instead treated as an +authentication failure identical to an incorrect password. Also see +\&\fIdefer_pwchange\fR and \fIforce_pwchange\fR. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP force_pwchange 4 +.IX Item "force_pwchange" +[3.11] If this option is set and authentication fails with a Kerberos +error indicating the user's password is expired, attempt to immediately +change their password during the authenticate step. Under normal +circumstances, this is unnecessary. Most Kerberos libraries will do this +for you, and setting this option will prompt the user twice to change +their password if the first attempt (done by the Kerberos library) fails. +However, some system Kerberos libraries (such as Solaris's) have password +change prompting disabled in the Kerberos library; on those systems, you +can set this option to simulate the normal library behavior. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP no_update_user 4 +.IX Item "no_update_user" +[4.7] Normally, if pam\-krb5 is able to canonicalize the principal to a +local name using \fBkrb5_aname_to_localname()\fR or similar calls, it changes +the PAM_USER variable for this PAM session to the canonicalized local +name. Setting this option disables this behavior and leaves PAM_USER set +to the initial authentication identity. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth group. +.IP silent 4 +.IX Item "silent" +[1.0] Don't show messages and errors from Kerberos, such as warnings of +expiring passwords, to the user via the prompter. This is equivalent to +the behavior when the application passes in PAM_SILENT, but can be set in +the PAM configuration. +.Sp +This option is only applicable to the auth and password groups. +.IP trace= 4 +.IX Item "trace=" +[4.6] Enables Kerberos library trace logging to the specified log file if +it is supported by the Kerberos library. This is intended for temporary +debugging. The specified file will be appended to without further +security checks, so do not specify a file in a publicly writable directory +like \fI/tmp\fR. +.SS PKINIT +.IX Subsection "PKINIT" +.IP pkinit_anchors= 4 +.IX Item "pkinit_anchors=" +[3.0] When doing PKINIT authentication, use as the client trust +anchors. This is normally a reference to a file containing the trusted +certificate authorities. This option is only used if \fItry_pkinit\fR or +\&\fIuse_pkinit\fR are set. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth and password groups. +.IP pkinit_prompt 4 +.IX Item "pkinit_prompt" +[3.0] Before attempting PKINIT authentication, prompt the user to insert a +smart card. You may want to set this option for programs such as +\&\fBgnome-screensaver\fR that call PAM as soon as the mouse is touched and +don't give the user an opportunity to enter the smart card first. Any +information entered at the first prompt is ignored. If \fItry_pkinit\fR is +set, a user who wishes to use a password instead can just press Enter and +then enter their password as normal. This option is only used if +\&\fItry_pkinit\fR or \fIuse_pkinit\fR are set. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth and password groups. +.IP pkinit_user= 4 +.IX Item "pkinit_user=" +[3.0] When doing PKINIT authentication, use as the user ID. The +value of this string is highly dependent on the type of PKINIT +implementation you're using, but will generally be something like: +.Sp +.Vb 1 +\& PKCS11:/usr/lib/pkcs11/lib/soft\-pkcs11.so +.Ve +.Sp +to specify the module to use with a smart card. It may also point to a +user certificate or to other types of user IDs. See the Kerberos library +documentation for more details. This option is only used if \fItry_pkinit\fR +or \fIuse_pkinit\fR are set. +.Sp +This option can be set in \f(CW\*(C`[appdefaults]\*(C'\fR in \fIkrb5.conf\fR and is only +applicable to the auth and password groups. +.IP preauth_opt=