summaryrefslogtreecommitdiff
path: root/source3/modules
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/modules
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 'source3/modules')
-rw-r--r--source3/modules/vfs_dfs_samba4.c2
-rw-r--r--source3/modules/vfs_posix_eadb.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_dfs_samba4.c b/source3/modules/vfs_dfs_samba4.c
index ad6f0411a1..200c744889 100644
--- a/source3/modules/vfs_dfs_samba4.c
+++ b/source3/modules/vfs_dfs_samba4.c
@@ -66,7 +66,7 @@ static int dfs_samba4_connect(struct vfs_handle_struct *handle,
return -1;
}
- data->lp_ctx = loadparm_init_s3(data, loadparm_s3_context());
+ data->lp_ctx = loadparm_init_s3(data, loadparm_s3_helpers());
if (data->lp_ctx == NULL) {
DEBUG(0, ("loadparm_init_s3 failed\n"));
SMB_VFS_NEXT_DISCONNECT(handle);
diff --git a/source3/modules/vfs_posix_eadb.c b/source3/modules/vfs_posix_eadb.c
index edc295bff0..e1b90ffbc6 100644
--- a/source3/modules/vfs_posix_eadb.c
+++ b/source3/modules/vfs_posix_eadb.c
@@ -248,7 +248,7 @@ static bool posix_eadb_init(int snum, struct tdb_wrap **p_db)
return false;
}
- lp_ctx = loadparm_init_s3(NULL, loadparm_s3_context());
+ lp_ctx = loadparm_init_s3(NULL, loadparm_s3_helpers());
become_root();
db = tdb_wrap_open(NULL, eadb, 50000,