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.h | |
| 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.h')
| -rw-r--r-- | source4/dsdb/schema/schema.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index cd714e9c61..df7826d61d 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -32,6 +32,9 @@ struct dsdb_syntax { uint32_t oMSyntax; struct ldb_val oMObjectClass; const char *attributeSyntax_oid; + const char *equality; + const char *substring; + const char *comment; WERROR (*drsuapi_to_ldb)(const struct dsdb_schema *schema, const struct dsdb_attribute *attr, @@ -174,14 +177,6 @@ enum dsdb_schema_convert_target { TARGET_AD_SCHEMA_SUBENTRY }; -struct dsdb_syntax_map { - const char *Standard_OID; - const char *AD_OID; - const char *equality; - const char *substring; - const char *comment; -}; - #include "dsdb/schema/proto.h" #endif /* _DSDB_SCHEMA_H */ |