From nobody Thu Apr 2 11:20:44 2026 X-Original-To: dev-commits-src-all@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 4fmfY83DJgz6YGtk for ; Thu, 02 Apr 2026 11:20: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmfY80sGRz3JSt for ; Thu, 02 Apr 2026 11:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775128844; 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=2BBV3WVkA/aIaH9gWWmYj2N6I0lvjW1XV9UDQoAQPk0=; b=phFwYm6KqKjECLsWefYCpO44MvmfSkPh4HPR6SmvDc4PC0NqnxILvO3dZnzLY0WLzoNLXf MKMKTXP3Z7VkPuMCcgcHstyIInV2YASiJxBWE3nZOuCeUd2trkoI/T1svT/g4kMe+F2sMu qujzF3eTsegB+zxrczfZqOmzx/zBafmg14N4l3jApKCbVpNSMESvuMRawZGqZUFVZkcLlE zujiQAfq+SHUv7YzX63uqw+GZ1B5/ILDy9E9dWSQmej9tm6szwFMqjOLDzCsvBP34vWfl9 I5Pgv65i/RCIGNTJyYmwxD0gQycMexVGZxQJuY225bUVTofm2pcMCA1bECbXag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775128844; a=rsa-sha256; cv=none; b=cN4IUnwmyxKSQmwGVmtxcGWz5ts/tqnW1ppe18YJXDHFz4ARHKUNRtm1p7hgyrUaWleIGF QsVfClmpTIgwIp/89MKL+e8OPGLRo50OAc5N0FS2+giOCPAax/c9bgcunkQxs8Oav8/hii uLhNK+eAiXmzfLhm9/cV81T0UQBGL6olwSuahMDbauvvpeQa40hTcNGHtarQsntlC/mKrV n5N6l4ZKAV08mV4TXhztvxqPffZW/4mcoYdua70oQ+Xe+nl78XWEW3SqPQk8Vkm7eANbSp YnbI3uuy3qleWGZTdcW9KZ9kmYFdqamIC63GVEzsra+I90RYgqiCs/tvMozebw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775128844; 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=2BBV3WVkA/aIaH9gWWmYj2N6I0lvjW1XV9UDQoAQPk0=; b=w0Db25JFh3rdA3CSCR7TeVR/nOwOXjeU9Rbuj0Y5XRkbYwWSqyruHHZgxheylUpypZUjH3 T0M/p0t+xN/kMuKNsvL/YmoRkRxO7xMCP09RX2XSKMX3ddnVtGONvM0pwtAzDiirZ5yOnx vxmwU2jL5LGAA48fRR6+8gPUOGojFqkpwAie/xLPZ1IFh+2SEIgt4AtdyGf+dF0qgXD44T /9E9K1cts2MbS/OFsXfKc8OdCSWrxRfKytWW0RqJRPtxiZpRoPnaP8Chx7K7bKP8gJd9bM wGdy92oTByZC8knCvbT1O9iQx6rWCGQA0isqeV9LoGUjTC7zEDZxnncWEX0ujQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmfY80PMpz100p for ; Thu, 02 Apr 2026 11:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f006 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 11:20:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2a4e0e0391ea - stable/14 - tzcode: Add a test case for thin jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2a4e0e0391ea130c3f3f5116106710dee2404399 Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 11:20:44 +0000 Message-Id: <69ce510c.1f006.4b7a9766@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2a4e0e0391ea130c3f3f5116106710dee2404399 commit 2a4e0e0391ea130c3f3f5116106710dee2404399 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-27 12:27:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-02 11:16:00 +0000 tzcode: Add a test case for thin jails Add a test case for a typical thin jail scenario where TZDIR does not exist and we get our information from /etc/localtime. This is technically already covered by the detect_tz_changes test case, but this new test case is independent of the DETECT_TZ_CHANGES option. (cherry picked from commit b2f394b90062b9f4aee51de4e5fd7513b3db7362) --- lib/libc/tests/stdtime/detect_tz_changes_test.c | 43 +++++++++++++++++++++---- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/lib/libc/tests/stdtime/detect_tz_changes_test.c b/lib/libc/tests/stdtime/detect_tz_changes_test.c index e3fdcc0baef7..ad8c4818669d 100644 --- a/lib/libc/tests/stdtime/detect_tz_changes_test.c +++ b/lib/libc/tests/stdtime/detect_tz_changes_test.c @@ -44,12 +44,6 @@ static const struct tzcase { static const time_t then = 1751328000; /* 2025-07-01 00:00:00 UTC */ -#ifdef DETECT_TZ_CHANGES -static const char *tz_change_interval_sym = "__tz_change_interval"; -static int *tz_change_interval_p; -static const int tz_change_interval = 3; -static int tz_change_timeout = 90; - static bool debugging; static void @@ -89,6 +83,35 @@ change_tz(const char *tzn) debug("time zone %s installed", tzn); } +ATF_TC(thin_jail); +ATF_TC_HEAD(thin_jail, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test typical thin jail scenario"); + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(thin_jail, tc) +{ + const struct tzcase *tzcase = tzcases; + char buf[128]; + struct tm *tm; + size_t len; + + /* prepare chroot */ + ATF_REQUIRE_EQ(0, mkdir("root", 0755)); + ATF_REQUIRE_EQ(0, mkdir("root/etc", 0755)); + change_tz(tzcase->tzfn); + /* enter chroot */ + ATF_REQUIRE_EQ(0, chroot("root")); + ATF_REQUIRE_EQ(0, chdir("/")); + /* check timezone */ + unsetenv("TZ"); + ATF_REQUIRE((tm = localtime(&then)) != NULL); + len = strftime(buf, sizeof(buf), "%z (%Z)", tm); + ATF_REQUIRE(len > 0); + ATF_CHECK_STREQ(tzcase->expect, buf); +} + +#ifdef DETECT_TZ_CHANGES /* * Test time zone change detection. * @@ -106,6 +129,11 @@ change_tz(const char *tzn) * after we've received and discarded the first report from the child, * which should come almost immediately on startup. */ +static const char *tz_change_interval_sym = "__tz_change_interval"; +static int *tz_change_interval_p; +static const int tz_change_interval = 3; +static int tz_change_timeout = 90; + ATF_TC(detect_tz_changes); ATF_TC_HEAD(detect_tz_changes, tc) { @@ -324,9 +352,10 @@ ATF_TC_BODY(tz_env_setugid, tc) ATF_TP_ADD_TCS(tp) { -#ifdef DETECT_TZ_CHANGES debugging = !getenv("__RUNNING_INSIDE_ATF_RUN") && isatty(STDERR_FILENO); + ATF_TP_ADD_TC(tp, thin_jail); +#ifdef DETECT_TZ_CHANGES ATF_TP_ADD_TC(tp, detect_tz_changes); #endif /* DETECT_TZ_CHANGES */ ATF_TP_ADD_TC(tp, tz_env);