From: Michael Adam <obnox@samba.org>
Date: Tue, 29 Apr 2008 15:41:03 +0000 (+0200)
Subject: registry: skip writes of existing keys in init_registry_data().
X-Git-Tag: samba-4.0.0alpha6~801^2~1559
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f50002b491d48b7694e32be1c6aeafb85d6da16f;p=thirdparty%2Fsamba.git

registry: skip writes of existing keys in init_registry_data().

Michael
(This used to be commit 37dabf931727f00569725af0e34677d36bb7df99)
---

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 81f5edcb7b3..8ebe647a98f 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -293,6 +293,9 @@ do_init:
 	/* loop over all of the predefined paths and add each component */
 
 	for (i=0; builtin_registry_paths[i] != NULL; i++) {
+		if (regdb_key_exists(builtin_registry_paths[i])) {
+			continue;
+		}
 		werr = init_registry_key_internal(builtin_registry_paths[i]);
 		if (!W_ERROR_IS_OK(werr)) {
 			goto fail;