diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-02-15 02:32:58 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-02-15 02:32:58 +0000 |
| commit | 7434ccadbb6897d366d2377f84efe1e2cd61b02b (patch) | |
| tree | f8ba8ee60bf079077654583d3b7e92b63940ab19 /time | |
| parent | 795fbc9aa183e10526f6545e28cabf03be7feaf9 (diff) | |
| download | glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.zip glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.tar.gz glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.tar.bz2 | |
update from main archive 970214cvs/root-libc-2_0_x-branch
1997-02-13 11:44 Andreas Jaeger <aj@arthur.pfalz.de>
* 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 <marcus@sysc.pdx.edu>
* sysdeps/generic/dl-cache.c: Don't hardwire name of cache file.
Allow user to overwrite it.
1997-02-13 17:55 Ulrich Drepper <drepper@cygnus.com>
* 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 <aj@arthur.pfalz.de>
* 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.
Diffstat (limited to 'time')
| -rw-r--r-- | time/tzfile.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/time/tzfile.c b/time/tzfile.c index 663c02f..94b8a3c 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; } |