summaryrefslogtreecommitdiff
path: root/source3/param/loadparm_ctx.c
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 /source3/param/loadparm_ctx.c
parent7e8ed7d68dc48dd283df649c3f75d5679f7beae9 (diff)
downloadsamba-666dba33531c7e7d391318c915fb393ec5b1da36.tar.gz
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 'source3/param/loadparm_ctx.c')
-rw-r--r--source3/param/loadparm_ctx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 437ce435060..9c78f15879b 100644
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -60,7 +60,7 @@ static bool lp_load_for_s4_ctx(const char *filename)
* All of the s4 loadparm functions should be here eventually, once
* they are implemented in the s3 loadparm, have the same format (enum
* values in particular) and defaults. */
-static const struct loadparm_s3_context s3_fns =
+static const struct loadparm_s3_helpers s3_fns =
{
.get_parametric = lp_parm_const_string_service,
.get_parm_struct = lp_get_parameter,
@@ -117,7 +117,7 @@ static const struct loadparm_s3_context s3_fns =
.passwordserver = lp_passwordserver
};
-const struct loadparm_s3_context *loadparm_s3_context(void)
+const struct loadparm_s3_helpers *loadparm_s3_helpers(void)
{
return &s3_fns;
}