sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s4:dsdb/schema: s/class/sclass

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2009-02-02 09:20:36 +01:00
parent 096b4a9bd0
commit 2dc838341d
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source4/dsdb/schema/schema_description.c
View File

@ -313,7 +313,7 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,
return schema_entry;
}
char *schema_class_to_description(TALLOC_CTX *mem_ctx, const struct dsdb_class *class)
char *schema_class_to_description(TALLOC_CTX *mem_ctx, const struct dsdb_class *sclass)
{
char *schema_description;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
@ -325,21 +325,22 @@ char *schema_class_to_description(TALLOC_CTX *mem_ctx, const struct dsdb_class *
= schema_class_description(mem_ctx,
TARGET_AD_SCHEMA_SUBENTRY,
" ",
class->governsID_oid,
class->lDAPDisplayName,
sclass->governsID_oid,
sclass->lDAPDisplayName,
NULL,
class->subClassOf,
class->objectClassCategory,
sclass->subClassOf,
sclass->objectClassCategory,
dsdb_attribute_list(tmp_ctx,
class, DSDB_SCHEMA_ALL_MUST),
sclass, DSDB_SCHEMA_ALL_MUST),
dsdb_attribute_list(tmp_ctx,
class, DSDB_SCHEMA_ALL_MAY),
sclass, DSDB_SCHEMA_ALL_MAY),
NULL);
talloc_free(tmp_ctx);
return schema_description;
}
char *schema_class_to_dITContentRule(TALLOC_CTX *mem_ctx, const struct dsdb_class *class,
const struct dsdb_schema *schema)
char *schema_class_to_dITContentRule(TALLOC_CTX *mem_ctx, const struct dsdb_class *sclass,
const struct dsdb_schema *schema)
{
int i;
char *schema_description;
@ -353,8 +354,8 @@ char *schema_class_to_dITContentRule(TALLOC_CTX *mem_ctx, const struct dsdb_clas
return NULL;
}
aux_class_list = merge_attr_list(tmp_ctx, aux_class_list, class->systemAuxiliaryClass);
aux_class_list = merge_attr_list(tmp_ctx, aux_class_list, class->auxiliaryClass);
aux_class_list = merge_attr_list(tmp_ctx, aux_class_list, sclass->systemAuxiliaryClass);
aux_class_list = merge_attr_list(tmp_ctx, aux_class_list, sclass->auxiliaryClass);
for (i=0; aux_class_list && aux_class_list[i]; i++) {
aux_class = dsdb_class_by_lDAPDisplayName(schema, aux_class_list[i]);
@ -370,8 +371,8 @@ char *schema_class_to_dITContentRule(TALLOC_CTX *mem_ctx, const struct dsdb_clas
= schema_class_description(mem_ctx,
TARGET_AD_SCHEMA_SUBENTRY,
" ",
class->governsID_oid,
class->lDAPDisplayName,
sclass->governsID_oid,
sclass->lDAPDisplayName,
(const char **)aux_class_list,
NULL, /* Must not specify a
* SUP (subclass) in

36
source4/dsdb/schema/schema_query.c
View File

@ -241,41 +241,41 @@ const char **merge_attr_list(TALLOC_CTX *mem_ctx,
considering subclasses, auxillary classes etc)
*/
const char **dsdb_attribute_list(TALLOC_CTX *mem_ctx, const struct dsdb_class *class, enum dsdb_attr_list_query query)
const char **dsdb_attribute_list(TALLOC_CTX *mem_ctx, const struct dsdb_class *sclass, enum dsdb_attr_list_query query)
{
const char **attr_list = NULL;
switch (query) {
case DSDB_SCHEMA_ALL_MAY:
attr_list = merge_attr_list(mem_ctx, attr_list, class->mayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, class->systemMayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->mayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->systemMayContain);
break;
case DSDB_SCHEMA_ALL_MUST:
attr_list = merge_attr_list(mem_ctx, attr_list, class->mustContain);
attr_list = merge_attr_list(mem_ctx, attr_list, class->systemMustContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->mustContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->systemMustContain);
break;
case DSDB_SCHEMA_SYS_MAY:
attr_list = merge_attr_list(mem_ctx, attr_list, class->systemMayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->systemMayContain);
break;
case DSDB_SCHEMA_SYS_MUST:
attr_list = merge_attr_list(mem_ctx, attr_list, class->systemMustContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->systemMustContain);
break;
case DSDB_SCHEMA_MAY:
attr_list = merge_attr_list(mem_ctx, attr_list, class->mayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->mayContain);
break;
case DSDB_SCHEMA_MUST:
attr_list = merge_attr_list(mem_ctx, attr_list, class->mustContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->mustContain);
break;
case DSDB_SCHEMA_ALL:
attr_list = merge_attr_list(mem_ctx, attr_list, class->mayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, class->systemMayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, class->mustContain);
attr_list = merge_attr_list(mem_ctx, attr_list, class->systemMustContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->mayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->systemMayContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->mustContain);
attr_list = merge_attr_list(mem_ctx, attr_list, sclass->systemMustContain);
break;
}
return attr_list;
@ -287,26 +287,26 @@ static const char **dsdb_full_attribute_list_internal(TALLOC_CTX *mem_ctx,
enum dsdb_attr_list_query query)
{
int i;
const struct dsdb_class *class;
const struct dsdb_class *sclass;
const char **attr_list = NULL;
const char **this_class_list;
const char **recursive_list;
for (i=0; class_list && class_list[i]; i++) {
class = dsdb_class_by_lDAPDisplayName(schema, class_list[i]);
sclass = dsdb_class_by_lDAPDisplayName(schema, class_list[i]);
this_class_list = dsdb_attribute_list(mem_ctx, class, query);
this_class_list = dsdb_attribute_list(mem_ctx, sclass, query);
attr_list = merge_attr_list(mem_ctx, attr_list, this_class_list);
recursive_list = dsdb_full_attribute_list_internal(mem_ctx, schema,
class->systemAuxiliaryClass,
sclass->systemAuxiliaryClass,
query);
attr_list = merge_attr_list(mem_ctx, attr_list, recursive_list);
recursive_list = dsdb_full_attribute_list_internal(mem_ctx, schema,
class->auxiliaryClass,
sclass->auxiliaryClass,
query);
attr_list = merge_attr_list(mem_ctx, attr_list, recursive_list);