about summary refs log tree commit diff
path: root/time
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-02-13 05:10:35 +0000
committerUlrich Drepper <drepper@redhat.com>1997-02-13 05:10:35 +0000
commit795fbc9aa183e10526f6545e28cabf03be7feaf9 (patch)
treeedd3bcf7232ce1753bfadfff17380b4b09589ca5 /time
parent00de59a632eecc23a5eb1ddbadb8a770cd481f43 (diff)
downloadglibc-795fbc9aa183e10526f6545e28cabf03be7feaf9.tar.gz
glibc-795fbc9aa183e10526f6545e28cabf03be7feaf9.tar.xz
glibc-795fbc9aa183e10526f6545e28cabf03be7feaf9.zip
update from main archive 970212 cvs/libc-970214 cvs/libc-970213
1997-02-13 02:32  Ulrich Drepper  <drepper@cygnus.com>

	* time/time.h (__nanosleep): Define only when struct timespec is
	also available.
	Reported by Ross Alexander <rossa@stimpy.cs.auckland.ac.nz>.

1997-02-12 21:34  a sun  <asun@zoology.washington.edu>

	* sysdeps/unix/sysv/linux/netinet/udp.h: New file.
	* sysdeps/unix/sysv/linux/Dist: Add netinet/udp.h.

1997-02-12 21:16  Ulrich Drepper  <drepper@cygnus.com>

	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname_r): Follow patch
	of 1997-02-09 in resolv/gethnamaddr.c.

1997-02-11 18:52  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* libio/_G_config.h (_G_wint_t): New.

1997-02-09 11:31  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* resolv/gethnamaddr.c (gethostbyname2): Change sizeof (buf)
	to sizeof (buf.buf) while calling res_search ().

1997-02-03 20:01  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* nis/rpcsvc/yp_prot.h (ypresp_key_val): Change key to keydat,
	val to keydat, stat to status.

1997-02-12 20:45  Andreas Jaeger  <jaeger@informatik.uni-kl.de>

	* time/tzfile.c (__tzfile_read): Fix problem with SUID programs.

1997-02-12 19:55  Ulrich Drepper  <drepper@cygnus.com>

	* db/btree/bt_split.c (bt_psplit): Apply official patches #2 and #4
	by Keith Bostic.

1997-02-11 14:49  Andreas Jaeger  <jaeger@informatik.uni-kl.de>

	* stdlib/atoll.c: Undefined atoll, not atol.

1997-02-08 09:36  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/Makefile ($(common-objpfx)sysd-syscalls): Remove
	unused arguments of shell script.

	* Makeconfig (all-object-suffixes): New variable.
	* Makerules ($(+sysdir_pfx)sysd-rules, +make-deps): Use it instead
	of $(object-suffixes).
	* sysdeps/unix/make-syscalls.sh: Likewise.  Fix comment.
Diffstat (limited to 'time')
-rw-r--r--time/time.h2
-rw-r--r--time/tzfile.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/time/time.h b/time/time.h
index f6a26d919e..8c1aeaace6 100644
--- a/time/time.h
+++ b/time/time.h
@@ -267,10 +267,10 @@ extern int dysize __P ((int __year));
 #endif
 
 
+#ifdef __USE_POSIX199309
 /* Pause execution for a number of nanoseconds.  */
 extern int __nanosleep __P ((__const struct timespec *__requested_time,
 			     struct timespec *__remaining));
-#ifdef __USE_POSIX199309
 extern int nanosleep __P ((__const struct timespec *__requested_time,
 			   struct timespec *__remaining));
 #endif
diff --git a/time/tzfile.c b/time/tzfile.c
index e063d5d04f..663c02fda8 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -119,6 +119,7 @@ __tzfile_read (const char *file)
 	 directory hierachy starting at TZDIR.  */
       if (__libc_enable_secure
 	  && ((*file == '/'
+	       && (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