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

s4:lib/registry/ldb.c - change the "ldb_get_value" implementation to use the value cache and not an LDB lookup

In addition this fixes the use of special characters in registry object names.
This commit is contained in:
Matthias Dieter Wallnöfer 2010-06-24 16:06:39 +02:00
parent 3549425b30
commit 77e87e66b0

View File

@ -467,37 +467,34 @@ static WERROR ldb_get_value(TALLOC_CTX *mem_ctx, struct hive_key *k,
DATA_BLOB *data)
{
struct ldb_key_data *kd = talloc_get_type(k, struct ldb_key_data);
struct ldb_context *c = kd->ldb;
struct ldb_result *res;
int ret;
const char *res_name;
uint32_t idx;
if (name == NULL) {
return WERR_INVALID_PARAM;
}
/* the default value was requested, give it back */
if (name[0] == '\0') {
/* default value */
return ldb_get_default_value(mem_ctx, k, NULL, data_type, data);
} else {
/* normal value */
ret = ldb_search(c, mem_ctx, &res, kd->dn, LDB_SCOPE_ONELEVEL,
NULL, "(value=%s)", name);
if (ret != LDB_SUCCESS) {
DEBUG(0, ("Error getting values for '%s': %s\n",
ldb_dn_get_linearized(kd->dn), ldb_errstring(c)));
return WERR_FOOBAR;
}
if (res->count == 0)
return WERR_BADFILE;
reg_ldb_unpack_value(mem_ctx, res->msgs[0], NULL, data_type, data);
talloc_free(res);
}
return WERR_OK;
/* Do the search if necessary */
if (kd->values == NULL) {
W_ERROR_NOT_OK_RETURN(cache_values(kd));
}
for (idx = 0; idx < kd->value_count; idx++) {
res_name = ldb_msg_find_attr_as_string(kd->values[idx], "value",
"");
if (ldb_attr_cmp(name, res_name) == 0) {
reg_ldb_unpack_value(mem_ctx, kd->values[idx], NULL,
data_type, data);
return WERR_OK;
}
}
return WERR_BADFILE;
}
static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, const struct hive_key *h,