summaryrefslogtreecommitdiff
path: root/source4/rpc_server/echo
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-05-04 06:07:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:44 -0500
commit21e6b1531b4e656af5962fdbeb671350f653fc26 (patch)
treeda19a7700ea239f83782eb8f3ea5836945b145c3 /source4/rpc_server/echo
parent73744d1ed6ba3b2d003eb029b9e9a0296ce895e6 (diff)
downloadsamba-21e6b1531b4e656af5962fdbeb671350f653fc26.tar.gz
samba-21e6b1531b4e656af5962fdbeb671350f653fc26.tar.bz2
samba-21e6b1531b4e656af5962fdbeb671350f653fc26.zip
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 used to be commit a4df5c7cf88891a78d82c8d6d7f058d8485e73f0)
Diffstat (limited to 'source4/rpc_server/echo')
-rw-r--r--source4/rpc_server/echo/rpc_echo.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/rpc_server/echo/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c
index ec5d667b46..25ac28a664 100644
--- a/source4/rpc_server/echo/rpc_echo.c
+++ b/source4/rpc_server/echo/rpc_echo.c
@@ -70,12 +70,9 @@ static NTSTATUS echo_TestCall2(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
{
r->out.info = talloc(mem_ctx, sizeof(*r->out.info));
if (!r->out.info) {
- r->out.result = NT_STATUS_NO_MEMORY;
- return NT_STATUS_OK;
+ return NT_STATUS_NO_MEMORY;
}
- r->out.result = NT_STATUS_OK;
-
switch (r->in.level) {
case 1:
r->out.info->info1.v = 10;
@@ -105,8 +102,7 @@ static NTSTATUS echo_TestCall2(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
r->out.info->info7.info4.v.high = 0;
break;
default:
- r->out.result = NT_STATUS_INVALID_LEVEL;
- break;
+ return NT_STATUS_INVALID_LEVEL;
}
return NT_STATUS_OK;