From: Michael Adam <obnox@samba.org>
Date: Fri, 21 Mar 2008 22:50:49 +0000 (+0100)
Subject: registry: fix registry_init_smbconf() to close the registry at the end.
X-Git-Tag: samba-3.3.0pre1~3163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4d87fdbf266a36fbb50dae863ee0784165c2fe1;p=thirdparty%2Fsamba.git

registry: fix registry_init_smbconf() to close the registry at the end.

Michael
---

diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index 1f113c835ff..77e6233cb40 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -418,8 +418,6 @@ static WERROR smbconf_reg_init(struct smbconf_ctx *ctx, const char *path)
 		werr = WERR_REG_IO_FAILURE;
 		goto done;
 	}
-	/* we know registry_init_smbconf() leaves registry open */
-	regdb_close();
 
 done:
 	return werr;
diff --git a/source/registry/reg_init_smbconf.c b/source/registry/reg_init_smbconf.c
index 1b17852a7a1..71f21f85ece 100644
--- a/source/registry/reg_init_smbconf.c
+++ b/source/registry/reg_init_smbconf.c
@@ -95,6 +95,8 @@ bool registry_init_smbconf(void)
 		goto done;
 	}
 
+	regdb_close();
+
 	ret = true;
 
 done: