svn commit: samba r2914 - in
branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb: .
jelmer at samba.org
jelmer at samba.org
Mon Oct 11 14:07:20 GMT 2004
Author: jelmer
Date: 2004-10-11 14:07:20 +0000 (Mon, 11 Oct 2004)
New Revision: 2914
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb&rev=2914&nolog=1
Log:
... and support enumerating values (data is not handled yet, only the names)
Modified:
branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c 2004-10-11 13:57:30 UTC (rev 2913)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c 2004-10-11 14:07:20 UTC (rev 2914)
@@ -63,11 +63,6 @@
return 0;
}
-static WERROR ldb_add_key(TALLOC_CTX *mem_ctx, struct registry_key *p, const char *name, uint32_t access_mask, SEC_DESC *sec, struct registry_key **new)
-{
- return WERR_NOT_SUPPORTED;
-}
-
static WERROR ldb_get_subkey_by_id(TALLOC_CTX *mem_ctx, struct registry_key *k, int idx, struct registry_key **subkey)
{
struct ldb_context *c = k->hive->backend_data;
@@ -93,13 +88,13 @@
ldb_search_free(c, msg);
return WERR_OK;
}
-#if 0
-static WERROR ldb_fetch_values(struct registry_key *k, int *count, REG_VAL ***values)
+static WERROR ldb_get_value_by_id(TALLOC_CTX *mem_ctx, struct registry_key *k, int idx, struct registry_value **value)
{
struct ldb_context *c = k->hive->backend_data;
- int ret, i, j;
+ int ret;
struct ldb_message **msg;
+ struct ldb_message_element *el;
ret = ldb_search(c, (char *)k->backend_data, LDB_SCOPE_ONELEVEL, "(value=*)", NULL,&msg);
@@ -108,30 +103,18 @@
return WERR_FOOBAR;
}
- *values = talloc_array_p(k->mem_ctx, REG_VAL *, ret);
- j = 0;
- for(i = 0; i < ret; i++) {
- struct ldb_message_element *el;
- char *name;
- el = ldb_msg_find_element(msg[i], "key");
+ if(idx >= ret) return WERR_NO_MORE_ITEMS;
+
+ el = ldb_msg_find_element(msg[idx], "value");
+
+ *value = talloc_p(mem_ctx, struct registry_value);
+ (*value)->name = talloc_strdup(mem_ctx, el->values[0].data);
+ (*value)->backend_data = talloc_strdup(mem_ctx, msg[idx]->dn);
- name = el->values[0].data;
-
- /* Dirty hack to circumvent ldb_tdb bug */
- if(k->backend_data && !strcmp(msg[i]->dn, (char *)k->backend_data)) continue;
-
- (*values)[j] = reg_val_new(k, NULL);
- (*values)[j]->backend_data = talloc_strdup((*values)[j]->mem_ctx, msg[i]->dn);
- j++;
- }
- *count = j;
-
ldb_search_free(c, msg);
return WERR_OK;
}
-#endif
-
static WERROR ldb_open_key(TALLOC_CTX *mem_ctx, struct registry_hive *h, const char *name, struct registry_key **key)
{
struct ldb_context *c = h->backend_data;
@@ -176,10 +159,8 @@
.name = "ldb",
.open_hive = ldb_open_hive,
.open_key = ldb_open_key,
-/*
- .fetch_values = ldb_fetch_values,*/
+ .get_value_by_index = ldb_get_value_by_id,
.get_subkey_by_index = ldb_get_subkey_by_id,
- .add_key = ldb_add_key,
};
NTSTATUS registry_ldb_init(void)
More information about the samba-cvs
mailing list