r24704: Fix bug in the registry patch code.. all the more proves this code needs...

(This used to be commit aa98d219571c4a7af1e5a0f8483cc17a4b6b36e2)

diff --git a/source4/lib/registry/patchfile_dotreg.c b/source4/lib/registry/patchfile_dotreg.c
index f11ceb1be0e46416e261b9a7ba3161572f883795..1b4bffe8197769b8f6275edc01c863c59c425b47 100644 (file)
--- a/source4/lib/registry/patchfile_dotreg.c
+++ b/source4/lib/registry/patchfile_dotreg.c
@@ -211,7 +211,7 @@ _PUBLIC_ WERROR reg_dotreg_diff_load(int fd, const struct reg_diff_callbacks *ca
                }
 
                /* Delete value */
-               if (strcmp(p, "-")) {
+               if (strcmp(p, "-") == 0) {
                        error = callbacks->del_value(callback_data, curkey, line);
                        if (!W_ERROR_IS_OK(error)) {
                                DEBUG(0, ("Error deleting value %s in key %s\n", line, curkey));

diff --git a/source4/setup/provision.reg b/source4/setup/provision.reg
index 867f3e204c7a149692fb9d2222856514b5083d77..0e657f3e6ad3a77fc0f9c87a980845b49a7964d0 100644 (file)
--- a/source4/setup/provision.reg
+++ b/source4/setup/provision.reg
@@ -9,12 +9,20 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control]
 
 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\ProductOptions]
-ProductType="LanmanNT"
+ProductType=LanmanNT
 
 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Print]
 
 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Terminal Server]
 
+[HKEY_LOCAL_MACHINE\System]
+
+[HKEY_LOCAL_MACHINE\System\CurrentControlSet]
+
+[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services]
+
+[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Netlogon]
+
 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Netlogon\Parameters]
 RefusePasswordChange=REG_DWORD:0