From 8097280b468b7bcf26a0e17fdcaaccfb34d06415 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 23 Oct 2009 20:09:07 -0500 Subject: s4 - Mapped AD schema to existing FDS schema. --- source4/dsdb/schema/schema_convert_to_ol.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source4/dsdb/schema') diff --git a/source4/dsdb/schema/schema_convert_to_ol.c b/source4/dsdb/schema/schema_convert_to_ol.c index c0ab5c2af8..f858dc35e9 100644 --- a/source4/dsdb/schema/schema_convert_to_ol.c +++ b/source4/dsdb/schema/schema_convert_to_ol.c @@ -91,6 +91,14 @@ static char *print_schema_recursive(char *append_to_string, struct dsdb_schema * } } + /* We might have been asked to remap this subClassOf, due to a conflict */ + for (j=0; subClassOf && attr_map && attr_map[j].old_attr; j++) { + if (strcasecmp(subClassOf, attr_map[j].old_attr) == 0) { + subClassOf = attr_map[j].new_attr; + break; + } + } + may = dsdb_full_attribute_list(mem_ctx, schema, &objectclass_name_as_el, DSDB_SCHEMA_ALL_MAY); for (j=0; may && may[j]; j++) { -- cgit