minor fixes

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 4b4c6975d6a823f422b8478d8ef0c659d703a432..37749d3300bc1f0f0afcbeca78a0c5c5acfba4db 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -122,8 +122,8 @@ ldap_back_db_init(
 
        mapping = (struct ldapmapping *)ch_calloc( 2, sizeof(struct ldapmapping) );
        if ( mapping != NULL ) {
-               mapping->src = ch_strdup("objectclass");
-               mapping->dst = ch_strdup("objectclass");
+               ber_str2bv( "objectclass", sizeof("objectclass")-1, 1, &mapping->src);
+               ber_dupbv( &mapping->dst, &mapping->src );
                mapping[1].src = mapping->src;
                mapping[1].dst = mapping->dst;
 
@@ -144,15 +144,15 @@ conn_free(
 )
 {
        ldap_unbind(lc->ld);
-       if ( lc->bound_dn) free( lc->bound_dn );
+       if ( lc->bound_dn.bv_val) free( lc->bound_dn.bv_val );
        free( lc );
 }
 
 void
 mapping_free ( struct ldapmapping *mapping )
 {
-       ch_free( mapping->src );
-       ch_free( mapping->dst );
+       ch_free( mapping->src.bv_val );
+       ch_free( mapping->dst.bv_val );
        ch_free( mapping );
 }
 
@@ -189,7 +189,7 @@ ldap_back_db_destroy(
                }
 #else /* !ENABLE_REWRITE */
                if (li->suffix_massage) {
-                       ldap_value_free( li->suffix_massage );
+                       ber_bvecfree( li->suffix_massage );
                }
 #endif /* !ENABLE_REWRITE */