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

[Matthijs Mohlmann]

Author: active2-guest
Date: 2006-06-02 20:48:41 +0000 (Fri, 02 Jun 2006)
New Revision: 670

Added:
   openldap/trunk-2.3/debian/patches/back-bdb-fix-lock-virtual-root-entry
   openldap/trunk-2.3/debian/patches/fix-boolean-logic
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/patches/series
Log:
 * Added two patches from Quanah Gibson-Mount which fixes a lock issue and
   boolean logic.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-06-02 20:34:14 UTC (rev 669)
+++ openldap/trunk-2.3/debian/changelog	2006-06-02 20:48:41 UTC (rev 670)
@@ -1,8 +1,11 @@
 openldap2.3 (2.3.24-2) UNRELEASED; urgency=low
 
   * Switch slapd from running as root to running as user.
+  * Patches by Quanah Gibson-Mount
+    - Patch to fix a lock bug with a virtual root entry in the BDB backend.
+    - Patch to fix boolean logic in the overlays.
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Fri,  2 Jun 2006 18:56:08 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Fri,  2 Jun 2006 22:45:58 +0200
 
 openldap2.3 (2.3.24-1) unstable; urgency=low
 

Added: openldap/trunk-2.3/debian/patches/back-bdb-fix-lock-virtual-root-entry
===================================================================
--- openldap/trunk-2.3/debian/patches/back-bdb-fix-lock-virtual-root-entry	2006-06-02 20:34:14 UTC (rev 669)
+++ openldap/trunk-2.3/debian/patches/back-bdb-fix-lock-virtual-root-entry	2006-06-02 20:48:41 UTC (rev 670)
@@ -0,0 +1,30 @@
+Index: servers/slapd/back-bdb/cache.c
+===================================================================
+--- servers/slapd/back-bdb/cache.c.orig
++++ servers/slapd/back-bdb/cache.c
+@@ -146,7 +146,7 @@
+ #else
+ 	int rc;
+ 
+-	if ( !lock ) return 0;
++  if ( !lock || lock->mode == DB_LOCK_NG ) return 0;
+ 
+ 	rc = LOCK_PUT ( env, lock );
+ 	return rc;
+Index: servers/slapd/back-bdb/dn2entry.c
+===================================================================
+--- servers/slapd/back-bdb/dn2entry.c.orig
++++ servers/slapd/back-bdb/dn2entry.c
+@@ -56,8 +56,11 @@
+ 				rc2 = bdb_cache_find_id( op, tid, ei->bei_id,
+ 					&ei, 1, locker, lock );
+ 				if ( rc2 ) rc = rc2;
+-			} else if ( ei )
++			} else if ( ei ) {
+ 				bdb_cache_entryinfo_unlock( ei );
++        memset( lock, 0, sizeof( *lock ));
++        lock->mode = DB_LOCK_NG;
++      }
+ 		} else if ( ei ) {
+ 			bdb_cache_entryinfo_unlock( ei );
+ 		}

Added: openldap/trunk-2.3/debian/patches/fix-boolean-logic
===================================================================
--- openldap/trunk-2.3/debian/patches/fix-boolean-logic	2006-06-02 20:34:14 UTC (rev 669)
+++ openldap/trunk-2.3/debian/patches/fix-boolean-logic	2006-06-02 20:48:41 UTC (rev 670)
@@ -0,0 +1,13 @@
+Index: servers/slapd/overlays/retcode.c
+===================================================================
+--- servers/slapd/overlays/retcode.c.orig
++++ servers/slapd/overlays/retcode.c
+@@ -531,7 +531,7 @@
+ 
+ 	/* sleep time */
+ 	a = attr_find( e->e_attrs, ad_errSleepTime );
+-	if ( a != NULL & a->a_nvals[ 0 ].bv_val[ 0 ] != '-' ) {
++	if ( a != NULL && a->a_nvals[ 0 ].bv_val[ 0 ] != '-' ) {
+ 		int	sleepTime;
+ 
+ 		sleepTime = strtoul( a->a_nvals[ 0 ].bv_val, &next, 0 );

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2006-06-02 20:34:14 UTC (rev 669)
+++ openldap/trunk-2.3/debian/patches/series	2006-06-02 20:48:41 UTC (rev 670)
@@ -8,3 +8,5 @@
 fixmanpages -p0
 slapi-errorlog-file -p0
 ldapi-socket-place -p0
+back-bdb-fix-lock-virtual-root-entry -p0
+fix-boolean-logic -p0