mirror of
https://github.com/samba-team/samba.git
synced 2025-10-29 04:23:51 +03:00
r464: a big improvement to the API for writing server-side RPC
servers. Previously the server pipe code needed to return the RPC level status (nearly always "OK") and separately set the function call return using r->out.result. All the programmers writing servers (metze, jelmer and me) were often getting this wrong, by doing things like "return NT_STATUS_NO_MEMORY" which was really quite meaningless as there is no code like that at the dcerpc level. I have now modified pidl to generate the necessary boilerplate so that just returning the status you want from the function will work. So for a NTSTATUS function you return NT_STATUS_XXX and from a WERROR function you return WERR_XXX. If you really want to generate a DCERPC level fault rather than just a return value in your function then you should use the DCESRV_FAULT() macro which will correctly generate a fault for you. As a side effect, this also adds automatic type checking of all of our server side rpc functions, which was impossible with the old API. When I changed the API I found and fixed quite a few functions with the wrong type information, so this is definately useful. I have also changed the server side template generation to generate a DCERPC "operation range error" by default when you have not yet filled in a server side function. This allows us to correctly implement functions in any order in our rpc pipe servers and give the client the right information about the fault.
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
77269e7ad6
commit
a4df5c7cf8
@@ -368,27 +368,12 @@ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32 fault_code)
|
||||
dcerpc_set_frag_length(&rep->data, rep->data.length);
|
||||
|
||||
DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
|
||||
DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
|
||||
|
||||
return NT_STATUS_OK;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
return a dcerpc fault from a ntstatus code
|
||||
*/
|
||||
static NTSTATUS dcesrv_fault_nt(struct dcesrv_call_state *call, NTSTATUS status)
|
||||
{
|
||||
uint32 fault_code = DCERPC_FAULT_OTHER;
|
||||
|
||||
/* TODO: we need to expand this table to include more mappings */
|
||||
if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
|
||||
fault_code = DCERPC_FAULT_CONTEXT_MISMATCH;
|
||||
}
|
||||
|
||||
return dcesrv_fault(call, fault_code);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
return a dcerpc bind_nak
|
||||
*/
|
||||
@@ -592,10 +577,12 @@ static NTSTATUS dcesrv_request(struct dcesrv_call_state *call)
|
||||
return dcesrv_fault(call, DCERPC_FAULT_NDR);
|
||||
}
|
||||
|
||||
call->fault_code = 0;
|
||||
|
||||
/* call the dispatch function */
|
||||
status = call->conn->iface->dispatch(call, call->mem_ctx, r);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
return dcesrv_fault_nt(call, status);
|
||||
return dcesrv_fault(call, call->fault_code);
|
||||
}
|
||||
|
||||
/* form the reply NDR */
|
||||
|
||||
Reference in New Issue
Block a user