summaryrefslogtreecommitdiff
path: root/source4/lib/registry/tools/regtree.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-01-02 12:51:18 -0800
committerJeremy Allison <jra@samba.org>2009-01-02 12:51:18 -0800
commite000045f15665f1c5209f52bf5730bac5c14256b (patch)
treebb72078d66fae6c8b854129ba0abd92afd279757 /source4/lib/registry/tools/regtree.c
parent3d2d0203e57bacf0cd61cfb72780a4bd9aa42707 (diff)
parent793f1cdbd918f2245255176572027763664d9d0b (diff)
downloadsamba-e000045f15665f1c5209f52bf5730bac5c14256b.tar.gz
samba-e000045f15665f1c5209f52bf5730bac5c14256b.tar.bz2
samba-e000045f15665f1c5209f52bf5730bac5c14256b.zip
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/lib/registry/tools/regtree.c')
-rw-r--r--source4/lib/registry/tools/regtree.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index cca009a0e2..948ed49312 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -55,13 +55,16 @@ static void print_tree(int level, struct registry_key *p,
&keyname,
NULL,
NULL)); i++) {
- SMB_ASSERT(strlen(keyname) > 0);
+
+ SMB_ASSERT(strlen(keyname) > 0);
if (!W_ERROR_IS_OK(reg_open_key(mem_ctx, p, keyname, &subkey)))
- continue;
+ continue;
+
print_tree(level+1, subkey, (fullpath && strlen(name))?
- talloc_asprintf(mem_ctx, "%s\\%s",
- name, keyname):
- keyname, fullpath, novals);
+ talloc_asprintf(mem_ctx, "%s\\%s",
+ name, keyname):
+ keyname, fullpath, novals);
+ talloc_free(subkey);
}
talloc_free(mem_ctx);