From: Michael Adam <obnox@samba.org>
Date: Thu, 8 May 2008 15:43:59 +0000 (+0200)
Subject: Revert "registry: change registry_init_smbconf() to return WERROR instead of bool"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b311b8bf909698ef9f6d812b467952ccaafa67d7;p=thirdparty%2Fsamba.git

Revert "registry: change registry_init_smbconf() to return WERROR instead of bool"

This reverts commit 7c343c60574cda091f59861fbcb2893aefb564e9.
---

diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index dfce7502c58..057d74fc36c 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -627,8 +627,8 @@ static WERROR smbconf_reg_init(struct smbconf_ctx *ctx, const char *path)
 	}
 	rpd(ctx)->open = false;
 
-	werr = registry_init_smbconf(path);
-	if (!W_ERROR_IS_OK(werr)) {
+	if (!registry_init_smbconf(path)) {
+		werr = WERR_REG_IO_FAILURE;
 		goto done;
 	}
 
diff --git a/source/registry/reg_init_smbconf.c b/source/registry/reg_init_smbconf.c
index 43a5be025d0..a05da854cfb 100644
--- a/source/registry/reg_init_smbconf.c
+++ b/source/registry/reg_init_smbconf.c
@@ -67,9 +67,10 @@ done:
  * for use in places where not the whole registry is needed,
  * e.g. utils/net_conf.c and loadparm.c
  */
-WERROR registry_init_smbconf(const char *keyname)
+bool registry_init_smbconf(const char *keyname)
 {
 	WERROR werr;
+	bool ret = false;
 
 	DEBUG(10, ("registry_init_smbconf called\n"));
 
@@ -98,7 +99,9 @@ WERROR registry_init_smbconf(const char *keyname)
 		goto done;
 	}
 
+	ret = true;
+
 done:
 	regdb_close();
-	return werr;
+	return ret;
 }