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

s4/drs: remove unused num_prefixes and prefixes from dsdb_schema

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Kamen Mazdrashki 2009-10-29 16:24:00 +02:00 committed by Stefan Metzmacher
parent 2fa4c4dcee
commit db82023af2
3 changed files with 4 additions and 6 deletions
source4/dsdb
samdb/ldb_modules
rootdse.c
schema
schema.hschema_init.c

2
source4/dsdb/samdb/ldb_modules/rootdse.c

@ -273,7 +273,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms
if (schema && do_attribute_explicit(attrs, "dsSchemaPrefixCount")) {
if (ldb_msg_add_fmt(msg, "dsSchemaPrefixCount",
"%u", schema->num_prefixes) != 0) {
"%u", schema->prefixmap->length) != 0) {
goto failed;
}
}

2
source4/dsdb/schema/schema.h

@ -165,8 +165,6 @@ struct dsdb_schema_oid_prefix {
};
struct dsdb_schema {
uint32_t num_prefixes;
struct dsdb_schema_oid_prefix *prefixes;
struct dsdb_schema_prefixmap *prefixmap;

6
source4/dsdb/schema/schema_init.c

@ -639,7 +639,7 @@ WERROR dsdb_attribute_from_ldb(struct ldb_context *ldb,
GET_STRING_LDB(msg, "cn", mem_ctx, attr, cn, false);
GET_STRING_LDB(msg, "lDAPDisplayName", mem_ctx, attr, lDAPDisplayName, true);
GET_STRING_LDB(msg, "attributeID", mem_ctx, attr, attributeID_oid, true);
if (schema->num_prefixes == 0) {
if (!schema->prefixmap || schema->prefixmap->length == 0) {
/* set an invalid value */
attr->attributeID_id = 0xFFFFFFFF;
} else {
@ -664,7 +664,7 @@ WERROR dsdb_attribute_from_ldb(struct ldb_context *ldb,
GET_UINT32_LDB(msg, "linkID", attr, linkID);
GET_STRING_LDB(msg, "attributeSyntax", mem_ctx, attr, attributeSyntax_oid, true);
if (schema->num_prefixes == 0) {
if (!schema->prefixmap || schema->prefixmap->length == 0) {
/* set an invalid value */
attr->attributeSyntax_id = 0xFFFFFFFF;
} else {
@ -719,7 +719,7 @@ WERROR dsdb_class_from_ldb(const struct dsdb_schema *schema,
GET_STRING_LDB(msg, "cn", mem_ctx, obj, cn, false);
GET_STRING_LDB(msg, "lDAPDisplayName", mem_ctx, obj, lDAPDisplayName, true);
GET_STRING_LDB(msg, "governsID", mem_ctx, obj, governsID_oid, true);
if (schema->num_prefixes == 0) {
if (!schema->prefixmap || schema->prefixmap->length == 0) {
/* set an invalid value */
obj->governsID_id = 0xFFFFFFFF;
} else {