From nobody Sun Sep 28 11:12: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 4cZM9z5rGNz68W5d; Sun, 28 Sep 2025 11:12:55 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cZM9z5Bxzz3VC1; Sun, 28 Sep 2025 11:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759057975; 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=BFkHAsfUd8rJXydX3VahkyffK9I5jO4BMJ7817h+3+o=; b=j9W25SJPnekRyi7gv33XZL0MkOnsDneYudWFes/WnsecbcECw3cFUpYEWKNBUagdtyKCn+ H4JIoS9lFAgxa8e2eczx08Q0bydkqHoVeaY25mIO1+1s4CSuAUiMNJER3ycJ/7ChNXFqQv lC8XfDAayBkevTUDoLTMrKiWx0uHSrpIveyiebvufvyPnxK+6p3+D12GFzHFREEZwmWV0d eTKjoiU2NUpu1vjS8Betj90+MXgAqzOhU7/bXwJRxwnC0z5jSvW6JldSEHaP3ek+yXoQlH lAaiZy1UXmrZoVbiiNRRyUr6Ko6coe+yBGoHhAvMgKiNA0fBRDeNB8dnb6Ecbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759057975; 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=BFkHAsfUd8rJXydX3VahkyffK9I5jO4BMJ7817h+3+o=; b=fpV0UHlukDeWzKYftIuVuumATKfWLl7edFHO7/Yi7yiMp8Jw9NC2tI2f+vcGPVCZrgHYeS B3QiW/54KJg90/2YMbj3uIveKcGSMVLQ6mPO2tX+KrhrxaW6fE9v6k2IleHB4FNWmPuZQp d4VMcsKRpVkvE8hWtMbGxzCfSiJYMxwVQj9GwybnayXQf5zgtxPHEdMKS1siQqVhwhAifM /xT7DPgparZQ+M/c1vjbvJaYu+POsngHd6Bkv7RnqHO0cV23TfCVAgTgcvGuiCS3cWaLxE +1nwW0k7r/kQRk/XTl/YcO/Qh7EdskcOg095gPAXivlvV6tuqS2bwD4BW+Fgtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759057975; a=rsa-sha256; cv=none; b=CEswuMh7y+yqL7i7XozJ8GQd4J43ZH64Pf+irW3TiN7JQa1L/0kgZYK+BEExMQftCmbBKo DkSge14vTnLA2mGnMNXLahl5lzg6lP1/306VwnSmxF46MmQ/Pv6DOzcHIPPHrxy9u5AvlM LDzg0fmCUH8iJM5dWvhuZAAYV7GV4rAP+N7eKSkStEOqS2gCRtcSLlrHTlepmhTO4kdQDr p1yusHvicvgS+VGIV11WHVc60reoY3BRsJsTH9d47LJRVknIdyg/KWcpmRgsVVTEhfRnZc u1xa0P/VhqVcagXf1o7pwrXrMsKeF33MK1LmQxExptFTWVAFNp6sxPszvQfsFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cZM9z4bWJz2hX; Sun, 28 Sep 2025 11:12: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 58SBCt6O031227; Sun, 28 Sep 2025 11:12:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58SBCtaj031224; Sun, 28 Sep 2025 11:12:55 GMT (envelope-from git) Date: Sun, 28 Sep 2025 11:12:55 GMT Message-Id: <202509281112.58SBCtaj031224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 202b59c35ead - main - tzcode: Really fix issues when TZ is an absolute path 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 202b59c35ead5bd2b71331169bdeb4845cb655c1 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=202b59c35ead5bd2b71331169bdeb4845cb655c1 commit 202b59c35ead5bd2b71331169bdeb4845cb655c1 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-28 11:11:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-28 11:12:44 +0000 tzcode: Really fix issues when TZ is an absolute path This was accidentally left out of the previous commit. Fixes: df8bc705eb04 ("tzcode: Fix issues when TZ is an absolute path") --- contrib/tzcode/localtime.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index c98134f7be7c..8638ac9ba2cd 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -672,13 +672,16 @@ tzloadbody(char const *name, struct state *sp, char tzloadflags, if ((tzloadflags & TZLOAD_FROMENV) && strcmp(name, TZDEFAULT) == 0) tzloadflags &= ~TZLOAD_FROMENV; relname = name; - if (strncmp(relname, TZDIR "/", strlen(TZDIR) + 1) == 0) + if (strncmp(relname, TZDIR "/", strlen(TZDIR) + 1) == 0) { relname += strlen(TZDIR) + 1; + while (*relname == '/') + relname++; + } dd = open(TZDIR, O_DIRECTORY | O_RDONLY); if ((tzloadflags & TZLOAD_FROMENV) && issetugid()) { if (dd < 0) return errno; - if (fstatat(dd, name, &sb, AT_RESOLVE_BENEATH) < 0) { + if (fstatat(dd, relname, &sb, AT_RESOLVE_BENEATH) < 0) { fid = -1; } else if (!S_ISREG(sb.st_mode)) { fid = -1;