use BerVarray for suffix_massaging stuff

[openldap] / servers / slapd / back-ldap / add.c

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index 7dfcd9ad0897fafce4220b561e09c74d7ad98fe7..2eb05502b127b9b0e7b2d3ec5272a0916eeb70cb 100644 (file)
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -77,7 +77,8 @@ ldap_back_add(
         * Rewrite the add dn, if needed
         */
 #ifdef ENABLE_REWRITE
-       switch (rewrite_session( li->rwinfo, "addDn", e->e_dn, conn, &mdn.bv_val )) {
+       switch (rewrite_session( li->rwinfo, "addDn", e->e_dn, conn, 
+                               &mdn.bv_val )) {
        case REWRITE_REGEXEC_OK:
                if ( mdn.bv_val != NULL && mdn.bv_val[ 0 ] != '\0' ) {
                        mdn.bv_len = strlen( mdn.bv_val );
@@ -171,10 +172,10 @@ ldap_back_add(
 
        ldap_add_s(lc->ld, mdn.bv_val, attrs);
        for (--i; i>= 0; --i) {
-               free(attrs[i]->mod_vals.modv_bvals);
-               free(attrs[i]);
+               ch_free(attrs[i]->mod_vals.modv_bvals);
+               ch_free(attrs[i]);
        }
-       free(attrs);
+       ch_free(attrs);
        if ( mdn.bv_val != e->e_dn ) {
                free( mdn.bv_val );
        }
@@ -186,7 +187,7 @@ ldap_back_add(
 int
 ldap_dnattr_rewrite(
                struct rewrite_info     *rwinfo,
-               BVarray                 a_vals,
+               BerVarray                       a_vals,
                void                    *cookie
 )
 {
@@ -212,7 +213,12 @@ ldap_dnattr_rewrite(
                                        a_vals->bv_val, mattr, "" );
 #endif /* !NEW_LOGGING */
 
-                       free( a_vals->bv_val );
+                       /*
+                        * FIXME: replacing server-allocated memory 
+                        * (ch_malloc) with librewrite allocated memory
+                        * (malloc)
+                        */
+                       ch_free( a_vals->bv_val );
                        a_vals->bv_val = mattr;
                        a_vals->bv_len = strlen( mattr );