summaryrefslogtreecommitdiff
path: root/source3/rpc_client
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-09 14:39:45 +0100
committerStefan Metzmacher <metze@samba.org>2007-11-09 21:23:16 +0100
commitf9578af966c1c1b5b5df4acac9977472d2896bea (patch)
tree6c46e463bf302012d29680f4067007d974baa0e0 /source3/rpc_client
parent5290ea864e6871651c2cd4eb565641b79c124a48 (diff)
downloadsamba-f9578af966c1c1b5b5df4acac9977472d2896bea.tar.gz
samba-f9578af966c1c1b5b5df4acac9977472d2896bea.tar.bz2
samba-f9578af966c1c1b5b5df4acac9977472d2896bea.zip
ndr: change NTSTAUS into enum ndr_err_code (samba3 callers)
lib/messages_local.c rpc_client/ndr.c smbd/notify_internal.c utils/net_rpc_registry.c metze (This used to be commit c2645d2164c05976a98bafed980b6029baf89977)
Diffstat (limited to 'source3/rpc_client')
-rw-r--r--source3/rpc_client/ndr.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/rpc_client/ndr.c b/source3/rpc_client/ndr.c
index c7044aa7d9..a64ead809a 100644
--- a/source3/rpc_client/ndr.c
+++ b/source3/rpc_client/ndr.c
@@ -33,6 +33,7 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
DATA_BLOB blob;
struct ndr_push *push;
NTSTATUS status;
+ enum ndr_err_code ndr_err;
SMB_ASSERT(cli->pipe_idx == p_idx);
SMB_ASSERT(table->num_calls > opnum);
@@ -44,9 +45,9 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
return NT_STATUS_NO_MEMORY;
}
- status = call->ndr_push(push, NDR_IN, r);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
+ ndr_err = call->ndr_push(push, NDR_IN, r);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ return ndr_map_error2ntstatus(ndr_err);
}
blob = ndr_push_blob(push);
@@ -85,11 +86,11 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
/* have the ndr parser alloc memory for us */
pull->flags |= LIBNDR_FLAG_REF_ALLOC;
- status = call->ndr_pull(pull, NDR_OUT, r);
+ ndr_err = call->ndr_pull(pull, NDR_OUT, r);
talloc_free(pull);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ return ndr_map_error2ntstatus(ndr_err);
}
return NT_STATUS_OK;