diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:11:51 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:11:51 +1000 |
| commit | b33f4541f6157163f9b22af8607ecefe3953638f (patch) | |
| tree | cb36a27033500dff5790789e696a4d24bf8ec30f /source4/utils/ad2oLschema.c | |
| parent | 7ef21658fbb519859aa7d23a614e1fdbcae95693 (diff) | |
| parent | aef684da3149eaf2b8d87c4903af241c9a2311a6 (diff) | |
| download | samba-b33f4541f6157163f9b22af8607ecefe3953638f.tar.gz samba-b33f4541f6157163f9b22af8607ecefe3953638f.tar.xz samba-b33f4541f6157163f9b22af8607ecefe3953638f.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit fc6b4f03ebba015a13a6ab93221b0bc3ef8ef2ed)
Diffstat (limited to 'source4/utils/ad2oLschema.c')
| -rw-r--r-- | source4/utils/ad2oLschema.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/utils/ad2oLschema.c b/source4/utils/ad2oLschema.c index ea5b813e8a..e229bd104b 100644 --- a/source4/utils/ad2oLschema.c +++ b/source4/utils/ad2oLschema.c @@ -229,7 +229,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch const char *equality = NULL, *substring = NULL; bool single_value = attribute->isSingleValued; - const struct dsdb_syntax_map *map = find_syntax_map_by_ad_oid(syntax); + const struct dsdb_syntax *map = find_syntax_map_by_ad_syntax(attribute->oMSyntax); char *schema_entry = NULL; int j; @@ -251,7 +251,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch /* We might have been asked to remap this oid, * due to a conflict, or lack of * implementation */ - syntax = map->Standard_OID; + syntax = map->ldap_oid; /* We might have been asked to remap this oid, due to a conflict */ for (j=0; syntax && oid_map && oid_map[j].old_oid; j++) { if (strcasecmp(syntax, oid_map[j].old_oid) == 0) { |