From c8a9533902036dc09e900fc2075765833502585b Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Mon, 22 Mar 2010 00:13:02 +0100 Subject: s4:registry - "patchfile.c" - consider also the hives in the generated diffs Apparently the diffs for the hives weren't generated previously. --- source4/lib/registry/patchfile.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source4') diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c index cc17ab320d..6b08cf8948 100644 --- a/source4/lib/registry/patchfile.c +++ b/source4/lib/registry/patchfile.c @@ -280,6 +280,15 @@ _PUBLIC_ WERROR reg_generate_diff(struct registry_context *ctx1, continue; } + if ((r1 == NULL) && (r2 != NULL)) { + callbacks->add_key(callback_data, + reg_predefined_keys[i].name); + } + if ((r1 != NULL) && (r2 == NULL)) { + callbacks->del_key(callback_data, + reg_predefined_keys[i].name); + } + error = reg_generate_diff_key(r1, r2, reg_predefined_keys[i].name, callbacks, callback_data); -- cgit