diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-02-03 03:18:58 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-02-03 03:18:58 +0000 |
| commit | 1228ed5cd520342af906f07eb1b21be82d0b40d0 (patch) | |
| tree | de90f47d4acf5c7d92e68d9e5bf4e43a33144a17 /time/tzfile.c | |
| parent | c0e4567461c09ba47ddbc20e6b0ab09bdb0237ab (diff) | |
update from main archive 970202cvs/libc-970203
1997-02-03 02:33 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-deps.c (_dl_map_object_deps): Handle multiple AUXILIARY
entries. This is still no complete implementation since AUXILIARY
entries in other shared objects are not yet handled.
* libio/libio.h (_IO_cookie_io_functions_t): Move to C++ protected
place.
* po/es.po: Update.
* po/fr.po: Update.
* po/nl.po: Update.
* time/Makefile: Better cross-compile support. Avoid test which
cannot be run.
(CFLAGS-tzset.c): New variable. Overwrite TZDEFAULT value from
tzfile.h file.
* time/tzfile.c (__tzfile_read): Allow TZDEFAULT start with '/' even
in SUID programs.
* time/tzset.c (__tzset_internal): If TZ envvar is not set use same
default values as in tzfile.c.
* elf/dynamic-link.h (elf_get_dynamic_info): Recognize versioning
tags.
* elf/link.h: Likewise.
* elf/elf.h: Add tag definitions and data structures for versioning.
1997-02-03 02:17 Ulrich Drepper <drepper@cygnus.com>
* nis/rpcsvc/yp.x (struct ypresp_key_val): There is not stupid
"Sun bug". This is the order of elements also used by 4.4BSD.
* nis/rpcsvc/yp.h: Likewise.
Reported by HJ Lu.
1997-02-02 12:13 H.J. Lu <hjl@gnu.ai.mit.edu>
* sunrpc/Makefile ($(objpfx)x%.h, $(objpfx)x%.c): Add "@:" as
action.
* Makefile (install): Pass installation directories as arguments
to ldconfig.
1997-02-02 23:15 Ulrich Drepper <drepper@cygnus.com>
* malloc/malloc.c (__after_morecore_hook): New variable.
(malloc_extend_top): Call __after_morecore_hook if set.
(main_trim): Likewise.
* malloc/malloc.h: Add declaration of __after_morecore_hook.
Suggested by Marcus Daniels.
1997-02-02 23:00 Marcus G. Daniels <marcus@tdb.com>
* malloc/malloc.c (rEALLOc): Protect tsd_setspecific call by
#ifndef NO_THREADS.
(mallinfo): Likewise.
* malloc/malloc.c (__morecore): Make external since it is used in
programs.
1997-02-02 15:10 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/statbuf.h (struct stat): Make st_dev field
unsigned.
1997-02-01 23:36 Richard Henderson <rth@tamu.edu>
* sysdeps/alpha/stxncpy.S ($unaligned) [src % 8 > dst % 8]: Don't
use t6 as a temporary; it contains bits we still need in $u_head.
1997-01-31 15:05 John Bowman <bowman@ipp-garching.mpg.de>
* sysdeps/i386/fpu/__math.h [__USE_MISC]: Don't declare prototypes
using __ prefix. Add prototype for log1p.
Diffstat (limited to 'time/tzfile.c')
| -rw-r--r-- | time/tzfile.c | 24 |
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 != '/') { |