From 7434ccadbb6897d366d2377f84efe1e2cd61b02b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 15 Feb 1997 02:32:58 +0000 Subject: update from main archive 970214 1997-02-13 11:44 Andreas Jaeger * stdlib/qsort.c: Add prototype for _quicksort. * stdlib/msort.c (qsort): Correct prototype for _quicksort. * sysdeps/i386/Makefile (CFLAGS-rtld.c): Change to prevent warning from dl-machine.h. 1997-02-13 18:18 Marcus G. Daniels * sysdeps/generic/dl-cache.c: Don't hardwire name of cache file. Allow user to overwrite it. 1997-02-13 17:55 Ulrich Drepper * libio/_G_config.h: Make sure win_t is also defined for old gcc versions. Reported by Andreas Jaeger. 1997-02-13 11:44 Andreas Jaeger * db/btree/bt_split.c (bt_psplit): Fix typo in change of 1997-02-12. * time/tzfile.c (__tzfile_read): Change comment to follow change of 1997-02-12. --- time/tzfile.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'time') diff --git a/time/tzfile.c b/time/tzfile.c index 663c02fda8..94b8a3c8fe 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -116,14 +116,15 @@ __tzfile_read (const char *file) { /* 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. */ + directory hierachy starting at TZDIR + and which is not the system wide default TZDEFAULT. */ if (__libc_enable_secure && ((*file == '/' - && (memcmp(file, TZDEFAULT, sizeof(TZDEFAULT) -1)) + && memcmp (file, TZDEFAULT, sizeof (TZDEFAULT) - 1) && 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. */ + /* This test is certainly a bit too restrictive but it should + catch all critical cases. */ return; } -- cgit 1.4.1