Update.

2004-10-06  Ulrich Drepper  <drepper@redhat.com>

	* resolv/res_mkquery.c (res_nmkquery): Reject randombits value if
	low 16 bits are zero.

3 files changed, 24 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 796971037f..e0245eb811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* resolv/res_mkquery.c (res_nmkquery): Reject randombits value if
+	low 16 bits are zero.
+
 2004-10-06  Jakub Jelinek  <jakub@redhat.com>
 
 	* posix/tst-getaddrinfo2.c: Include stdlib.h and string.h.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 136cdfcd20..68e643f282 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,21 @@
+2004-10-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/jmp-unwind.c: Include pthreadP.h instead
+	of pthread-functions.h and pthreaddef.h.
+	* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise.
+
+	* sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h (pthread_cond_t):
+	Change __data.__nwaiters from int to unsigned int.
+
+	* tst-clock2.c (do_test): Don't fail if _POSIX_THREAD_CPUTIME == 0 and
+	sysconf (_SC_THREAD_CPUTIME) returns negative value.
+
+	* allocatestack.c (__find_thread_by_id): Move attribute_hidden
+	before return type.
+
+	* sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h.
+	(JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from CFA.
+
 2004-10-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* tst-cancel4.c (tf_msgrcv): Check for failure in msgget.  If the
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 5b705b0e8b..9825ae0fa3 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -141,7 +141,7 @@ res_nmkquery(res_state statp,
 	    randombits = (tv.tv_sec << 8) ^ tv.tv_usec;
 #endif
 	  }
-	while (randombits == 0);
+	while ((randombits & 0xffff) == 0);
 	statp->id = (statp->id + randombits) & 0xffff;
 #endif
 	hp->opcode = op;