summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-03-21 23:50:49 +0100
committerMichael Adam <obnox@samba.org>2008-03-21 23:50:49 +0100
commit9ec7af58c62d8ead447fc6da6db76db8dc5b96dc (patch)
treefa195d66d287fd3dbbdb323181e763800175f604
parenta81ed36e86cf9c275538aea03c80c1ee00122f4a (diff)
downloadsamba-9ec7af58c62d8ead447fc6da6db76db8dc5b96dc.tar.gz
samba-9ec7af58c62d8ead447fc6da6db76db8dc5b96dc.tar.bz2
samba-9ec7af58c62d8ead447fc6da6db76db8dc5b96dc.zip
registry: fix registry_init_smbconf() to close the registry at the end.
Michael (This used to be commit f4d87fdbf266a36fbb50dae863ee0784165c2fe1)
-rw-r--r--source3/lib/smbconf/smbconf_reg.c2
-rw-r--r--source3/registry/reg_init_smbconf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index 1f113c835f..77e6233cb4 100644
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/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/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index 1b17852a7a..71f21f85ec 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -95,6 +95,8 @@ bool registry_init_smbconf(void)
goto done;
}
+ regdb_close();
+
ret = true;
done: