svn commit: samba r2913 - in
branches/SAMBA_4_0/source/lib/registry: common reg_backend_ldb tools
jelmer at samba.org
jelmer at samba.org
Mon Oct 11 13:57:30 GMT 2004
Author: jelmer
Date: 2004-10-11 13:57:30 +0000 (Mon, 11 Oct 2004)
New Revision: 2913
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/lib/registry&rev=2913&nolog=1
Log:
- Don't print hive name if it is NULL (regtree)
- Initialise hive name (reg_interface)
- Fix LDB backend (enumerating keys works now!)
Modified:
branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c
branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c 2004-10-11 13:13:51 UTC (rev 2912)
+++ branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c 2004-10-11 13:57:30 UTC (rev 2913)
@@ -185,6 +185,7 @@
ret->functions = entry->functions;
ret->backend_data = NULL;
ret->reg_ctx = h;
+ ret->name = NULL;
werr = entry->functions->open_hive(mem_ctx, ret, &ret->root);
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:13:51 UTC (rev 2912)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb/reg_backend_ldb.c 2004-10-11 13:57:30 UTC (rev 2913)
@@ -51,8 +51,6 @@
ret[strlen(ret)-1] = '\0';
- printf("RETURNING: %s\n", ret);
-
if(strlen(ret) == 0) return NULL;
return ret;
@@ -65,9 +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;
@@ -94,7 +89,6 @@
*subkey = talloc_p(mem_ctx, struct registry_key);
(*subkey)->name = talloc_strdup(mem_ctx, el->values[0].data);
(*subkey)->backend_data = talloc_strdup(mem_ctx, msg[idx]->dn);
- printf("Retrieved: %s\n", (*subkey)->backend_data);
ldb_search_free(c, msg);
return WERR_OK;
@@ -158,7 +152,6 @@
*key = talloc_p(mem_ctx, struct registry_key);
(*key)->name = talloc_strdup(mem_ctx, strrchr(name, '\\'));
(*key)->backend_data = talloc_strdup(mem_ctx, msg[0]->dn);
- printf("Retrieved: %s\n", (*key)->backend_data);
ldb_search_free(c, msg);
@@ -183,7 +176,7 @@
.name = "ldb",
.open_hive = ldb_open_hive,
.open_key = ldb_open_key,
-/* .fetch_subkeys = ldb_fetch_subkeys,
+/*
.fetch_values = ldb_fetch_values,*/
.get_subkey_by_index = ldb_get_subkey_by_id,
.add_key = ldb_add_key,
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2004-10-11 13:13:51 UTC (rev 2912)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2004-10-11 13:57:30 UTC (rev 2913)
@@ -32,10 +32,13 @@
for(i = 0; i < l; i++) putchar(' ');
/* Hive name */
- if(p->hive->root == p) printf("%s\n", p->hive->name);
- else if(!p->name) printf("<No Name>\n");
- else if(fullpath) printf("%s\n", p->path);
- else printf("%s\n", p->name);
+ if(p->hive->root == p) {
+ if(p->hive->name) printf("%s\n", p->hive->name); else printf("<No Name>\n");
+ } else {
+ if(!p->name) printf("<No Name>\n");
+ if(fullpath) printf("%s\n", p->path);
+ else printf("%s\n", p->name);
+ }
mem_ctx = talloc_init("print_tree");
for(i = 0; W_ERROR_IS_OK(error = reg_key_get_subkey_by_index(mem_ctx, p, i, &subkey)); i++) {
More information about the samba-cvs
mailing list