From 2b570f96fcf537c1269237e1067ea7801b563b7e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 4 Nov 2007 16:16:18 +0100 Subject: [PATCH] r25824: - NT_STATUS_IS_ERR() is not the same as !NT_STATUS_IS_OK() - make the success case some clear by returning NT_STATUS_OK metze --- source/librpc/rpc/dcerpc.c | 2 +- source/librpc/rpc/dcerpc_util.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/librpc/rpc/dcerpc.c b/source/librpc/rpc/dcerpc.c index 1f0cc3699a3..5f7b2991a9d 100644 --- a/source/librpc/rpc/dcerpc.c +++ b/source/librpc/rpc/dcerpc.c @@ -803,7 +803,7 @@ NTSTATUS dcerpc_auth3(struct dcerpc_connection *c, return status; } - return status; + return NT_STATUS_OK; } diff --git a/source/librpc/rpc/dcerpc_util.c b/source/librpc/rpc/dcerpc_util.c index 408860c9edb..3e2fd9b09be 100644 --- a/source/librpc/rpc/dcerpc_util.c +++ b/source/librpc/rpc/dcerpc_util.c @@ -443,7 +443,7 @@ NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct ndr_synta ndr->flags |= LIBNDR_FLAG_NOALIGN; status = ndr_pull_GUID(ndr, NDR_SCALARS | NDR_BUFFERS, &syntax->uuid); - if (NT_STATUS_IS_ERR(status)) { + if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return status; } @@ -453,7 +453,7 @@ NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *epm_floor, struct ndr_synta talloc_free(mem_ctx); - return status; + return NT_STATUS_OK; } static DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax) @@ -1416,5 +1416,5 @@ NTSTATUS dcerpc_secondary_context(struct dcerpc_pipe *p, *pp2 = p2; - return status; + return NT_STATUS_OK; }