summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-13 21:57:55 +0200
committerMichael Adam <obnox@samba.org>2008-04-15 22:45:38 +0200
commitb7bb61eff019fc529067a10e63dec5340cebff8d (patch)
tree9a66b933d785f4937da1c22109319776554ac4c2 /source3
parent7d7283fb0e11bc452f1da283e210378bd0d0e354 (diff)
downloadsamba-b7bb61eff019fc529067a10e63dec5340cebff8d.tar.gz
samba-b7bb61eff019fc529067a10e63dec5340cebff8d.tar.bz2
samba-b7bb61eff019fc529067a10e63dec5340cebff8d.zip
loadparm: remove pfunc parameter from process_registry_globals().
Use do_parameter() directly. Michael (This used to be commit 59b81bfd0abecb190d0c49e62581b26f10b96829)
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d5fd571ce4..71632cd753 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6486,7 +6486,7 @@ bool service_ok(int iService)
/*
* process_registry_globals
*/
-static bool process_registry_globals(bool (*pfunc)(const char *, const char *, void *))
+static bool process_registry_globals(void)
{
WERROR werr;
char **param_names;
@@ -6518,13 +6518,14 @@ static bool process_registry_globals(bool (*pfunc)(const char *, const char *, v
}
for (count = 0; count < num_params; count++) {
- ret = pfunc(param_names[count], param_values[count], NULL);
+ ret = do_parameter(param_names[count], param_values[count],
+ NULL);
if (ret != true) {
goto done;
}
}
- ret = pfunc("registry shares", "yes", NULL);
+ ret = do_parameter("registry shares", "yes", NULL);
/* store the csn */
smbconf_changed(conf_ctx, &conf_last_csn, NULL, NULL);
@@ -8711,7 +8712,7 @@ bool lp_load(const char *pszFname,
add_ipc, initialize_globals);
}
} else if (lp_config_backend_is_registry()) {
- bRetval = process_registry_globals(do_parameter);
+ bRetval = process_registry_globals();
} else {
DEBUG(0, ("Illegal config backend given: %d\n",
lp_config_backend()));