Attachment 248591 Details for Bug 367461 – Patch from above URL for posterity

[patch] Patch from above URL for posterity

nss_ldap-226-pthread-sanity.patch (text/plain), 2.09 KB, created by Josh Bressers on 2007-11-05 21:00:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2007-11-05 21:00:37 UTC

Size: 2.09 KB

patch

obsolete

>--- nss_ldap-226/ldap-nss.c.pthread	2007-02-07 13:01:23.000000000 +0100
>+++ nss_ldap-226/ldap-nss.c	2007-02-07 13:13:10.000000000 +0100
>@@ -937,6 +937,11 @@
>    * threading library, and we need to compare the current
>    * process ID against the saved one to figure out
>    * whether we've forked. 
>+   *
>+   * --
>+   *  __pthread_once does not imply __pthread_atfork being non-NULL!
>+   *  <tjanouse@redhat.com>
>+   * --
>    * 
>    * Once we know whether we have forked or not, 
>    * courtesy of pthread_atfork() or us checking
>@@ -948,7 +953,7 @@
>    * will wreak all sorts of havoc or inefficiencies,
>    * respectively.
>    */
>-  if (__pthread_once == NULL)
>+  if (__pthread_once == NULL || __pthread_atfork == NULL)
>     pid = getpid ();
>   else
>     pid = -1;			/* linked against libpthreads, don't care */
>@@ -967,10 +972,10 @@
> #elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
>   syslog (LOG_DEBUG,
> 	  "nss_ldap: libpthreads=%s, __session.ls_conn=%p, __pid=%i, pid=%i, __euid=%i, euid=%i",
>-	  (__pthread_once == NULL ? "FALSE" : "TRUE"),
>+	  ((__pthread_once == NULL || __pthread_atfork == NULL) ? "FALSE" : "TRUE"),
> 	  __session.ls_conn,
>-	  (__pthread_once == NULL ? __pid : -1),
>-	  (__pthread_once == NULL ? pid : -1), __euid, euid);
>+	  ((__pthread_once == NULL || __pthread_atfork == NULL) ? __pid : -1),
>+	  ((__pthread_once == NULL || __pthread_atfork == NULL) ? pid : -1), __euid, euid);
> #else
>   syslog (LOG_DEBUG,
> 	  "nss_ldap: __session.ls_conn=%p, __pid=%i, pid=%i, __euid=%i, euid=%i",
>@@ -980,7 +985,7 @@
> 
> #ifndef HAVE_PTHREAD_ATFORK
> #if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
>-  if (__pthread_once == NULL && __pid != pid)
>+  if ((__pthread_once == NULL || __pthread_atfork == NULL) && __pid != pid)
> #else
>   if (__pid != pid)
> #endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */
>@@ -1045,7 +1050,7 @@
>    * we are linked against libpthreads. Otherwise,
>    * do close the session when the PID changes.
>    */
>-  if (__pthread_once == NULL)
>+  if (__pthread_once == NULL || __pthread_atfork == NULL)
>     __pid = pid;
>   else
>     __libc_once (__once, do_atfork_setup);

Actions: View | Diff

Attachments on bug 367461: 248591 | 248601