diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 17:56:09 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:05 +0100 |
| commit | 51db4c3f3d81d1ed03beae6426786c843ac59807 (patch) | |
| tree | d85647baa9f9715657a900da164ea54dc07fd13f /source4/ntvfs | |
| parent | f4a1083cf9f64b4d2b65b68942e93861409ea90f (diff) | |
| download | samba-51db4c3f3d81d1ed03beae6426786c843ac59807.tar.gz samba-51db4c3f3d81d1ed03beae6426786c843ac59807.tar.bz2 samba-51db4c3f3d81d1ed03beae6426786c843ac59807.zip | |
r26228: Store loadparm context in auth context, move more loadparm_contexts up the call stack.
(This used to be commit ba75f1613a9aac69dd5df94dd8a2b37820acd166)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/common/brlock_tdb.c | 3 | ||||
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/unixuid/vfs_unixuid.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c index 2b81521a2c..25642d5f5c 100644 --- a/source4/ntvfs/common/brlock_tdb.c +++ b/source4/ntvfs/common/brlock_tdb.c @@ -34,6 +34,7 @@ #include "cluster/cluster.h" #include "ntvfs/common/brlock.h" #include "ntvfs/ntvfs.h" +#include "param/param.h" /* in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies @@ -94,7 +95,7 @@ static struct brl_context *brl_tdb_init(TALLOC_CTX *mem_ctx, struct server_id se return NULL; } - brl->db = db_tmp_open(brl, "brlock.tdb", TDB_DEFAULT); + brl->db = db_tmp_open(brl, global_loadparm, "brlock.tdb", TDB_DEFAULT); if (brl->db == NULL) { talloc_free(brl); return NULL; diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index 24aa023de5..07948a64e2 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -31,7 +31,7 @@ #include "util/util_ldb.h" #include "libcli/security/security.h" #include "lib/events/events.h" - +#include "param/param.h" /* setup config options for a posix share @@ -216,7 +216,7 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs, event_context_find(pvfs), pvfs->ntvfs->ctx->config); - pvfs->sidmap = sidmap_open(pvfs); + pvfs->sidmap = sidmap_open(pvfs, global_loadparm); if (pvfs->sidmap == NULL) { return NT_STATUS_INTERNAL_DB_CORRUPTION; } diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c index 0ad8a8501b..d7b64b01f2 100644 --- a/source4/ntvfs/unixuid/vfs_unixuid.c +++ b/source4/ntvfs/unixuid/vfs_unixuid.c @@ -26,6 +26,7 @@ #include "auth/auth.h" #include "ntvfs/ntvfs.h" #include "dsdb/samdb/samdb.h" +#include "param/param.h" struct unixuid_private { struct sidmap_context *sidmap; @@ -215,7 +216,7 @@ static NTSTATUS unixuid_connect(struct ntvfs_module_context *ntvfs, return NT_STATUS_NO_MEMORY; } - private->sidmap = sidmap_open(private); + private->sidmap = sidmap_open(private, global_loadparm); if (private->sidmap == NULL) { return NT_STATUS_INTERNAL_DB_CORRUPTION; } |