svn commit: samba r15772 - in branches/SAMBA_4_0/source: ntvfs/ipc
rpc_server
metze at samba.org
metze at samba.org
Sun May 21 11:39:50 GMT 2006
Author: metze
Date: 2006-05-21 11:39:50 +0000 (Sun, 21 May 2006)
New Revision: 15772
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15772
Log:
pass the messaging context and server_id to the dcerpc server subsystem
metze
Modified:
branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h
branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c 2006-05-21 10:42:29 UTC (rev 15771)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c 2006-05-21 11:39:50 UTC (rev 15772)
@@ -242,6 +242,8 @@
ep_description,
h->session_info,
ntvfs->ctx->event_ctx,
+ ntvfs->ctx->msg_ctx,
+ ntvfs->ctx->server_id,
0,
&p->dce_conn);
NT_STATUS_NOT_OK_RETURN(status);
Modified: branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c 2006-05-21 10:42:29 UTC (rev 15771)
+++ branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c 2006-05-21 11:39:50 UTC (rev 15772)
@@ -292,6 +292,8 @@
const struct dcesrv_endpoint *ep,
struct auth_session_info *session_info,
struct event_context *event_ctx,
+ struct messaging_context *msg_ctx,
+ uint32_t server_id,
uint32_t state_flags,
struct dcesrv_connection **_p)
{
@@ -321,6 +323,8 @@
p->auth_state.session_info = session_info;
p->auth_state.session_key = dcesrv_generic_session_key;
p->event_ctx = event_ctx;
+ p->msg_ctx = msg_ctx;
+ p->server_id = server_id;
p->processing = False;
p->state_flags = state_flags;
ZERO_STRUCT(p->transport);
@@ -339,6 +343,8 @@
const struct dcerpc_binding *ep_description,
struct auth_session_info *session_info,
struct event_context *event_ctx,
+ struct messaging_context *msg_ctx,
+ uint32_t server_id,
uint32_t state_flags,
struct dcesrv_connection **dce_conn_p)
{
@@ -351,7 +357,9 @@
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
- status = dcesrv_endpoint_connect(dce_ctx, mem_ctx, ep, session_info, event_ctx, state_flags, dce_conn_p);
+ status = dcesrv_endpoint_connect(dce_ctx, mem_ctx, ep, session_info,
+ event_ctx, msg_ctx, server_id,
+ state_flags, dce_conn_p);
NT_STATUS_NOT_OK_RETURN(status);
(*dce_conn_p)->auth_state.session_key = dcesrv_inherited_session_key;
Modified: branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h 2006-05-21 10:42:29 UTC (rev 15771)
+++ branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h 2006-05-21 11:39:50 UTC (rev 15772)
@@ -178,6 +178,12 @@
/* the event_context that will be used for this connection */
struct event_context *event_ctx;
+ /* the message_context that will be used for this connection */
+ struct messaging_context *msg_ctx;
+
+ /* the server_id that will be used for this connection */
+ uint32_t server_id;
+
/* the transport level session key */
DATA_BLOB transport_session_key;
Modified: branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c 2006-05-21 10:42:29 UTC (rev 15771)
+++ branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c 2006-05-21 11:39:50 UTC (rev 15772)
@@ -113,6 +113,8 @@
dcesrv_sock->endpoint,
session_info,
srv_conn->event.ctx,
+ srv_conn->msg_ctx,
+ srv_conn->server_id,
DCESRV_CALL_STATE_FLAG_MAY_ASYNC,
&dcesrv_conn);
if (!NT_STATUS_IS_OK(status)) {
More information about the samba-cvs
mailing list