- adapt to slapi_dn_normalize() becoming a no-op because it's deprecated

1 files changed, 11 insertions, 8 deletions

diff --git a/src/back-sch.c b/src/back-sch.c
index db6bc6f..d114aed 100644
--- a/src/back-sch.c
+++ b/src/back-sch.c
@@ -118,8 +118,8 @@ backend_copy_set_config(const struct backend_set_data *data)
 	}
 	ret->common.self = ret;
 	ret->common.state = data->common.state;
-	ret->common.group = slapi_dn_normalize(strdup(data->common.group));
-	ret->common.set = slapi_dn_normalize(strdup(data->common.set));
+	ret->common.group = strdup(data->common.group);
+	ret->common.set = strdup(data->common.set);
 	ret->common.bases = backend_shr_dup_strlist(data->common.bases);
 	ret->common.rel_attrs = data->common.rel_attrs ?
 				format_dup_attr_list(data->common.rel_attrs) :
@@ -166,6 +166,7 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 	char **bases, *entry_filter, **attributes, *rdn_format, *dn;
 	bool_t check_access;
 	struct backend_set_data ret;
+	Slapi_DN *tmp_sdn;
 
 	/* Read the values from the configuration entry. */
 	bases = backend_shr_get_vattr_strlist(state, e,
@@ -181,10 +182,10 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 						   SCH_CONTAINER_CONFIGURATION_ATTR_ATTR);
 	/* Populate the returned structure. */
 	ret.common.state = state;
-	ret.common.group = slapi_dn_normalize(strdup(group));
-	ret.common.set = strlen(container) ?
-			 slapi_dn_normalize(strdup(container)) :
-			 strdup(container);
+	tmp_sdn = slapi_sdn_new_dn_byval(group);
+	ret.common.group = strdup(slapi_sdn_get_ndn(tmp_sdn));
+	slapi_sdn_free(&tmp_sdn);
+	ret.common.set = strdup(container);
 	ret.common.bases = bases;
 	ret.common.entry_filter = entry_filter;
 	ret.common.rel_attrs = NULL;
@@ -205,7 +206,9 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 	} else {
 		dn = strdup(ret.common.group);
 	}
-	ret.container_sdn = slapi_sdn_new_dn_passin(dn);
+	tmp_sdn = slapi_sdn_new_dn_passin(dn);
+	ret.container_sdn = slapi_sdn_new_dn_byval(slapi_sdn_get_ndn(tmp_sdn));
+	slapi_sdn_free(&tmp_sdn);
 	ret.rdn_format = rdn_format;
 	ret.attribute_format = attributes;
 	ret.check_access = check_access;
@@ -268,7 +271,7 @@ backend_set_operational_attributes(Slapi_Entry *e,
 	}
 	slapi_entry_add_string(e, "creatorsName", state->plugin_base);
 	slapi_entry_add_string(e, "modifiersName", state->plugin_base);
-	slapi_entry_add_string(e, "entryDN", slapi_entry_get_dn_const(e));
+	slapi_entry_add_string(e, "entryDN", slapi_entry_get_ndn(e));
 	if (n_subordinates > 0) {
 		slapi_entry_add_string(e, "hasSubordinates", "TRUE");
 		snprintf(timestamp_str, sizeof(timestamp_str), "%ld",