diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-18 10:16:45 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-18 10:16:45 +1000 |
| commit | 46c94dd8b28cbb6fca28f4884b65be034e135fbb (patch) | |
| tree | ecb953d6d0669032641c971c564ca3d1bdd9832b /source4/utils | |
| parent | 613b8d398ed73be958e90a1d4c2b728d2139b3fb (diff) | |
| download | samba-46c94dd8b28cbb6fca28f4884b65be034e135fbb.tar.gz samba-46c94dd8b28cbb6fca28f4884b65be034e135fbb.tar.bz2 samba-46c94dd8b28cbb6fca28f4884b65be034e135fbb.zip | |
Merge the two attribute syntax tables.
This merges the table once found in the oLschema2ldif tool (and moved
many times) with the table used for DRSUAPI.
The OpenLDAP schema map has been updated, to ensure that despite a
number of attributes being declared as OIDs, they are actually used as
strings (as they are actually LDAP class/attribute names).
Andrew Bartlett
(This used to be commit 61f2958c84beeedcf369ccdc02afed0c8055b108)
Diffstat (limited to 'source4/utils')
| -rw-r--r-- | source4/utils/ad2oLschema.c | 4 | ||||
| -rw-r--r-- | source4/utils/oLschema2ldif.c | 4 |
2 files changed, 4 insertions, 4 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) { diff --git a/source4/utils/oLschema2ldif.c b/source4/utils/oLschema2ldif.c index d045b084b5..6c4e6a9c80 100644 --- a/source4/utils/oLschema2ldif.c +++ b/source4/utils/oLschema2ldif.c @@ -433,12 +433,12 @@ static struct ldb_message *process_entry(TALLOC_CTX *mem_ctx, const char *entry) case SCHEMA_SYNTAX: { - const struct dsdb_syntax_map *map = + const struct dsdb_syntax *map = find_syntax_map_by_standard_oid(token->value); if (!map) { break; } - MSG_ADD_STRING("attributeSyntax", map->AD_OID); + MSG_ADD_STRING("attributeSyntax", map->attributeSyntax_oid); break; } case SCHEMA_DESC: |