diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 22:46:55 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:08 +0100 |
| commit | e31abef15f7696cf39e9e81307f153da93568e02 (patch) | |
| tree | 1cc4d50c7b25b8471399d4f0b971145e13519f2f /source4/ntvfs | |
| parent | 27b21a386ebeed66dd804a8b2e2256b739e32543 (diff) | |
| download | samba-e31abef15f7696cf39e9e81307f153da93568e02.tar.gz samba-e31abef15f7696cf39e9e81307f153da93568e02.tar.bz2 samba-e31abef15f7696cf39e9e81307f153da93568e02.zip | |
r26440: Remove more uses of global_loadparm.
(This used to be commit 8858cf39722f192865e531164c72039fd18d7a8d)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/common/notify.c | 3 | ||||
| -rw-r--r-- | source4/ntvfs/ipc/rap_server.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c index 187a349b4b..8bbf2d04b3 100644 --- a/source4/ntvfs/common/notify.c +++ b/source4/ntvfs/common/notify.c @@ -82,6 +82,7 @@ static int notify_destructor(struct notify_context *notify) */ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, struct messaging_context *messaging_ctx, + struct loadparm_context *lp_ctx, struct event_context *ev, struct share_config *scfg) { @@ -96,7 +97,7 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, return NULL; } - notify->w = cluster_tdb_tmp_open(notify, global_loadparm, "notify.tdb", TDB_SEQNUM); + notify->w = cluster_tdb_tmp_open(notify, lp_ctx, "notify.tdb", TDB_SEQNUM); if (notify->w == NULL) { talloc_free(notify); return NULL; diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c index 9113bef894..7d3020a259 100644 --- a/source4/ntvfs/ipc/rap_server.c +++ b/source4/ntvfs/ipc/rap_server.c @@ -41,7 +41,7 @@ NTSTATUS rap_netshareenum(TALLOC_CTX *mem_ctx, r->out.available = 0; r->out.info = NULL; - nterr = share_get_context_by_name(mem_ctx, lp_share_backend(global_loadparm), &sctx); + nterr = share_get_context_by_name(mem_ctx, lp_share_backend(global_loadparm), global_loadparm, &sctx); if (!NT_STATUS_IS_OK(nterr)) { return nterr; } diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index 8e5e5a6942..e058e6f546 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -214,6 +214,7 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs, pvfs->notify_context = notify_init(pvfs, pvfs->ntvfs->ctx->server_id, pvfs->ntvfs->ctx->msg_ctx, + pvfs->ntvfs->ctx->lp_ctx, event_context_find(pvfs), pvfs->ntvfs->ctx->config); |