From: Michael Adam <obnox@samba.org>
Date: Sun, 13 Apr 2008 13:25:47 +0000 (+0200)
Subject: registry: change registry_init_smbconf() to return WERROR instead of bool
X-Git-Tag: samba-3.3.0pre1~2700
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c343c60574cda091f59861fbcb2893aefb564e9;p=thirdparty%2Fsamba.git

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

Michael
---

diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index c53d275938a..ce38a20f3fc 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -576,8 +576,8 @@ static WERROR smbconf_reg_init(struct smbconf_ctx *ctx, const char *path)
 	}
 	rpd(ctx)->open = false;
 
-	if (!registry_init_smbconf(path)) {
-		werr = WERR_REG_IO_FAILURE;
+	werr = registry_init_smbconf(path);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
diff --git a/source/registry/reg_init_smbconf.c b/source/registry/reg_init_smbconf.c
index a05da854cfb..43a5be025d0 100644
--- a/source/registry/reg_init_smbconf.c
+++ b/source/registry/reg_init_smbconf.c
@@ -67,10 +67,9 @@ 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(const char *keyname)
+WERROR registry_init_smbconf(const char *keyname)
 {
 	WERROR werr;
-	bool ret = false;
 
 	DEBUG(10, ("registry_init_smbconf called\n"));
 
@@ -99,9 +98,7 @@ bool registry_init_smbconf(const char *keyname)
 		goto done;
 	}
 
-	ret = true;
-
 done:
 	regdb_close();
-	return ret;
+	return werr;
 }