summaryrefslogtreecommitdiff
path: root/lib/param
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-27 23:24:39 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-27 17:11:16 +0200
commit666dba33531c7e7d391318c915fb393ec5b1da36 (patch)
treecf5b864e6607487b4487ee5df7de2484e8d59b3b /lib/param
parent7e8ed7d68dc48dd283df649c3f75d5679f7beae9 (diff)
downloadsamba-666dba33531c7e7d391318c915fb393ec5b1da36.tar.gz
samba-666dba33531c7e7d391318c915fb393ec5b1da36.tar.bz2
samba-666dba33531c7e7d391318c915fb393ec5b1da36.zip
s3-param: Rename loadparm_s3_context -> loadparm_s3_helpers
This helps clarify the role of this structure and wrapper function. The purpose here is to provide helper functions to the lib/param loadparm_context that point back at the s3 lp_ functions. This allows a struct loadparm_context to be passed to any point in the code, and always refer to the correct loadparm system. If this has not been set, the variables loaded in the lib/param code will be returned. As requested by Michael Adam. Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Wed Jun 27 17:11:16 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib/param')
-rw-r--r--lib/param/loadparm.c4
-rw-r--r--lib/param/param.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 41c8cc62ec..1341581139 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1362,7 +1362,7 @@ struct loadparm_context {
bool refuse_free;
bool global; /* Is this the global context, which may set
* global variables such as debug level etc? */
- const struct loadparm_s3_context *s3_fns;
+ const struct loadparm_s3_helpers *s3_fns;
};
@@ -3469,7 +3469,7 @@ struct loadparm_context *loadparm_init_global(bool load_default)
* Initialise the global parameter structure.
*/
struct loadparm_context *loadparm_init_s3(TALLOC_CTX *mem_ctx,
- const struct loadparm_s3_context *s3_fns)
+ const struct loadparm_s3_helpers *s3_fns)
{
struct loadparm_context *loadparm_context = talloc_zero(mem_ctx, struct loadparm_context);
if (!loadparm_context) {
diff --git a/lib/param/param.h b/lib/param/param.h
index e20a10cd99..18d4b29ea0 100644
--- a/lib/param/param.h
+++ b/lib/param/param.h
@@ -20,7 +20,7 @@
#ifndef _PARAM_H /* _PARAM_H */
#define _PARAM_H
-struct loadparm_s3_context;
+struct loadparm_s3_helpers;
struct parmlist_entry;