sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

fixed internal handling of attribute deletion

Browse Source
This commit is contained in:
Andrew Tridgell 2009-04-07 16:33:54 +10:00
parent ef6c6ab4c6
commit 9181637170
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source4/lib/ldb/common/ldb_attributes.c
View File

@ -118,22 +118,13 @@ static const struct ldb_schema_attribute ldb_attribute_default = {
/* /*
return the attribute handlers for a given attribute return the attribute handlers for a given attribute
*/ */
const struct ldb_schema_attribute *ldb_schema_attribute_by_name(struct ldb_context *ldb, static const struct ldb_schema_attribute *ldb_schema_attribute_by_name_internal(
const char *name) struct ldb_context *ldb,
const char *name)
{ {
int i, e, b = 0, r; int i, e, b = 0, r;
const struct ldb_schema_attribute *def = &ldb_attribute_default; const struct ldb_schema_attribute *def = &ldb_attribute_default;
if (ldb->schema.attribute_handler_override) {
const struct ldb_schema_attribute *ret =
ldb->schema.attribute_handler_override(ldb,
ldb->schema.attribute_handler_override_private,
name);
if (ret) {
return ret;
}
}
/* as handlers are sorted, '*' must be the first if present */ /* as handlers are sorted, '*' must be the first if present */
if (strcmp(ldb->schema.attributes[0].name, "*") == 0) { if (strcmp(ldb->schema.attributes[0].name, "*") == 0) {
def = &ldb->schema.attributes[0]; def = &ldb->schema.attributes[0];
@ -162,6 +153,25 @@ const struct ldb_schema_attribute *ldb_schema_attribute_by_name(struct ldb_conte
return def; return def;
} }
/*
return the attribute handlers for a given attribute
*/
const struct ldb_schema_attribute *ldb_schema_attribute_by_name(struct ldb_context *ldb,
const char *name)
{
if (ldb->schema.attribute_handler_override) {
const struct ldb_schema_attribute *ret =
ldb->schema.attribute_handler_override(ldb,
ldb->schema.attribute_handler_override_private,
name);
if (ret) {
return ret;
}
}
return ldb_schema_attribute_by_name_internal(ldb, name);
}
/* /*
add to the list of ldif handlers for this ldb context add to the list of ldif handlers for this ldb context
@ -171,7 +181,7 @@ void ldb_schema_attribute_remove(struct ldb_context *ldb, const char *name)
const struct ldb_schema_attribute *a; const struct ldb_schema_attribute *a;
int i; int i;
a = ldb_schema_attribute_by_name(ldb, name); a = ldb_schema_attribute_by_name_internal(ldb, name);
if (a == NULL || a->name == NULL) { if (a == NULL || a->name == NULL) {
return; return;
} }