From 51db4c3f3d81d1ed03beae6426786c843ac59807 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Dec 2007 17:56:09 +0100 Subject: r26228: Store loadparm context in auth context, move more loadparm_contexts up the call stack. (This used to be commit ba75f1613a9aac69dd5df94dd8a2b37820acd166) --- source4/rpc_server/lsa/lsa_init.c | 2 +- source4/rpc_server/netlogon/dcerpc_netlogon.c | 2 +- source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'source4/rpc_server') diff --git a/source4/rpc_server/lsa/lsa_init.c b/source4/rpc_server/lsa/lsa_init.c index 83607cc446..c86fdf333d 100644 --- a/source4/rpc_server/lsa/lsa_init.c +++ b/source4/rpc_server/lsa/lsa_init.c @@ -57,7 +57,7 @@ NTSTATUS dcesrv_lsa_get_policy_state(struct dcesrv_call_state *dce_call, TALLOC_ partitions_basedn = samdb_partitions_dn(state->sam_ldb, mem_ctx); - state->sidmap = sidmap_open(state); + state->sidmap = sidmap_open(state, global_loadparm); if (state->sidmap == NULL) { return NT_STATUS_INVALID_SYSTEM_SERVICE; } diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index d5e385f70d..448f2b93f9 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -244,7 +244,7 @@ static NTSTATUS dcesrv_netr_creds_server_step_check(const char *computer_name, struct ldb_context *ldb; int ret; - ldb = schannel_db_connect(mem_ctx); + ldb = schannel_db_connect(mem_ctx, global_loadparm); if (!ldb) { return NT_STATUS_ACCESS_DENIED; } diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 1f9e584ecf..290cfda640 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -26,6 +26,7 @@ #include "lib/events/events.h" #include "dsdb/samdb/samdb.h" #include "system/passwd.h" +#include "param/param.h" static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, @@ -35,7 +36,7 @@ static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; uid_t uid; - sidmap = sidmap_open(mem_ctx); + sidmap = sidmap_open(mem_ctx, global_loadparm); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -55,7 +56,7 @@ static NTSTATUS dcesrv_unixinfo_UidToSid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; uid_t uid; - sidmap = sidmap_open(mem_ctx); + sidmap = sidmap_open(mem_ctx, global_loadparm); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -79,7 +80,7 @@ static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; gid_t gid; - sidmap = sidmap_open(mem_ctx); + sidmap = sidmap_open(mem_ctx, global_loadparm); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; @@ -99,7 +100,7 @@ static NTSTATUS dcesrv_unixinfo_GidToSid(struct dcesrv_call_state *dce_call, struct sidmap_context *sidmap; gid_t gid; - sidmap = sidmap_open(mem_ctx); + sidmap = sidmap_open(mem_ctx, global_loadparm); if (sidmap == NULL) { DEBUG(10, ("sidmap_open failed\n")); return NT_STATUS_NO_MEMORY; -- cgit