1 files changed, 9 insertions, 9 deletions

diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb/samba/ldif_handlers.c
index 42f7605385..e96ba348f9 100644
--- a/source4/lib/ldb/samba/ldif_handlers.c
+++ b/source4/lib/ldb/samba/ldif_handlers.c
@@ -300,9 +300,9 @@ static int ldif_canonicalise_objectCategory(struct ldb_context *ldb, void *mem_c
 	dn1 = ldb_dn_explode(mem_ctx, (char *)in->data);
 	if (dn1 == NULL) {
 		oc1 = talloc_strndup(mem_ctx, (char *)in->data, in->length);
-	} else if (dn1->comp_num >= 1 && strcasecmp(dn1->components[0].name, "cn") == 0) {
-		oc1 = talloc_strndup(mem_ctx, (char *)dn1->components[0].value.data, 
-				     dn1->components[0].value.length);
+	} else if (ldb_dn_get_comp_num(dn1) >= 1 && strcasecmp(ldb_dn_get_rdn_name(dn1), "cn") == 0) {
+		const struct ldb_val *val = ldb_dn_get_rdn_val(dn1);
+		oc1 = talloc_strndup(mem_ctx, (char *)val->data, val->length);
 	} else {
 		return -1;
 	}
@@ -325,9 +325,9 @@ static int ldif_comparison_objectCategory(struct ldb_context *ldb, void *mem_ctx
 	dn1 = ldb_dn_explode(mem_ctx, (char *)v1->data);
 	if (dn1 == NULL) {
 		oc1 = talloc_strndup(mem_ctx, (char *)v1->data, v1->length);
-	} else if (dn1->comp_num >= 1 && strcasecmp(dn1->components[0].name, "cn") == 0) {
-		oc1 = talloc_strndup(mem_ctx, (char *)dn1->components[0].value.data, 
-				     dn1->components[0].value.length);
+	} else if (ldb_dn_get_comp_num(dn1) >= 1 && strcasecmp(ldb_dn_get_rdn_name(dn1), "cn") == 0) {
+		const struct ldb_val *val = ldb_dn_get_rdn_val(dn1);
+		oc1 = talloc_strndup(mem_ctx, (char *)val->data, val->length);
 	} else {
 		oc1 = NULL;
 	}
@@ -335,9 +335,9 @@ static int ldif_comparison_objectCategory(struct ldb_context *ldb, void *mem_ctx
 	dn2 = ldb_dn_explode(mem_ctx, (char *)v2->data);
 	if (dn2 == NULL) {
 		oc2 = talloc_strndup(mem_ctx, (char *)v2->data, v2->length);
-	} else if (dn2->comp_num >= 2 && strcasecmp(dn2->components[0].name, "cn") == 0) {
-		oc2 = talloc_strndup(mem_ctx, (char *)dn2->components[0].value.data, 
-				     dn2->components[0].value.length);
+	} else if (ldb_dn_get_comp_num(dn2) >= 2 && strcasecmp(ldb_dn_get_rdn_name(dn2), "cn") == 0) {
+		const struct ldb_val *val = ldb_dn_get_rdn_val(dn2);
+		oc2 = talloc_strndup(mem_ctx, (char *)val->data, val->length);
 	} else {
 		oc2 = NULL;
 	}