registry: unify debug output in the registry init functions.

[kai/samba.git] / source3 / registry / reg_init_smbconf.c

diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index b7e6add1121497141793a5363982f80a98f6a364..670f7a9c5dec8a4518d68768859fd868992c192c 100644 (file)
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -67,31 +67,38 @@ done:
  * for use in places where not the whole registry is needed,
  * e.g. utils/net_conf.c and loadparm.c
  */
-bool registry_init_smbconf(void)
+bool registry_init_smbconf(const char *keyname)
 {
+       WERROR werr;
        bool ret = false;
-       int saved_errno = 0;
-       static REGISTRY_HOOK smbconf_reg_hook = {KEY_SMBCONF, &smbconf_reg_ops};
 
        DEBUG(10, ("registry_init_smbconf called\n"));
 
-       if (!regdb_init()) {
-               saved_errno = errno;
-               DEBUG(1, ("Can't open the registry"));
-               if (saved_errno) {
-                       DEBUGADD(1, (": %s", strerror(saved_errno)));
-               }
-               DEBUGADD(1, (".\n"));
+       if (keyname == NULL) {
+               DEBUG(10, ("registry_init_smbconf: defaulting to key '%s'\n",
+                          KEY_SMBCONF));
+               keyname = KEY_SMBCONF;
+       }
+
+       werr = regdb_init();
+       if (!W_ERROR_IS_OK(werr)) {
+               DEBUG(1, ("Failed to initialize the registry: %s\n",
+                         dos_errstr(werr)));
+               goto done;
+       }
+       if (!init_registry_key(keyname)) {
+               DEBUG(1, ("Failed to initialize registry key '%s'\n", keyname));
                goto done;
        }
        reghook_cache_init();
-       if (!reghook_cache_add(&smbconf_reg_hook)) {
-               DEBUG(1, ("Error adding smbconf reghooks to reghook cache.\n"));
+       if (!reghook_cache_add(keyname, &smbconf_reg_ops)) {
+               DEBUG(1, ("Failed to add smbconf reghooks to reghook cache\n"));
                goto done;
        }
 
        ret = true;
 
 done:
+       regdb_close();
        return ret;
 }