From 666dba33531c7e7d391318c915fb393ec5b1da36 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 27 Jun 2012 23:24:39 +1000 Subject: 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 Autobuild-Date(master): Wed Jun 27 17:11:16 CEST 2012 on sn-devel-104 --- source3/auth/auth_samba4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/auth/auth_samba4.c') diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c index 1bf4227b9e..ff73ffb079 100644 --- a/source3/auth/auth_samba4.c +++ b/source3/auth/auth_samba4.c @@ -44,7 +44,7 @@ static NTSTATUS check_samba4_security(const struct auth_context *auth_context, struct auth4_context *auth4_context; struct loadparm_context *lp_ctx; - lp_ctx = loadparm_init_s3(frame, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(10, ("loadparm_init_s3 failed\n")); talloc_free(frame); @@ -109,7 +109,7 @@ static NTSTATUS prepare_gensec(TALLOC_CTX *mem_ctx, struct cli_credentials *server_credentials; struct server_id *server_id; - lp_ctx = loadparm_init_s3(frame, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(1, ("loadparm_init_s3 failed\n")); TALLOC_FREE(frame); @@ -192,7 +192,7 @@ static NTSTATUS make_auth4_context_s4(TALLOC_CTX *mem_ctx, struct imessaging_context *msg_ctx; struct server_id *server_id; - lp_ctx = loadparm_init_s3(frame, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers()); if (lp_ctx == NULL) { DEBUG(1, ("loadparm_init_s3 failed\n")); TALLOC_FREE(frame); -- cgit