[openldap/f14/master] fix update: openldap can't use TLS after fork()

[jvcelak]

commit c72253ca4266c00bdcbe5c2bc8b74c16925a523d
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Fri Mar 18 19:50:00 2011 +0100

    fix update: openldap can't use TLS after fork()
    
    Resolves: #636956

 openldap-nss-disable-nofork.patch |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/openldap-nss-disable-nofork.patch b/openldap-nss-disable-nofork.patch
index ad1f509..c8ae5d4 100644
--- a/openldap-nss-disable-nofork.patch
+++ b/openldap-nss-disable-nofork.patch
@@ -3,13 +3,13 @@ fix: OpenLDAP can't use TLS after a fork()
 Mozilla NSS - disable pkcs11 fork checking for the software token
 
 Resolves: #636956
-Upstream ITS: #6811, follows #6802
+Upstream ITS: #6811, #6802, #6862
 Author: Rich Megginson <rmeggins at redhat.com>
 
 diff -uNPrp openldap-2.4.23.old/libraries/libldap/tls_m.c openldap-2.4.23.new/libraries/libldap/tls_m.c
 --- openldap-2.4.23.old/libraries/libldap/tls_m.c	2011-02-02 12:21:27.576280756 +0100
-+++ openldap-2.4.23.new/libraries/libldap/tls_m.c	2011-02-02 12:38:24.785682347 +0100
-@@ -2884,10 +2884,27 @@ static const PRIOMethods tlsm_PR_methods
++++ openldap-2.4.23.new/libraries/libldap/tls_m.c	2011-03-14 11:21:00.819740659 +0100
+@@ -2884,10 +2884,29 @@ static const PRIOMethods tlsm_PR_methods
  static int
  tlsm_init( void )
  {
@@ -31,7 +31,9 @@ diff -uNPrp openldap-2.4.23.old/libraries/libldap/tls_m.c openldap-2.4.23.new/li
 +	 * context in the child.
 +	 */
 +	if ( !nofork ) {
-+		PR_SetEnv( "NSS_STRICT_NOFORK=DISABLED" );
++		/* will leak one time */
++		char *noforkenvvar = PL_strdup( "NSS_STRICT_NOFORK=DISABLED" );
++		PR_SetEnv( noforkenvvar );
 +	}
 +
  	return 0;