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/dsdb/schema/schema_description.c | |
| 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/dsdb/schema/schema_description.c')
| -rw-r--r-- | source4/dsdb/schema/schema_description.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/schema/schema_description.c b/source4/dsdb/schema/schema_description.c index 2f3acd1336..9d93af9260 100644 --- a/source4/dsdb/schema/schema_description.c +++ b/source4/dsdb/schema/schema_description.c @@ -90,8 +90,8 @@ char *schema_attribute_description(TALLOC_CTX *mem_ctx, char *schema_attribute_to_description(TALLOC_CTX *mem_ctx, const struct dsdb_attribute *attribute) { char *schema_description; - const struct dsdb_syntax_map *map = find_syntax_map_by_ad_oid(attribute->attributeSyntax_oid); - const char *syntax = map ? map->Standard_OID : attribute->attributeSyntax_oid; + const struct dsdb_syntax *map = find_syntax_map_by_ad_oid(attribute->attributeSyntax_oid); + const char *syntax = map ? map->ldap_oid : attribute->attributeSyntax_oid; TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx); if (!tmp_ctx) { return NULL; |