diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-12-15 13:08:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:29:19 -0500 |
| commit | c69717755abeaf8bf93e76255d0912e3a24b7cb0 (patch) | |
| tree | 979dfa0ee6680bd67b47661ae78965b52577a698 /source4/scripting/ejs | |
| parent | 1a1027b8244a2f41676b2bd5999015c769fb4fb4 (diff) | |
| download | samba-c69717755abeaf8bf93e76255d0912e3a24b7cb0.tar.gz samba-c69717755abeaf8bf93e76255d0912e3a24b7cb0.tar.bz2 samba-c69717755abeaf8bf93e76255d0912e3a24b7cb0.zip | |
r20184: change ldb_attrib_handler into ldb_schema_attribute, which has a pointer
to a ldb_schema_syntax struct.
the default attribute handler is now registered dynamicly as "*"
attribute, instead of having its own code path.
ldb_schema_attribute's can be added to the ldb_schema given a
ldb_schema_syntax struct or the syntax name
we may also need to introduce a ldb_schema_matching_rule,
and add a pointer to a default ldb_schema_matching_rule
in the ldb_schema_syntax.
metze
(This used to be commit b97b8f5dcbce006f005e53ca79df3330e62f117b)
Diffstat (limited to 'source4/scripting/ejs')
| -rw-r--r-- | source4/scripting/ejs/mprutil.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c index 6c989807a6..cfed69dbe0 100644 --- a/source4/scripting/ejs/mprutil.c +++ b/source4/scripting/ejs/mprutil.c @@ -171,17 +171,17 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message * for (i=0;i<msg->num_elements;i++) { struct ldb_message_element *el = &msg->elements[i]; struct MprVar val; - const struct ldb_attrib_handler *attr; + const struct ldb_schema_attribute *a; struct ldb_val v; - attr = ldb_attrib_handler(ldb, el->name); - if (attr == NULL) { + a = ldb_schema_attribute_by_name(ldb, el->name); + if (a == NULL) { goto failed; } if (el->num_values == 1 && !str_list_check_ci(multivalued, el->name)) { - if (attr->ldif_write_fn(ldb, msg, &el->values[0], &v) != 0) { + if (a->syntax->ldif_write_fn(ldb, msg, &el->values[0], &v) != 0) { goto failed; } /* FIXME: nasty hack, remove me when ejs will support @@ -195,8 +195,8 @@ static struct MprVar mprLdbMessage(struct ldb_context *ldb, struct ldb_message * int j; val = mprArray(el->name); for (j=0;j<el->num_values;j++) { - if (attr->ldif_write_fn(ldb, msg, - &el->values[j], &v) != 0) { + if (a->syntax->ldif_write_fn(ldb, msg, + &el->values[j], &v) != 0) { goto failed; } /* FIXME: nasty hack, remove me when ejs will support |