summaryrefslogtreecommitdiff
path: root/source4/lib/registry/tools
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-10-11 13:57:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:47 -0500
commitaed95ba66f29b9536e99027fab5327548b984b70 (patch)
tree70b13333b24c590b7da16837913e63de9f85a83d /source4/lib/registry/tools
parentb33be588743fde1c95bd5a639585326c3e74cd85 (diff)
downloadsamba-aed95ba66f29b9536e99027fab5327548b984b70.tar.gz
samba-aed95ba66f29b9536e99027fab5327548b984b70.tar.bz2
samba-aed95ba66f29b9536e99027fab5327548b984b70.zip
r2913: - Don't print hive name if it is NULL (regtree)
- Initialise hive name (reg_interface) - Fix LDB backend (enumerating keys works now!) (This used to be commit 5086d6b2494f236ef67096b2dd4da4f7402a65c5)
Diffstat (limited to 'source4/lib/registry/tools')
-rw-r--r--source4/lib/registry/tools/regtree.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 9748ca3438..bc0055a891 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -32,10 +32,13 @@ static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
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++) {