From 957ca789d77e80d98534b6c31da9e1f156bf8045 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Thu, 30 Dec 2004 17:54:50 +0000 Subject: [PATCH] misc back-ldap/back-meta memory and mapping fixes --- CHANGES | 2 ++ servers/slapd/back-ldap/map.c | 2 +- servers/slapd/back-ldap/search.c | 2 +- servers/slapd/back-meta/modrdn.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 06dc8f0495..35a42c12d7 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,8 @@ OpenLDAP 2.2.20 Engineering Fixed back-bdb locks in backend_group (ITS#3263, #3365) Fixed back-bdb/back-hdb listing of permissive control (ITS#3453) Fixed back-ldap failed connection retry (ITS#3217) + Fixed back-ldap/back-meta memory handling in attr mapping + Fixed back-meta modrdn newSuperior target selection Fixed back-sql segfault when logging and delete_rule is NULL (ITS#3407) Build Environment Fixed slurpd build on Windows diff --git a/servers/slapd/back-ldap/map.c b/servers/slapd/back-ldap/map.c index 1d91a21bba..d63a3b7600 100644 --- a/servers/slapd/back-ldap/map.c +++ b/servers/slapd/back-ldap/map.c @@ -594,7 +594,7 @@ ldap_dnattr_result_rewrite( * legal to trim values when adding/modifying; * it should be when searching (e.g. ACLs). */ - LBER_FREE( &a_vals[i].bv_val ); + LBER_FREE( a_vals[i].bv_val ); if ( last > i ) { a_vals[i] = a_vals[last]; } diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c index 7b02d6ab05..48c19aeae6 100644 --- a/servers/slapd/back-ldap/search.c +++ b/servers/slapd/back-ldap/search.c @@ -571,7 +571,7 @@ ldap_build_entry( attr->a_desc->ad_type->sat_syntax, attr->a_desc->ad_type->sat_equality, &attr->a_vals[i], &attr->a_nvals[i], - NULL /* op->o_tmpmemctx */ ); + NULL ); if ( rc != LDAP_SUCCESS ) { BER_BVZERO( &attr->a_nvals[i] ); diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c index 22cdc7c4f5..0cb0854ceb 100644 --- a/servers/slapd/back-meta/modrdn.c +++ b/servers/slapd/back-meta/modrdn.c @@ -75,7 +75,7 @@ meta_back_modrdn( Operation *op, SlapReply *rs ) int nsCandidate, version = LDAP_VERSION3; nsCandidate = meta_back_select_unique_candidate( li, - op->oq_modrdn.rs_newSup ); + op->oq_modrdn.rs_nnewSup ); if ( nsCandidate != candidate ) { /* -- 2.39.5