From nobody Thu Apr 2 11:20:41 2026 X-Original-To: dev-commits-src-branches@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 4fmfY60m0Zz6YH4n for ; Thu, 02 Apr 2026 11:20: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmfY56H00z3JCl for ; Thu, 02 Apr 2026 11:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775128841; 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=pfrphvk7LTLBv5DTzw2BCPi/R2NbxJkaW3hZBus/lQs=; b=fIxWVpAhRewvQv/aiFeHQtQYS3iU/K6BFzNiX1zVwdZqZZ9mYy0IBlMqQAIQTiaLk402Tn uSESoHwyHHlVDiU7zErbSFRDMPGEPS8QvLopQd8vNT7nzfoSAJAS9AnkKQDSghYxFIjDZI 7eX19SkUHivR9SjVOZP3iFtRpsHmrDmxp2i4TckdGyKFSpIpASKGSTa85n25VrAyC22j2a d0dgXvnb2RAvsgU1qo8OFAZmYQvlS9phoGaOkr2OnNjYThlm6gZg4eMJlsFxE6OrpWRBWO 951uVD6Fz55DOUEtPp2bd0Wx++GTkE8zYpTp6/ak8yFsGD+LIqST7UnsbtGCmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775128841; a=rsa-sha256; cv=none; b=j4hjWt6GmYPLj4Fba89DklhiB00fe7Z2QwIg33YZ6+TpQK8GDulVRXhCB0pOcRbsQGWO7X GgNCdVDSAG5usociCvjGepYjCOuy3is1W+ZDvvwyVABFqHIPWaDFsG2H0bH2bqhfsy854k HVLRWN3Rdg71R0iYLKQJXEJ+wZxwML7EEpYeKtZuPuDVAde3RXtNeB3ZSzxbqXwSItUy22 Ycs8L/4KG1AApYZWCES582vWOrLKuf1urVFs01DfBTJF50H7GL6p/Kfy84sCWpW3xXbcQr tec9Y+FxRqRMbRYi+HuJKR+tz4/1zqg8vBFk4Uq4Xy895134f4uZpjcOzZw44A== 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=1775128841; 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=pfrphvk7LTLBv5DTzw2BCPi/R2NbxJkaW3hZBus/lQs=; b=KbZRqLjx96GwviLWG5BaulIjvVDN2AO0SvIUmaKHmDiPYiJJ7y5FCx2x44xU6V3vRXzhXE w3p0gzf0xO+61CCsaXAlqm1tVzxwdiV65g9PvZpJJANcuI3ZFT2n93AjQy/Xn6ac81kZ21 C/wZ9Fonw3NLWBLyYuq3Yhdz0uwWI4YMijI79gn+bEDXUCfuYvQp6QYjYbDqe3mcrp7iNY T4iVFrcduko/nMjgwIMx4tJwC/N0jfFxGmogeEMSdw1T8bPBvlMFyltuNzFZtvzWHu9Zni cRlRI0AfIvvwry0FNrSre4ISa3OhtrMDQvtcAskiFN+jKY0rtZTfeLSutMTBrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmfY55VX8z105Y for ; Thu, 02 Apr 2026 11:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e1a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 11:20:41 +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: b3f5166ee0d4 - stable/14 - tzcode: Add test case for setugid programs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: b3f5166ee0d4be78ca6b2e4f958acf788545be8b Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 11:20:41 +0000 Message-Id: <69ce5109.1e1a5.1c1984e5@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b3f5166ee0d4be78ca6b2e4f958acf788545be8b commit b3f5166ee0d4be78ca6b2e4f958acf788545be8b Author: Dag-Erling Smørgrav AuthorDate: 2025-08-25 11:56:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-02 11:16:00 +0000 tzcode: Add test case for setugid programs Fixes: a6b19979bf13 ("tzcode: Fix TZ for non-setugid programs") Differential Revision: https://reviews.freebsd.org/D52124 (cherry picked from commit c6c7c7ac94636a1f705a6f4d6ea74b1e62ad517d) --- lib/libc/tests/stdtime/Makefile | 4 +- lib/libc/tests/stdtime/detect_tz_changes_test.c | 53 ++++++++++++++++++++----- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/lib/libc/tests/stdtime/Makefile b/lib/libc/tests/stdtime/Makefile index adb883cc5b9a..6b9068e1641b 100644 --- a/lib/libc/tests/stdtime/Makefile +++ b/lib/libc/tests/stdtime/Makefile @@ -1,8 +1,10 @@ .include ATF_TESTS_C+= strptime_test -.if ${MK_DETECT_TZ_CHANGES} != "no" ATF_TESTS_C+= detect_tz_changes_test + +.if ${MK_DETECT_TZ_CHANGES} != "no" +CFLAGS.detect_tz_changes_test+= -DDETECT_TZ_CHANGES .endif TESTSDIR:= ${TESTSBASE}/${RELDIR:C/libc\/tests/libc/} diff --git a/lib/libc/tests/stdtime/detect_tz_changes_test.c b/lib/libc/tests/stdtime/detect_tz_changes_test.c index 75f55bdede04..e3fdcc0baef7 100644 --- a/lib/libc/tests/stdtime/detect_tz_changes_test.c +++ b/lib/libc/tests/stdtime/detect_tz_changes_test.c @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include +#include #include #include @@ -41,6 +43,8 @@ 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; @@ -272,6 +276,21 @@ ATF_TC_BODY(detect_tz_changes, tc) ATF_REQUIRE(WIFEXITED(status)); ATF_REQUIRE_EQ(0, WEXITSTATUS(status)); } +#endif /* DETECT_TZ_CHANGES */ + +static void +test_tz_env(const char *tzval, const char *expect) +{ + char buf[128]; + struct tm *tm; + size_t len; + + setenv("TZ", tzval, 1); + ATF_REQUIRE((tm = localtime(&then)) != NULL); + len = strftime(buf, sizeof(buf), "%z (%Z)", tm); + ATF_REQUIRE(len > 0); + ATF_CHECK_STREQ(expect, buf); +} ATF_TC(tz_env); ATF_TC_HEAD(tz_env, tc) @@ -280,25 +299,37 @@ ATF_TC_HEAD(tz_env, tc) } ATF_TC_BODY(tz_env, tc) { - char buf[128]; - const struct tzcase *tzcase = NULL; - struct tm *tm; - size_t len; + const struct tzcase *tzcase; - for (tzcase = tzcases; tzcase->tzfn != NULL; tzcase++) { - setenv("TZ", tzcase->tzfn, 1); - ATF_REQUIRE((tm = localtime(&then)) != NULL); - len = strftime(buf, sizeof(buf), "%z (%Z)", tm); - ATF_REQUIRE(len > 0); - ATF_REQUIRE_STREQ(tzcase->expect, buf); - } + for (tzcase = tzcases; tzcase->tzfn != NULL; tzcase++) + test_tz_env(tzcase->tzfn, tzcase->expect); +} + +ATF_TC(tz_env_setugid); +ATF_TC_HEAD(tz_env_setugid, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test TZ environment variable " + "in setugid process"); + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(tz_env_setugid, tc) +{ + const struct tzcase *tzcase; + + ATF_REQUIRE_EQ(0, seteuid(UID_NOBODY)); + ATF_REQUIRE(issetugid()); + for (tzcase = tzcases; tzcase->tzfn != NULL; tzcase++) + test_tz_env(tzcase->tzfn, tzcase->expect); } ATF_TP_ADD_TCS(tp) { +#ifdef DETECT_TZ_CHANGES debugging = !getenv("__RUNNING_INSIDE_ATF_RUN") && isatty(STDERR_FILENO); ATF_TP_ADD_TC(tp, detect_tz_changes); +#endif /* DETECT_TZ_CHANGES */ ATF_TP_ADD_TC(tp, tz_env); + ATF_TP_ADD_TC(tp, tz_env_setugid); return (atf_no_error()); }