fix ITS#3350 (rewrite/remap will be replaced by the rwm overlay)

diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index 00fe4da2280fe1986e0de1f40255b4004cfb9eb4..4622443be7c391c0fc2fcdf2405ba79b91ca390b 100644 (file)
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -205,8 +205,6 @@ ldap_back_map_attrs(
                char ***mapped_attrs
 );
 
-extern void mapping_free ( void *mapping );
-
 extern int ldap_back_map_config(
                struct ldapmap  *oc_map,
                struct ldapmap  *at_map,

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index ead33726291c7f0c4b8c97d14633477287e05298..8062a6373008611e9937da8b18b00ffbcf320d71 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -216,7 +216,7 @@ ldap_back_conn_free(
        ch_free( lc );
 }
 
-void
+static void
 mapping_free( void *v_mapping )
 {
        struct ldapmapping *mapping = v_mapping;

diff --git a/servers/slapd/back-meta/init.c b/servers/slapd/back-meta/init.c
index 23e12fe289ece6b852de4da33db6c274b908529c..8830e17639bed51a0d4e234cf8bf9655c806455e 100644 (file)
--- a/servers/slapd/back-meta/init.c
+++ b/servers/slapd/back-meta/init.c
@@ -145,6 +145,15 @@ conn_free(
        free( lc );
 }
 
+static void
+mapping_free( void *v_mapping )
+{
+       struct ldapmapping *mapping = v_mapping;
+       ch_free( mapping->src.bv_val );
+       ch_free( mapping->dst.bv_val );
+       ch_free( mapping );
+}
+
 static void
 target_free(
                struct metatarget *lt