diff options
author | Volker Lendecke <vl@samba.org> | 2010-08-08 09:22:05 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:15 +0200 |
commit | 2d3623529fed0be2945cecfb19cef579e5af057e (patch) | |
tree | ca228e11cb6500c2ecd4469d772b08689f5f61df /source3/rpc_server | |
parent | 33256d6478381af3bee9ef064566e69cb4943c39 (diff) | |
download | samba-2d3623529fed0be2945cecfb19cef579e5af057e.tar.gz samba-2d3623529fed0be2945cecfb19cef579e5af057e.tar.bz2 samba-2d3623529fed0be2945cecfb19cef579e5af057e.zip |
s3: Lift the smbd_messaging_context from rpc_pipe_open_internal
Diffstat (limited to 'source3/rpc_server')
-rw-r--r-- | source3/rpc_server/rpc_ncacn_np_internal.c | 4 | ||||
-rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 3 | ||||
-rw-r--r-- | source3/rpc_server/srv_pipe_hnd.c | 2 | ||||
-rw-r--r-- | source3/rpc_server/srv_spoolss_util.c | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/source3/rpc_server/rpc_ncacn_np_internal.c b/source3/rpc_server/rpc_ncacn_np_internal.c index 2d50c5cd5c..9d15e0d3f9 100644 --- a/source3/rpc_server/rpc_ncacn_np_internal.c +++ b/source3/rpc_server/rpc_ncacn_np_internal.c @@ -347,6 +347,7 @@ static NTSTATUS rpc_pipe_internal_dispatch(struct rpc_pipe_client *cli, NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *abstract_syntax, struct auth_serversupplied_info *serversupplied_info, + struct messaging_context *msg_ctx, struct rpc_pipe_client **presult) { struct rpc_pipe_client *result; @@ -361,8 +362,7 @@ NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, result->dispatch = rpc_pipe_internal_dispatch; result->pipes_struct = make_internal_rpc_pipe_p( - result, abstract_syntax, "", serversupplied_info, - smbd_messaging_context()); + result, abstract_syntax, "", serversupplied_info, msg_ctx); if (result->pipes_struct == NULL) { TALLOC_FREE(result); return NT_STATUS_NO_MEMORY; diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index 300d2d4bf6..393d2b70fa 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -406,6 +406,7 @@ NTSTATUS _netr_NetrEnumerateTrustedDomains(struct pipes_struct *p, status = rpc_pipe_open_internal(p->mem_ctx, &ndr_table_lsarpc.syntax_id, p->server_info, + p->msg_ctx, &cli); if (!NT_STATUS_IS_OK(status)) { return status; @@ -629,6 +630,7 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct, status = rpc_pipe_open_internal(mem_ctx, &ndr_table_samr.syntax_id, server_info, + smbd_messaging_context(), &cli); if (!NT_STATUS_IS_OK(status)) { goto out; @@ -1032,6 +1034,7 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx, status = rpc_pipe_open_internal(mem_ctx, &ndr_table_samr.syntax_id, server_info, + smbd_messaging_context(), &cli); if (!NT_STATUS_IS_OK(status)) { goto out; diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c index ea04164f13..37efe061c3 100644 --- a/source3/rpc_server/srv_pipe_hnd.c +++ b/source3/rpc_server/srv_pipe_hnd.c @@ -24,6 +24,7 @@ #include "librpc/gen_ndr/ndr_named_pipe_auth.h" #include "../libcli/named_pipe_auth/npa_tstream.h" #include "rpc_server.h" +#include "smbd/globals.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV @@ -929,6 +930,7 @@ NTSTATUS rpc_connect_spoolss_pipe(connection_struct *conn, status = rpc_pipe_open_internal(conn, &ndr_table_spoolss.syntax_id, conn->server_info, + conn->sconn->msg_ctx, &conn->spoolss_pipe); if (!NT_STATUS_IS_OK(status)) { return status; diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index f8b29fc3b3..6f897dcc52 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -261,6 +261,7 @@ static WERROR winreg_printer_openkey(TALLOC_CTX *mem_ctx, status = rpc_pipe_open_internal(mem_ctx, &ndr_table_winreg.syntax_id, server_info, + smbd_messaging_context(), &pipe_handle); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("winreg_printer_openkey: Could not connect to winreg_pipe: %s\n", |