From: Michael Adam <obnox@samba.org>
Date: Wed, 28 Jan 2009 11:04:53 +0000 (+0100)
Subject: s3:registry: always provision the registry, not only in smbd.
X-Git-Tag: samba-4.0.0alpha7~417^2~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57a290e9421d4ff7c55188542219b67e881841da;p=thirdparty%2Fsamba.git

s3:registry: always provision the registry, not only in smbd.

This will make tools like "net registry" also fill the registry
with the basic hives and keys.

Michael
---

diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c
index 60dcabdcf2f..eab4ca7f9d6 100644
--- a/source3/registry/reg_init_basic.c
+++ b/source3/registry/reg_init_basic.c
@@ -37,6 +37,14 @@ WERROR registry_init_common(void)
 	if (!W_ERROR_IS_OK(werr)) {
 		DEBUG(0, ("Failed to initialize the reghook cache: %s\n",
 			  win_errstr(werr)));
+		goto done;
+	}
+
+	/* setup the necessary keys and values */
+
+	werr = init_registry_data();
+	if (!W_ERROR_IS_OK(werr)) {
+		DEBUG(0, ("Failed to initialize data in registry!\n"));
 	}
 
 done:
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index 91e55d76b24..b5a06f25826 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -72,14 +72,6 @@ WERROR registry_init_full(void)
 		goto fail;
 	}
 
-	/* setup the necessary keys and values */
-
-	werr = init_registry_data();
-	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(0, ("Failed to initialize data in registry!\n"));
-		goto fail;
-	}
-
 	/* build the cache tree of registry hooks */
 
 	for ( i=0; reg_hooks[i].keyname; i++ ) {