[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  c8a9533... s4:registry - "patchfile.c" - consider also the hives in the generated diffs
       via  056d262... s4:registry - "patchfile.c" - fix a typo
      from  872d233... s4:regtree - fix counter variables to be "unsigned"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c8a9533902036dc09e900fc2075765833502585b
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 22 00:13:02 2010 +0100

    s4:registry - "patchfile.c" - consider also the hives in the generated diffs
    
    Apparently the diffs for the hives weren't generated previously.

commit 056d262bb008fdcd0d46ff54dc93261e812d8e07
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 22 00:02:06 2010 +0100

    s4:registry - "patchfile.c" - fix a typo

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/registry/patchfile.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c
index 19e27f5..6b08cf8 100644
--- a/source4/lib/registry/patchfile.c
+++ b/source4/lib/registry/patchfile.c
@@ -154,7 +154,7 @@ WERROR reg_generate_diff_key(struct registry_key *oldkey,
 			return error2;
 		}
 
-		/* oldkey didn't have such a subkey, add add diff */
+		/* oldkey didn't have such a subkey, add a add diff */
 		tmppath = talloc_asprintf(mem_ctx, "%s\\%s", path, keyname1);
 		callbacks->add_key(callback_data, tmppath);
 
@@ -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);


-- 
Samba Shared Repository