summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-03-21 17:55:31 +0100
committerMichael Adam <obnox@samba.org>2008-03-21 18:19:24 +0100
commit6f7cfeddd61f728e2452a7b89f5ee2ff36ca394f (patch)
treead5f91f4c72bf9a40fa897204cb36574721d562e /source3/param
parent40ea88db5e9e5dd8fd6a924bfcd1afefa538404d (diff)
downloadsamba-6f7cfeddd61f728e2452a7b89f5ee2ff36ca394f.tar.gz
samba-6f7cfeddd61f728e2452a7b89f5ee2ff36ca394f.tar.bz2
samba-6f7cfeddd61f728e2452a7b89f5ee2ff36ca394f.zip
libsmbconf: add a "path" variable to the conf context.
This is passed to the module init routines. In case of the registry, this is the path of the basekey in registry, that is to be used, defaulting to KEY_SMBCONF (HKLM\software\samba\smbconf), when NULL is given. This is the only case currently used. In order to support other keys, registry initialization for smbconf has to be changed to support different keys. Michael (This used to be commit 96434d9dc7a66773e313cc128af57493dee245a1)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7212969344..f61d0d8fdc 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6497,7 +6497,7 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *))
if (conf_ctx == NULL) {
/* first time */
- werr = smbconf_init_reg(NULL, &conf_ctx);
+ werr = smbconf_init_reg(NULL, &conf_ctx, NULL);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
@@ -6607,7 +6607,7 @@ bool lp_file_list_changed(void)
if (lp_config_backend_is_registry()) {
if (conf_ctx == NULL) {
WERROR werr;
- werr = smbconf_init_reg(NULL, &conf_ctx);
+ werr = smbconf_init_reg(NULL, &conf_ctx, NULL);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0, ("error opening configuration: %s\n",
dos_errstr(werr)));