summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/repl/replicated_objects.c2
-rw-r--r--source4/dsdb/samdb/ldb_modules/operational.c2
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c8
-rw-r--r--source4/dsdb/samdb/ldb_modules/resolve_oids.c48
-rw-r--r--source4/dsdb/schema/schema_syntax.c66
5 files changed, 63 insertions, 63 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 10b13a8368..5c3cf48848 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -141,7 +141,7 @@ WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
whenChanged = d->originating_change_time;
}
- if (a->attid == DRSUAPI_ATTRIBUTE_name) {
+ if (a->attid == DRSUAPI_ATTID_name) {
name_a = a;
name_d = d;
rdn_m = &md->ctr.ctr1.array[md->ctr.ctr1.count];
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index e14b1d4cb0..65ac36a97a 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -486,7 +486,7 @@ static int construct_msds_keyversionnumber(struct ldb_module *module,
return LDB_SUCCESS;
}
for (i=0; i<omd->ctr.ctr1.count; i++) {
- if (omd->ctr.ctr1.array[i].attid == DRSUAPI_ATTRIBUTE_unicodePwd) {
+ if (omd->ctr.ctr1.array[i].attid == DRSUAPI_ATTID_unicodePwd) {
ret = samdb_msg_add_uint(ldb_module_get_ctx(module),
msg, msg,
"msDS-KeyVersionNumber",
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 1544c89170..1eb4745987 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -2989,8 +2989,8 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar,
* received yet. We choose which one wins by looking at the
* attribute stamps on the two objects, the newer one wins
*/
- md_remote = replmd_replPropertyMetaData1_find_attid(rmd, DRSUAPI_ATTRIBUTE_name);
- md_local = replmd_replPropertyMetaData1_find_attid(omd, DRSUAPI_ATTRIBUTE_name);
+ md_remote = replmd_replPropertyMetaData1_find_attid(rmd, DRSUAPI_ATTID_name);
+ md_local = replmd_replPropertyMetaData1_find_attid(omd, DRSUAPI_ATTID_name);
/* if there is no name attribute then we have to assume the
object we've received is in fact newer */
if (!md_remote || !md_local ||
@@ -3095,7 +3095,7 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
break;
}
- if (rmd->ctr.ctr1.array[i].attid != DRSUAPI_ATTRIBUTE_instanceType) {
+ if (rmd->ctr.ctr1.array[i].attid != DRSUAPI_ATTID_instanceType) {
DEBUG(3,("Discarding older DRS attribute update to %s on %s from %s\n",
msg->elements[i-removed_attrs].name,
ldb_dn_get_linearized(msg->dn),
@@ -3848,7 +3848,7 @@ linked_attributes[0]:
sid : S-0-0
__ndr_size_dn : 0x00000000 (0)
dn : ''
- attid : DRSUAPI_ATTRIBUTE_member (0x1F)
+ attid : DRSUAPI_ATTID_member (0x1F)
value: struct drsuapi_DsAttributeValue
__ndr_size : 0x0000007e (126)
blob : *
diff --git a/source4/dsdb/samdb/ldb_modules/resolve_oids.c b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
index c18cd2f6f4..10adcb90de 100644
--- a/source4/dsdb/samdb/ldb_modules/resolve_oids.c
+++ b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
@@ -46,11 +46,11 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
}
switch (a->attributeID_id) {
- case DRSUAPI_ATTRIBUTE_objectClass:
- case DRSUAPI_ATTRIBUTE_subClassOf:
- case DRSUAPI_ATTRIBUTE_auxiliaryClass:
- case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
- case DRSUAPI_ATTRIBUTE_possSuperiors:
+ case DRSUAPI_ATTID_objectClass:
+ case DRSUAPI_ATTID_subClassOf:
+ case DRSUAPI_ATTID_auxiliaryClass:
+ case DRSUAPI_ATTID_systemPossSuperiors:
+ case DRSUAPI_ATTID_possSuperiors:
str = talloc_strndup(ldb, (char *)valp->data, valp->length);
if (!str) {
return ldb_oom(ldb);
@@ -61,10 +61,10 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
return LDB_ERR_COMPARE_FALSE;
}
return LDB_ERR_COMPARE_TRUE;
- case DRSUAPI_ATTRIBUTE_systemMustContain:
- case DRSUAPI_ATTRIBUTE_systemMayContain:
- case DRSUAPI_ATTRIBUTE_mustContain:
- case DRSUAPI_ATTRIBUTE_mayContain:
+ case DRSUAPI_ATTID_systemMustContain:
+ case DRSUAPI_ATTID_systemMayContain:
+ case DRSUAPI_ATTID_mustContain:
+ case DRSUAPI_ATTID_mayContain:
str = talloc_strndup(ldb, (char *)valp->data, valp->length);
if (!str) {
return ldb_oom(ldb);
@@ -75,9 +75,9 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
return LDB_ERR_COMPARE_FALSE;
}
return LDB_ERR_COMPARE_TRUE;
- 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 LDB_ERR_COMPARE_FALSE;
}
@@ -233,11 +233,11 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
}
switch (a->attributeID_id) {
- case DRSUAPI_ATTRIBUTE_objectClass:
- case DRSUAPI_ATTRIBUTE_subClassOf:
- case DRSUAPI_ATTRIBUTE_auxiliaryClass:
- case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
- case DRSUAPI_ATTRIBUTE_possSuperiors:
+ case DRSUAPI_ATTID_objectClass:
+ case DRSUAPI_ATTID_subClassOf:
+ case DRSUAPI_ATTID_auxiliaryClass:
+ case DRSUAPI_ATTID_systemPossSuperiors:
+ case DRSUAPI_ATTID_possSuperiors:
str = talloc_strndup(schema, (char *)valp->data, valp->length);
if (!str) {
return ldb_oom(ldb);
@@ -249,10 +249,10 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
}
*valp = data_blob_string_const(vo->lDAPDisplayName);
return LDB_SUCCESS;
- case DRSUAPI_ATTRIBUTE_systemMustContain:
- case DRSUAPI_ATTRIBUTE_systemMayContain:
- case DRSUAPI_ATTRIBUTE_mustContain:
- case DRSUAPI_ATTRIBUTE_mayContain:
+ case DRSUAPI_ATTID_systemMustContain:
+ case DRSUAPI_ATTID_systemMayContain:
+ case DRSUAPI_ATTID_mustContain:
+ case DRSUAPI_ATTID_mayContain:
str = talloc_strndup(schema, (char *)valp->data, valp->length);
if (!str) {
return ldb_oom(ldb);
@@ -264,9 +264,9 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
}
*valp = data_blob_string_const(va->lDAPDisplayName);
return LDB_SUCCESS;
- 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 LDB_SUCCESS;
}
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);
}
generated by cgit (git 2.34.1) at 2024-11-04 21:22:44 +0000