The branch, master has been updated
via f89e9bd rpc: Simplify dcerpc_binding_handle_raw_call()
from 893b5f8 wafsamba: Also build libraries with RELRO protection
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f89e9bd47b98f9dbe94ffff13b7d9d4f08b7f11a
Author: Volker Lendecke <[email protected]>
Date: Sat Feb 14 16:30:33 2015 +0100
rpc: Simplify dcerpc_binding_handle_raw_call()
Align it with dcerpc_binding_handle_call()
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jose A. Rivera <[email protected]>
Autobuild-User(master): José A. Rivera <[email protected]>
Autobuild-Date(master): Fri Jun 19 20:17:24 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
librpc/rpc/binding_handle.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/rpc/binding_handle.c b/librpc/rpc/binding_handle.c
index 5a94144..f5e043d 100644
--- a/librpc/rpc/binding_handle.c
+++ b/librpc/rpc/binding_handle.c
@@ -224,7 +224,7 @@ NTSTATUS dcerpc_binding_handle_raw_call(struct
dcerpc_binding_handle *h,
TALLOC_CTX *frame = talloc_stackframe();
struct tevent_context *ev;
struct tevent_req *subreq;
- NTSTATUS status;
+ NTSTATUS status = NT_STATUS_NO_MEMORY;
/*
* TODO: allow only one sync call
@@ -236,8 +236,7 @@ NTSTATUS dcerpc_binding_handle_raw_call(struct
dcerpc_binding_handle *h,
ev = samba_tevent_context_init(frame);
}
if (ev == NULL) {
- talloc_free(frame);
- return NT_STATUS_NO_MEMORY;
+ goto fail;
}
subreq = dcerpc_binding_handle_raw_call_send(frame, ev,
@@ -246,13 +245,11 @@ NTSTATUS dcerpc_binding_handle_raw_call(struct
dcerpc_binding_handle *h,
in_data,
in_length);
if (subreq == NULL) {
- talloc_free(frame);
- return NT_STATUS_NO_MEMORY;
+ goto fail;
}
if (!tevent_req_poll_ntstatus(subreq, ev, &status)) {
- talloc_free(frame);
- return status;
+ goto fail;
}
status = dcerpc_binding_handle_raw_call_recv(subreq,
@@ -260,13 +257,9 @@ NTSTATUS dcerpc_binding_handle_raw_call(struct
dcerpc_binding_handle *h,
out_data,
out_length,
out_flags);
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(frame);
- return status;
- }
-
+fail:
TALLOC_FREE(frame);
- return NT_STATUS_OK;
+ return status;
}
struct dcerpc_binding_handle_disconnect_state {
--
Samba Shared Repository
