summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-01-28 12:04:53 +0100
committerMichael Adam <obnox@samba.org>2009-01-28 12:06:26 +0100
commit57a290e9421d4ff7c55188542219b67e881841da (patch)
tree4eaf4fca2ad0aaf9c05702b0fe7d6f5118d1f70c /source3
parentff39e0f6ddf59de2bef43744e295575824a759b6 (diff)
downloadsamba-57a290e9421d4ff7c55188542219b67e881841da.tar.gz
samba-57a290e9421d4ff7c55188542219b67e881841da.tar.bz2
samba-57a290e9421d4ff7c55188542219b67e881841da.zip
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
Diffstat (limited to 'source3')
-rw-r--r--source3/registry/reg_init_basic.c8
-rw-r--r--source3/registry/reg_init_full.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c
index 60dcabdcf2..eab4ca7f9d 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 91e55d76b2..b5a06f2582 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++ ) {