sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

r20188: move back to an default attribute handler and not use the '*' attribute

Browse Source 
to not conflict with the one that maybe added via the @ATTRIBUTES object

this is just to make the test-tdb-feature.sh torture test happy

There's still a bug when a attribute is registered multiple time
without removing old ldb_schema_attribute instances. But this bug
was there before my changes too and was just triggered by my changes

metze
This commit is contained in:
Stefan Metzmacher 2006-12-15 18:56:56 +00:00 committed by Gerald (Jerry) Carter
parent 216713d9a0
commit 70c4a36743
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/lib/ldb/common/ldb_attributes.c
View File

@ -86,6 +86,20 @@ int ldb_schema_attribute_add_with_syntax(struct ldb_context *ldb,
return 0;
}
static const struct ldb_schema_syntax ldb_syntax_default = {
.name = LDB_SYNTAX_OCTET_STRING,
.ldif_read_fn = ldb_handler_copy,
.ldif_write_fn = ldb_handler_copy,
.canonicalise_fn = ldb_handler_copy,
.comparison_fn = ldb_comparison_binary
};
static const struct ldb_schema_attribute ldb_attribute_default = {
.name = NULL,
.flags = 0,
.syntax = &ldb_syntax_default
};
/*
return the attribute handlers for a given attribute
*/
@ -93,7 +107,7 @@ const struct ldb_schema_attribute *ldb_schema_attribute_by_name(struct ldb_conte
const char *name)
{
int i, e, b = 0, r;
const struct ldb_schema_attribute *def = NULL;
const struct ldb_schema_attribute *def = &ldb_attribute_default;
/* as handlers are sorted, '*' must be the first if present */
if (strcmp(ldb->schema.attributes[0].name, "*") == 0) {
@ -171,7 +185,6 @@ int ldb_setup_wellknown_attributes(struct ldb_context *ldb)
const char *attr;
const char *syntax;
} wellknown[] = {
{ "*", LDB_SYNTAX_OCTET_STRING },
{ "dn", LDB_SYNTAX_DN },
{ "distinguishedName", LDB_SYNTAX_DN },
{ "cn", LDB_SYNTAX_DIRECTORY_STRING },