Attachment 306988 Details for Bug 448014 – proposed fix

[patch] proposed fix

nss_ldap-253-sigpipe_atfork.patch (text/plain), 2.42 KB, created by Nalin Dahyabhai on 2008-05-28 21:31:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nalin Dahyabhai

Created: 2008-05-28 21:31:55 UTC

Size: 2.42 KB

patch

obsolete

>Break the signal-handling setup portions of _nss_ldap_enter() and
>_nss_ldap_leave() into subfunctions which will preserve the sequence
>of operations but allow the signal handler to be set and reset when
>the lock is already held.  Set and reset the signal handler around
>the child's attempt to drop its connection to the server.
>
>--- nss_ldap-253/ldap-nss.c	2008-05-28 17:11:19.000000000 -0400
>+++ nss_ldap-253/ldap-nss.c	2008-05-28 17:15:10.000000000 -0400
>@@ -134,6 +134,9 @@ static int __sigaction_retval = -1;
> static void (*__sigpipe_handler) (int) = SIG_DFL;
> #endif /* HAVE_SIGACTION */
> 
>+void _nss_ldap_enter_signals (void);
>+void _nss_ldap_leave_signals (void);
>+
> /*
>  * Global LDAP session.
>  */
>@@ -533,7 +536,9 @@ static void
> do_atfork_child (void)
> {
>   debug ("==> do_atfork_child");
>+  _nss_ldap_enter_signals ();
>   do_close_no_unbind ();
>+  _nss_ldap_leave_signals ();
>   NSS_LDAP_UNLOCK (__lock);
>   debug ("<== do_atfork_child");
> }
>@@ -555,12 +560,11 @@ do_atfork_setup (void)
> #endif
> 
> /*
>- * Acquires global lock, blocks SIGPIPE.
>+ * Blocks SIGPIPE.
>  */
> void
>-_nss_ldap_enter (void)
>+_nss_ldap_enter_signals (void)
> {
>-
> #ifdef HAVE_SIGACTION
>   struct sigaction new_handler;
> 
>@@ -573,11 +577,6 @@ _nss_ldap_enter (void)
>   sigemptyset (&new_handler.sa_mask);
>   new_handler.sa_flags = 0;
> #endif /* HAVE_SIGACTION */
>-
>-  debug ("==> _nss_ldap_enter");
>-
>-  NSS_LDAP_LOCK (__lock);
>-
>   /*
>    * Patch for Debian Bug 130006:
>    * ignore SIGPIPE for all LDAP operations.
>@@ -596,18 +595,28 @@ _nss_ldap_enter (void)
> #else
>   __sigpipe_handler = signal (SIGPIPE, SIG_IGN);
> #endif /* HAVE_SIGSET */
>+}
>+
>+/*
>+ * Acquires global lock, blocks SIGPIPE.
>+ */
>+void
>+_nss_ldap_enter (void)
>+{
>+  debug ("==> _nss_ldap_enter");
>+
>+  NSS_LDAP_LOCK (__lock);
>+  _nss_ldap_enter_signals ();
> 
>   debug ("<== _nss_ldap_enter");
> }
> 
> /*
>- * Releases global mutex, releases SIGPIPE.
>+ * Releases SIGPIPE.
>  */
> void
>-_nss_ldap_leave (void)
>+_nss_ldap_leave_signals (void)
> {
>-  debug ("==> _nss_ldap_leave");
>-
> #ifdef HAVE_SIGACTION
>   if (__sigaction_retval == 0)
>     (void) sigaction (SIGPIPE, &__stored_handler, NULL);
>@@ -621,7 +630,17 @@ _nss_ldap_leave (void)
> # endif	/* HAVE_SIGSET */
>     }
> #endif /* HAVE_SIGACTION */
>+}
>+
>+/*
>+ * Releases global mutex, releases SIGPIPE.
>+ */
>+void
>+_nss_ldap_leave (void)
>+{
>+  debug ("==> _nss_ldap_leave");
> 
>+  _nss_ldap_leave_signals ();
>   NSS_LDAP_UNLOCK (__lock);
> 
>   debug ("<== _nss_ldap_leave");

Actions: View | Diff

Attachments on bug 448014: 306988 | 306995