diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2010-03-22 00:13:02 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2010-03-22 00:13:02 +0100 |
| commit | c8a9533902036dc09e900fc2075765833502585b (patch) | |
| tree | 6cabfdae3ec7fb14569c60a36ebfe39bfec853fb | |
| parent | 056d262bb008fdcd0d46ff54dc93261e812d8e07 (diff) | |
| download | samba-c8a9533902036dc09e900fc2075765833502585b.tar.gz samba-c8a9533902036dc09e900fc2075765833502585b.tar.bz2 samba-c8a9533902036dc09e900fc2075765833502585b.zip | |
s4:registry - "patchfile.c" - consider also the hives in the generated diffs
Apparently the diffs for the hives weren't generated previously.
| -rw-r--r-- | source4/lib/registry/patchfile.c | 9 |
1 files changed, 9 insertions, 0 deletions
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); |