misc back-ldap/back-meta memory and mapping fixes

diff --git a/CHANGES b/CHANGES
index 06dc8f0495feb26aeb09eb7755c1a98ac7bfacfe..35a42c12d765dab392f67d7217675ee7caa50a6d 100644 (file)
--- 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 1d91a21bbab9d407490c5f08b30e5cbda3564199..d63a3b7600a45e3341d8eca48f23a8057e0be433 100644 (file)
--- 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 7b02d6ab05e8e70b9c873f62250f541fd7181f86..48c19aeae6630d8efd5917d8a2e7c0673b56d4a2 100644 (file)
--- 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 22cdc7c4f51255dab2229997865cf8ff7ea615d2..0cb0854cebf2d628201219fff8c2ddb6272a0977 100644 (file)
--- 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 ) {
                        /*