Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 May 2026 16:01:29 +0000
From:      Olivier Certner <olce@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 22a0912bb1dc - main - MAC/do: Expand "conf" to "configuration" in a panic message on INVARIANTS
Message-ID:  <6a19b859.35d20.36ae3bec@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by olce:

URL: https://cgit.FreeBSD.org/src/commit/?id=22a0912bb1dc71f18d2e33ec9915a54a8324a3ff

commit 22a0912bb1dc71f18d2e33ec9915a54a8324a3ff
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2026-03-23 14:42:07 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2026-05-29 15:20:35 +0000

    MAC/do: Expand "conf" to "configuration" in a panic message on INVARIANTS
    
    No functional change.
    
    Reviewed by:    bapt
    Fixes:          9818224174c4 ("MAC/do: Executable paths feature (GSoC 2025's final state)")
    MFC after:      1 month
    Sponsored by:   The FreeBSD Foundation
    Pull Request:   https://ron-dev.freebsd.org/FreeBSD/src/pulls/38
---
 sys/security/mac_do/mac_do.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c
index 2258c358ce92..9da7aaa257d5 100644
--- a/sys/security/mac_do/mac_do.c
+++ b/sys/security/mac_do/mac_do.c
@@ -1201,8 +1201,8 @@ check_conf_use_count(const struct conf *const conf, u_int expected)
 	const u_int use_count = refcount_load(&conf->use_count);
 
 	if (use_count != expected)
-		panic("MAC/do: Conf at %p: Use count is %u, expected %u",
-		    conf, use_count, expected);
+		panic("MAC/do: Configuration at %p: Use count is %u, "
+		    "expected %u", conf, use_count, expected);
 }
 #else
 #define check_conf_use_count(...)


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a19b859.35d20.36ae3bec>