summaryrefslogtreecommitdiff
path: root/source4/dsdb/schema
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2009-10-23 20:09:07 -0500
committerAndrew Bartlett <abartlet@samba.org>2009-11-02 16:36:53 +1100
commit8097280b468b7bcf26a0e17fdcaaccfb34d06415 (patch)
treece7ceb937a32e4e18b3507caafd0b9f322ba7026 /source4/dsdb/schema
parent1fc19ee7d0021e963923911bb440463aa79184fc (diff)
downloadsamba-8097280b468b7bcf26a0e17fdcaaccfb34d06415.tar.gz
samba-8097280b468b7bcf26a0e17fdcaaccfb34d06415.tar.bz2
samba-8097280b468b7bcf26a0e17fdcaaccfb34d06415.zip
s4 - Mapped AD schema to existing FDS schema.
Diffstat (limited to 'source4/dsdb/schema')
-rw-r--r--source4/dsdb/schema/schema_convert_to_ol.c8
1 files changed, 8 insertions, 0 deletions
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++) {