[Pkg-openldap-devel] r1361 - in openldap/trunk/debian: . patches

[matthijs at alioth.debian.org]

Author: matthijs
Date: 2011-04-11 06:18:58 +0000 (Mon, 11 Apr 2011)
New Revision: 1361

Added:
   openldap/trunk/debian/patches/fix-its6898-locking-issue
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
 * Add patch for its 6898 for a locking issue.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-04-08 14:09:47 UTC (rev 1360)
+++ openldap/trunk/debian/changelog	2011-04-11 06:18:58 UTC (rev 1361)
@@ -14,8 +14,9 @@
   * Add slapschema, just hardlink it (Closes: #601569)
   * Update patch service-operational-before-detach (Closes: #616164, #598361)
   * Add ldif_* symbols to libldap-2.4-2
+  * Add upstream patch for a locking issue in libldap_r
 
- -- Matthijs Möhlmann <matthijs at cacholong.nl>  Fri, 08 Apr 2011 16:09:21 +0200
+ -- Matthijs Möhlmann <matthijs at cacholong.nl>  Mon, 11 Apr 2011 08:18:47 +0200
 
 openldap (2.4.23-7) unstable; urgency=low
 

Added: openldap/trunk/debian/patches/fix-its6898-locking-issue
===================================================================
--- openldap/trunk/debian/patches/fix-its6898-locking-issue	                        (rev 0)
+++ openldap/trunk/debian/patches/fix-its6898-locking-issue	2011-04-11 06:18:58 UTC (rev 1361)
@@ -0,0 +1,28 @@
+--- a/libraries/libldap/options.c
++++ b/libraries/libldap/options.c
+@@ -778,19 +778,22 @@
+ 
+ 	default:
+ #ifdef HAVE_TLS
+-		if ( ldap_pvt_tls_set_option( ld, option, (void *)invalue ) == 0 )
++		if ( ldap_pvt_tls_set_option( ld, option, (void *)invalue ) == 0 ) {
+ 			LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+ 			return ( LDAP_OPT_SUCCESS );
++		}
+ #endif
+ #ifdef HAVE_CYRUS_SASL
+-		if ( ldap_int_sasl_set_option( ld, option, (void *)invalue ) == 0 )
++		if ( ldap_int_sasl_set_option( ld, option, (void *)invalue ) == 0 ) {
+ 			LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+ 			return ( LDAP_OPT_SUCCESS );
++		}
+ #endif
+ #ifdef HAVE_GSSAPI
+-		if ( ldap_int_gssapi_set_option( ld, option, (void *)invalue ) == 0 )
++		if ( ldap_int_gssapi_set_option( ld, option, (void *)invalue ) == 0 ) {
+ 			LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+ 			return ( LDAP_OPT_SUCCESS );
++		}
+ #endif
+ 		/* bad param */
+ 		break;	/* LDAP_OPT_ERROR */

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2011-04-08 14:09:47 UTC (rev 1360)
+++ openldap/trunk/debian/patches/series	2011-04-11 06:18:58 UTC (rev 1361)
@@ -15,3 +15,4 @@
 service-operational-before-detach
 add-tlscacert-option-to-ldap-conf
 fix-ftbfs-binutils-gold
+fix-its6898-locking-issue