diff options
author | Andrew Bartlett <abartlet@samba.org> | 2009-08-05 08:53:11 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2009-08-05 08:56:06 +1000 |
commit | 43aa546ecc3f05845793b1a7354685d50a77c170 (patch) | |
tree | 282c318ee900ba81ee91fe95328871d175b24cd6 /source4/dsdb/samdb/ldb_modules/kludge_acl.c | |
parent | 25a65d604676b25f97ca427b805d151c1a40a07e (diff) | |
download | samba-43aa546ecc3f05845793b1a7354685d50a77c170.tar.gz samba-43aa546ecc3f05845793b1a7354685d50a77c170.tar.bz2 samba-43aa546ecc3f05845793b1a7354685d50a77c170.zip |
s4:dsdb Don't cast an ldb_val into a const char * for schema lookups
This removes a number of cases where we did a cast into a const char *
of an ldb_val. While convention is to alway have an extra \0 at
data[length] in the ldb_val, this is not required, and does not occour
at least on build farm host 'svart'.
Andrew Bartlett
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/kludge_acl.c')
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/kludge_acl.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c index 5bed28b00c..15db491171 100644 --- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c +++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c @@ -93,7 +93,7 @@ static int kludge_acl_allowedAttributes(struct ldb_context *ldb, struct ldb_mess struct ldb_message_element *allowedAttributes; const struct dsdb_schema *schema = dsdb_get_schema(ldb); TALLOC_CTX *mem_ctx; - const char **objectclass_list, **attr_list; + const char **attr_list; int i, ret; /* If we don't have a schema yet, we can't do anything... */ @@ -118,19 +118,7 @@ static int kludge_acl_allowedAttributes(struct ldb_context *ldb, struct ldb_mess we alter the element array in ldb_msg_add_empty() */ oc_el = ldb_msg_find_element(msg, "objectClass"); - objectclass_list = talloc_array(mem_ctx, const char *, oc_el->num_values + 1); - if (!objectclass_list) { - ldb_oom(ldb); - talloc_free(mem_ctx); - return LDB_ERR_OPERATIONS_ERROR; - } - - for (i=0; oc_el && i < oc_el->num_values; i++) { - objectclass_list[i] = (const char *)oc_el->values[i].data; - } - objectclass_list[i] = NULL; - - attr_list = dsdb_full_attribute_list(mem_ctx, schema, objectclass_list, DSDB_SCHEMA_ALL); + attr_list = dsdb_full_attribute_list(mem_ctx, schema, oc_el, DSDB_SCHEMA_ALL); if (!attr_list) { ldb_asprintf_errstring(ldb, "kludge_acl: Failed to get list of attributes create %s attribute", attrName); talloc_free(mem_ctx); @@ -172,7 +160,7 @@ static int kludge_acl_childClasses(struct ldb_context *ldb, struct ldb_message * oc_el = ldb_msg_find_element(msg, "objectClass"); for (i=0; oc_el && i < oc_el->num_values; i++) { - sclass = dsdb_class_by_lDAPDisplayName(schema, (const char *)oc_el->values[i].data); + sclass = dsdb_class_by_lDAPDisplayName_ldb_val(schema, &oc_el->values[i]); if (!sclass) { /* We don't know this class? what is going on? */ continue; |