summaryrefslogtreecommitdiffstats
path: root/source/param
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-03-21 17:55:31 +0100
committerKarolin Seeger <kseeger@samba.org>2008-03-27 08:38:19 +0100
commit160f6b13bec74fc2a99bc68dc1b6a391ba03561a (patch)
treefd9ba8a54d6448e4efbfe3429e4c8d2d48446513 /source/param
parent35fcc34bdb5d6a82d9f20052712ea121f705f654 (diff)
downloadsamba-160f6b13bec74fc2a99bc68dc1b6a391ba03561a.tar.gz
samba-160f6b13bec74fc2a99bc68dc1b6a391ba03561a.tar.xz
samba-160f6b13bec74fc2a99bc68dc1b6a391ba03561a.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 (cherry picked from commit 96434d9dc7a66773e313cc128af57493dee245a1)
Diffstat (limited to 'source/param')
-rw-r--r--source/param/loadparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 72129693445..f61d0d8fdc1 100644
--- a/source/param/loadparm.c
+++ b/source/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)));