aboutsummaryrefslogtreecommitdiff
path: root/time/tzfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'time/tzfile.c')
-rw-r--r--time/tzfile.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/time/tzfile.c b/time/tzfile.c
index ed7b0932f3..e063d5d04f 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -112,17 +112,19 @@ __tzfile_read (const char *file)
else if (*file == '\0')
/* User specified the empty string; use UTC explicitly. */
file = "Universal";
-
- /* We must not allow to read an arbitrary file in a setuid program.
- So we fail for any file which is not in the directory hierachy
- starting at TZDIR. */
- if (__libc_enable_secure
- && ((*file == '/'
- && memcmp (file, default_tzdir, sizeof (default_tzdir) - 1) != 0)
- || strstr (file, "../") != NULL))
- /* This test a certainly a bit too restrictive but it should catch all
- critical case. */
- return;
+ else
+ {
+ /* We must not allow to read an arbitrary file in a setuid
+ program. So we fail for any file which is not in the
+ directory hierachy starting at TZDIR. */
+ if (__libc_enable_secure
+ && ((*file == '/'
+ && memcmp (file, default_tzdir, sizeof (default_tzdir) - 1))
+ || strstr (file, "../") != NULL))
+ /* This test a certainly a bit too restrictive but it should
+ catch all critical case. */
+ return;
+ }
if (*file != '/')
{