diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 14:37:06 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 17:37:51 +1000 |
| commit | de46ad9084aff4384f33660acf91da3b81554a88 (patch) | |
| tree | 42cdab1c24a8a38ba07d46f33d0b596f69d47bcc /source4/param | |
| parent | 876b1b3d198e2306c36423bfb1449870c74181fd (diff) | |
| download | samba-de46ad9084aff4384f33660acf91da3b81554a88.tar.gz samba-de46ad9084aff4384f33660acf91da3b81554a88.tar.bz2 samba-de46ad9084aff4384f33660acf91da3b81554a88.zip | |
lib/util use modules_path(), data_path() and shlib_ext() from source3
This brings these helpful utility functions in common, as they are not
based on either loadparm system.
(The 'modules dir' parameter from Samba4 will shortly be removed, so
there is no loss in functionality)
Andrew Bartlett
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/util.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source4/param/util.c b/source4/param/util.c index f8fc15a152..bcb5be1974 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -266,14 +266,6 @@ bool run_init_functions(init_module_fn *fns) return ret; } -static char *modules_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, - const char *name) -{ - return talloc_asprintf(mem_ctx, "%s/%s", - lpcfg_modulesdir(lp_ctx), - name); -} - /** * Load the initialization functions from DSO files for a specific subsystem. * @@ -282,7 +274,7 @@ static char *modules_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx, init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *subsystem) { - char *path = modules_path(mem_ctx, lp_ctx, subsystem); + char *path = modules_path(mem_ctx, subsystem); init_module_fn *ret; ret = load_modules(mem_ctx, path); |