From 717b1158a6a4e94c0a37623731d398723a24eed8 Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Fri, 29 Oct 2010 02:22:35 +0300 Subject: idl: Use DRSUAPI_ATTID_ prefix instead of DRSUAPI_ATTRIBUTE_ for ATTID values Those values are actually ATTID values and such, they are used for ATTIDs for Attributes, Classes and Syntaxes. --- source4/dsdb/schema/schema_syntax.c | 66 ++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'source4/dsdb/schema/schema_syntax.c') diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 4267cd716f..8d8be0495a 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -1230,25 +1230,25 @@ static WERROR dsdb_syntax_OID_drsuapi_to_ldb(const struct dsdb_syntax_ctx *ctx, WERROR werr; switch (attr->attributeID_id) { - case DRSUAPI_ATTRIBUTE_objectClass: - case DRSUAPI_ATTRIBUTE_subClassOf: - case DRSUAPI_ATTRIBUTE_auxiliaryClass: - case DRSUAPI_ATTRIBUTE_systemAuxiliaryClass: - case DRSUAPI_ATTRIBUTE_systemPossSuperiors: - case DRSUAPI_ATTRIBUTE_possSuperiors: + case DRSUAPI_ATTID_objectClass: + case DRSUAPI_ATTID_subClassOf: + case DRSUAPI_ATTID_auxiliaryClass: + case DRSUAPI_ATTID_systemAuxiliaryClass: + case DRSUAPI_ATTID_systemPossSuperiors: + case DRSUAPI_ATTID_possSuperiors: werr = _dsdb_syntax_OID_obj_drsuapi_to_ldb(ctx, attr, in, mem_ctx, out); break; - case DRSUAPI_ATTRIBUTE_systemMustContain: - case DRSUAPI_ATTRIBUTE_systemMayContain: - case DRSUAPI_ATTRIBUTE_mustContain: - case DRSUAPI_ATTRIBUTE_rDNAttId: - case DRSUAPI_ATTRIBUTE_transportAddressAttribute: - case DRSUAPI_ATTRIBUTE_mayContain: + case DRSUAPI_ATTID_systemMustContain: + case DRSUAPI_ATTID_systemMayContain: + case DRSUAPI_ATTID_mustContain: + case DRSUAPI_ATTID_rDNAttId: + case DRSUAPI_ATTID_transportAddressAttribute: + case DRSUAPI_ATTID_mayContain: werr = _dsdb_syntax_OID_attr_drsuapi_to_ldb(ctx, attr, in, mem_ctx, out); break; - case DRSUAPI_ATTRIBUTE_governsID: - case DRSUAPI_ATTRIBUTE_attributeID: - case DRSUAPI_ATTRIBUTE_attributeSyntax: + case DRSUAPI_ATTID_governsID: + case DRSUAPI_ATTID_attributeID: + case DRSUAPI_ATTID_attributeSyntax: werr = _dsdb_syntax_OID_oid_drsuapi_to_ldb(ctx, attr, in, mem_ctx, out); break; default: @@ -1278,23 +1278,23 @@ static WERROR dsdb_syntax_OID_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ctx, } switch (attr->attributeID_id) { - case DRSUAPI_ATTRIBUTE_objectClass: - case DRSUAPI_ATTRIBUTE_subClassOf: - case DRSUAPI_ATTRIBUTE_auxiliaryClass: - case DRSUAPI_ATTRIBUTE_systemAuxiliaryClass: - case DRSUAPI_ATTRIBUTE_systemPossSuperiors: - case DRSUAPI_ATTRIBUTE_possSuperiors: + case DRSUAPI_ATTID_objectClass: + case DRSUAPI_ATTID_subClassOf: + case DRSUAPI_ATTID_auxiliaryClass: + case DRSUAPI_ATTID_systemAuxiliaryClass: + case DRSUAPI_ATTID_systemPossSuperiors: + case DRSUAPI_ATTID_possSuperiors: return _dsdb_syntax_OID_obj_ldb_to_drsuapi(ctx, attr, in, mem_ctx, out); - case DRSUAPI_ATTRIBUTE_systemMustContain: - case DRSUAPI_ATTRIBUTE_systemMayContain: - case DRSUAPI_ATTRIBUTE_mustContain: - case DRSUAPI_ATTRIBUTE_rDNAttId: - case DRSUAPI_ATTRIBUTE_transportAddressAttribute: - case DRSUAPI_ATTRIBUTE_mayContain: + case DRSUAPI_ATTID_systemMustContain: + case DRSUAPI_ATTID_systemMayContain: + case DRSUAPI_ATTID_mustContain: + case DRSUAPI_ATTID_rDNAttId: + case DRSUAPI_ATTID_transportAddressAttribute: + case DRSUAPI_ATTID_mayContain: return _dsdb_syntax_OID_attr_ldb_to_drsuapi(ctx, attr, in, mem_ctx, out); - case DRSUAPI_ATTRIBUTE_governsID: - case DRSUAPI_ATTRIBUTE_attributeID: - case DRSUAPI_ATTRIBUTE_attributeSyntax: + case DRSUAPI_ATTID_governsID: + case DRSUAPI_ATTID_attributeID: + case DRSUAPI_ATTID_attributeSyntax: return _dsdb_syntax_OID_oid_ldb_to_drsuapi(ctx, attr, in, mem_ctx, out); } @@ -1356,9 +1356,9 @@ static WERROR dsdb_syntax_OID_validate_ldb(const struct dsdb_syntax_ctx *ctx, } switch (attr->attributeID_id) { - case DRSUAPI_ATTRIBUTE_governsID: - case DRSUAPI_ATTRIBUTE_attributeID: - case DRSUAPI_ATTRIBUTE_attributeSyntax: + case DRSUAPI_ATTID_governsID: + case DRSUAPI_ATTID_attributeID: + case DRSUAPI_ATTID_attributeSyntax: return _dsdb_syntax_OID_validate_numericoid(ctx, attr, in); } -- cgit