[Pkg-openldap-devel] r734 - openldap/trunk-2.3/debian/patches

[Matthijs Mohlmann]

Author: matthijs
Date: 2006-11-09 22:21:01 +0100 (Thu, 09 Nov 2006)
New Revision: 734

Removed:
   openldap/trunk-2.3/debian/patches/startup-memleak-fix
Modified:
   openldap/trunk-2.3/debian/patches/series
Log:
 * Merged upstream.


Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2006-11-09 20:58:01 UTC (rev 733)
+++ openldap/trunk-2.3/debian/patches/series	2006-11-09 21:21:01 UTC (rev 734)
@@ -11,5 +11,4 @@
 read-config-before-dropping-privileges -p0
 disable-epoll-system-call -p0
 wrong-database-location -p0
-startup-memleak-fix -p0
 CVE-2006-5779 -p0

Deleted: openldap/trunk-2.3/debian/patches/startup-memleak-fix
===================================================================
--- openldap/trunk-2.3/debian/patches/startup-memleak-fix	2006-11-09 20:58:01 UTC (rev 733)
+++ openldap/trunk-2.3/debian/patches/startup-memleak-fix	2006-11-09 21:21:01 UTC (rev 734)
@@ -1,42 +0,0 @@
-Index: servers/slapd/overlays/accesslog.c
-===================================================================
---- servers/slapd/overlays/accesslog.c.orig
-+++ servers/slapd/overlays/accesslog.c
-@@ -626,7 +626,7 @@
- 		case LOG_OLD:
- 			if ( li->li_oldf ) {
- 				filter2bv( li->li_oldf, &agebv );
--				value_add_one( &c->rvalue_vals, &agebv );
-+				ber_bvarray_add( &c->rvalue_vals, &agebv );
- 			}
- 			else
- 				rc = 1;
-@@ -1318,6 +1318,8 @@
- 	slap_overinst *on = (slap_overinst *)be->bd_info;
- 	log_info *li = on->on_bi.bi_private;
- 
-+	if ( li->li_oldf )
-+		filter_free( li->li_oldf );
- 	ldap_pvt_thread_mutex_destroy( &li->li_log_mutex );
- 	ldap_pvt_thread_mutex_destroy( &li->li_op_mutex );
- 	free( li );
-Index: servers/slapd/back-bdb/cache.c
-===================================================================
---- servers/slapd/back-bdb/cache.c.orig
-+++ servers/slapd/back-bdb/cache.c
-@@ -707,6 +707,7 @@
- 				&ep->e_nname, eip );
- 			if ( *eip ) islocked = 1;
- 			if ( rc ) {
-+				ep->e_private = NULL;
- #ifdef SLAP_ZONE_ALLOC
- 				bdb_entry_return( bdb, ep, (*eip)->bei_zseq );
- #else
-@@ -811,6 +812,7 @@
- 		bdb_cache_entryinfo_unlock( *eip );
- 	}
- 	if ( ep ) {
-+		ep->e_private = NULL;
- #ifdef SLAP_ZONE_ALLOC
- 		bdb_entry_return( bdb, ep, (*eip)->bei_zseq );
- #else