[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-184-g57a290e

[Michael Adam]

The branch, master has been updated
       via  57a290e9421d4ff7c55188542219b67e881841da (commit)
      from  ff39e0f6ddf59de2bef43744e295575824a759b6 (commit)

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


- Log -----------------------------------------------------------------
commit 57a290e9421d4ff7c55188542219b67e881841da
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 28 12:04:53 2009 +0100

    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

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

Summary of changes:
 source3/registry/reg_init_basic.c |    8 ++++++++
 source3/registry/reg_init_full.c  |    8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c
index 60dcabd..eab4ca7 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 91e55d7..b5a06f2 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++ ) {


-- 
Samba Shared Repository