summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-02-15 13:57:31 +0100
committerMichael Adam <obnox@samba.org>2008-02-15 16:23:10 +0100
commit9af84dd382aad55fcdfa803238d8edd57636f2aa (patch)
tree9ae93c85240516dfde9f1e530e35fbe57b6bd67b /source3
parent6fe7ed0b12d244086f59c0cad2bb4f26879c95e0 (diff)
downloadsamba-9af84dd382aad55fcdfa803238d8edd57636f2aa.tar.gz
samba-9af84dd382aad55fcdfa803238d8edd57636f2aa.tar.bz2
samba-9af84dd382aad55fcdfa803238d8edd57636f2aa.zip
Rename registry_init_regdb() to registry_init_smbconf().
That's what it actually is. Michael (This used to be commit 9d3c27f55726dbdce41fcf71c8bc1a7829340268)
Diffstat (limited to 'source3')
-rw-r--r--source3/libnet/libnet_conf.c2
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/registry/reg_init_smbconf.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index 4d998acad8..c3872b68de 100644
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -62,7 +62,7 @@ static WERROR libnet_conf_reg_initialize(struct libnet_conf_ctx *ctx)
{
WERROR werr = WERR_OK;
- if (!registry_init_regdb()) {
+ if (!registry_init_smbconf()) {
werr = WERR_REG_IO_FAILURE;
goto done;
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3737224275..29de336df5 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3561,7 +3561,7 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
smb_panic("Failed to create talloc context!");
}
- if (!registry_init_regdb()) {
+ if (!registry_init_smbconf()) {
DEBUG(1, ("Error initializing the registry.\n"));
goto done;
}
diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index 6452b0b15b..b7e6add112 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -67,13 +67,13 @@ done:
* for use in places where not the whole registry is needed,
* e.g. utils/net_conf.c and loadparm.c
*/
-bool registry_init_regdb(void)
+bool registry_init_smbconf(void)
{
bool ret = false;
int saved_errno = 0;
static REGISTRY_HOOK smbconf_reg_hook = {KEY_SMBCONF, &smbconf_reg_ops};
- DEBUG(10, ("registry_init_regdb called\n"));
+ DEBUG(10, ("registry_init_smbconf called\n"));
if (!regdb_init()) {
saved_errno = errno;