From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 22 Nov 2009 19:43:57 +0000 (-0800)
Subject: Reinitialize _create_xid state after fork.
X-Git-Tag: glibc-2.11.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93721a641a55a943363149ed6a77eea4668878ce;p=thirdparty%2Fglibc.git

Reinitialize _create_xid state after fork.

Programs forking and using RPC in the forks would use the same XIDs.

(cherry picked from commit c5a8b997e2de005697a992d8db5c54995bd361a8)
---

diff --git a/ChangeLog b/ChangeLog
index e0fd11c15e3..143c45af392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-22  Ulrich Drepper  <drepper@redhat.com>
+
+	* sunrpc/create_xid.c (_create_xid): Reinitialize state after fork.
+
 2009-11-18  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #10162]
diff --git a/sunrpc/create_xid.c b/sunrpc/create_xid.c
index 4e769186442..c247568cee8 100644
--- a/sunrpc/create_xid.c
+++ b/sunrpc/create_xid.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 2000, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
 
@@ -27,7 +27,7 @@
 
 __libc_lock_define_initialized (static, createxid_lock)
 
-static int is_initialized;
+static pid_t is_initialized;
 static struct drand48_data __rpc_lrand48_data;
 
 unsigned long
@@ -37,13 +37,15 @@ _create_xid (void)
 
   __libc_lock_lock (createxid_lock);
 
-  if (!is_initialized)
+  pid_t pid = getpid ();
+  if (is_initialized != pid)
     {
       struct timeval now;
 
       __gettimeofday (&now, (struct timezone *) 0);
-      __srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data);
-      is_initialized = 1;
+      __srand48_r (now.tv_sec ^ now.tv_usec ^ pid,
+		   &__rpc_lrand48_data);
+      is_initialized = pid;
     }
 
   lrand48_r (&__rpc_lrand48_data, &res);