diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/tests/stdtime/detect_tz_changes_test.c | 43 | ||||
| -rw-r--r-- | lib/libutil++/Makefile | 4 | ||||
| -rw-r--r-- | lib/libutil++/freebsd__FILE_up.3 (renamed from lib/libutil++/freebsd::FILE_up.3) | 0 | ||||
| -rw-r--r-- | lib/libutil++/freebsd__addrinfo_up.3 (renamed from lib/libutil++/freebsd::addrinfo_up.3) | 0 | ||||
| -rw-r--r-- | lib/libutil++/freebsd__fd_up.3 (renamed from lib/libutil++/freebsd::fd_up.3) | 0 | ||||
| -rw-r--r-- | lib/libutil++/freebsd__malloc_up.3 (renamed from lib/libutil++/freebsd::malloc_up.3) | 0 | ||||
| -rw-r--r-- | lib/libutil++/freebsd__nvlist_up.3 (renamed from lib/libutil++/freebsd::nvlist_up.3) | 0 | ||||
| -rw-r--r-- | lib/libutil++/freebsd__pidfile.3 (renamed from lib/libutil++/freebsd::pidfile.3) | 0 | ||||
| -rw-r--r-- | lib/libutil++/freebsd__stringf.3 (renamed from lib/libutil++/freebsd::stringf.3) | 0 |
9 files changed, 40 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); diff --git a/lib/libutil++/Makefile b/lib/libutil++/Makefile index 56b64bbf358c..2e7a614df800 100644 --- a/lib/libutil++/Makefile +++ b/lib/libutil++/Makefile @@ -11,6 +11,10 @@ MAN+= freebsd::FILE_up.3 \ freebsd::pidfile.3 \ freebsd::stringf.3 +.for page in ${MAN} +MANSRC.${page}= ${page:S/:/_/g} +.endfor + .include <src.opts.mk> HAS_TESTS= diff --git a/lib/libutil++/freebsd::FILE_up.3 b/lib/libutil++/freebsd__FILE_up.3 index ea63b1233b43..ea63b1233b43 100644 --- a/lib/libutil++/freebsd::FILE_up.3 +++ b/lib/libutil++/freebsd__FILE_up.3 diff --git a/lib/libutil++/freebsd::addrinfo_up.3 b/lib/libutil++/freebsd__addrinfo_up.3 index 4845a76bfb61..4845a76bfb61 100644 --- a/lib/libutil++/freebsd::addrinfo_up.3 +++ b/lib/libutil++/freebsd__addrinfo_up.3 diff --git a/lib/libutil++/freebsd::fd_up.3 b/lib/libutil++/freebsd__fd_up.3 index 2ef2241a5c40..2ef2241a5c40 100644 --- a/lib/libutil++/freebsd::fd_up.3 +++ b/lib/libutil++/freebsd__fd_up.3 diff --git a/lib/libutil++/freebsd::malloc_up.3 b/lib/libutil++/freebsd__malloc_up.3 index b18e7854213a..b18e7854213a 100644 --- a/lib/libutil++/freebsd::malloc_up.3 +++ b/lib/libutil++/freebsd__malloc_up.3 diff --git a/lib/libutil++/freebsd::nvlist_up.3 b/lib/libutil++/freebsd__nvlist_up.3 index 43f76cf3ead3..43f76cf3ead3 100644 --- a/lib/libutil++/freebsd::nvlist_up.3 +++ b/lib/libutil++/freebsd__nvlist_up.3 diff --git a/lib/libutil++/freebsd::pidfile.3 b/lib/libutil++/freebsd__pidfile.3 index fb67253f5c02..fb67253f5c02 100644 --- a/lib/libutil++/freebsd::pidfile.3 +++ b/lib/libutil++/freebsd__pidfile.3 diff --git a/lib/libutil++/freebsd::stringf.3 b/lib/libutil++/freebsd__stringf.3 index 341fedef4343..341fedef4343 100644 --- a/lib/libutil++/freebsd::stringf.3 +++ b/lib/libutil++/freebsd__stringf.3 |