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/smbd/notify_internal.c | 2 +- source3/smbd/server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c index 4fb1b351f3..49d1b06fbf 100644 --- a/source3/smbd/notify_internal.c +++ b/source3/smbd/notify_internal.c @@ -133,7 +133,7 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, notify->msg = msg; notify->list = NULL; - lp_ctx = loadparm_init_s3(notify, loadparm_s3_context()); + lp_ctx = loadparm_init_s3(notify, loadparm_s3_helpers()); notify->db_notify = db_open_tdb( notify, lp_ctx, lock_path("notify.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 661c2fa7a7..b4b5ae3d91 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1365,7 +1365,7 @@ extern void build_options(bool screen); } if (lp_server_role() == ROLE_DOMAIN_BDC || lp_server_role() == ROLE_DOMAIN_PDC) { - struct loadparm_context *lp_ctx = loadparm_init_s3(NULL, loadparm_s3_context()); + struct loadparm_context *lp_ctx = loadparm_init_s3(NULL, loadparm_s3_helpers()); if (!open_schannel_session_store(NULL, lp_ctx)) { DEBUG(0,("ERROR: Samba cannot open schannel store for secured NETLOGON operations.\n")); exit(1); -- cgit