From d0e68032187d7167d535d710f01a1c84ac006f3c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 17 Apr 2009 11:46:57 +0200 Subject: s4:librpc/rpc: remove async argument from the sync dcerpc_request() function metze --- source4/librpc/rpc/dcerpc.c | 3 +-- source4/librpc/rpc/dcerpc.h | 1 - source4/librpc/rpc/pyrpc.c | 2 +- source4/torture/rpc/autoidl.c | 8 ++++---- source4/torture/rpc/countcalls.c | 2 +- source4/torture/rpc/scanner.c | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 15c34f5dca..6ebbc79fcf 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -1150,14 +1150,13 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req, NTSTATUS dcerpc_request(struct dcerpc_pipe *p, struct GUID *object, uint16_t opnum, - bool async, TALLOC_CTX *mem_ctx, DATA_BLOB *stub_data_in, DATA_BLOB *stub_data_out) { struct rpc_request *req; - req = dcerpc_request_send(p, object, opnum, async, stub_data_in); + req = dcerpc_request_send(p, object, opnum, false, stub_data_in); if (req == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index d6619ace07..5b82a0ac7b 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -376,7 +376,6 @@ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, NTSTATUS dcerpc_request(struct dcerpc_pipe *p, struct GUID *object, uint16_t opnum, - bool async, TALLOC_CTX *mem_ctx, DATA_BLOB *stub_data_in, DATA_BLOB *stub_data_out); diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c index 252883c851..82bb870f40 100644 --- a/source4/librpc/rpc/pyrpc.c +++ b/source4/librpc/rpc/pyrpc.c @@ -247,7 +247,7 @@ static PyObject *py_iface_request(PyObject *self, PyObject *args, PyObject *kwar } status = dcerpc_request(iface->pipe, object?&object_guid:NULL, - opnum, false, mem_ctx, &data_in, &data_out); + opnum, mem_ctx, &data_in, &data_out); if (NT_STATUS_IS_ERR(status)) { PyErr_SetDCERPCStatus(iface->pipe, status); diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c index 5ae0201855..6345712133 100644 --- a/source4/torture/rpc/autoidl.c +++ b/source4/torture/rpc/autoidl.c @@ -131,7 +131,7 @@ static void try_expand(struct torture_context *tctx, const struct ndr_interface_ memcpy(stub_in.data, base_in->data, insert_ofs); memcpy(stub_in.data+insert_ofs+n, base_in->data+insert_ofs, base_in->length-insert_ofs); - status = dcerpc_request(p, NULL, opnum, false, tctx, &stub_in, &stub_out); + status = dcerpc_request(p, NULL, opnum, tctx, &stub_in, &stub_out); if (!NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { print_depth(depth); @@ -172,7 +172,7 @@ static void test_ptr_scan(struct torture_context *tctx, const struct ndr_interfa /* work out which elements are pointers */ for (ofs=min_ofs;ofs<=max_ofs-4;ofs+=4) { SIVAL(stub_in.data, ofs, 1); - status = dcerpc_request(p, NULL, opnum, false, tctx, &stub_in, &stub_out); + status = dcerpc_request(p, NULL, opnum, tctx, &stub_in, &stub_out); if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) { print_depth(depth); @@ -214,7 +214,7 @@ static void test_scan_call(struct torture_context *tctx, const struct ndr_interf data_blob_clear(&stub_in); - status = dcerpc_request(p, NULL, opnum, false, tctx, &stub_in, &stub_out); + status = dcerpc_request(p, NULL, opnum, tctx, &stub_in, &stub_out); if (NT_STATUS_IS_OK(status)) { printf("opnum %d min_input %d - output %d\n", @@ -227,7 +227,7 @@ static void test_scan_call(struct torture_context *tctx, const struct ndr_interf fill_blob_handle(&stub_in, tctx, &handle); - status = dcerpc_request(p, NULL, opnum, false, tctx, &stub_in, &stub_out); + status = dcerpc_request(p, NULL, opnum, tctx, &stub_in, &stub_out); if (NT_STATUS_IS_OK(status)) { printf("opnum %d min_input %d - output %d (with handle)\n", diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c index 205ee1ec86..4914ae1e50 100644 --- a/source4/torture/rpc/countcalls.c +++ b/source4/torture/rpc/countcalls.c @@ -60,7 +60,7 @@ bool count_calls(struct torture_context *tctx, printf("\nScanning pipe '%s'\n", iface->name); for (i=0;i<500;i++) { - status = dcerpc_request(p, NULL, i, false, p, &stub_in, &stub_out); + status = dcerpc_request(p, NULL, i, p, &stub_in, &stub_out); if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT) && p->last_fault_code == DCERPC_FAULT_OP_RNG_ERROR) { i--; diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c index b761f406ec..8e5016be6c 100644 --- a/source4/torture/rpc/scanner.c +++ b/source4/torture/rpc/scanner.c @@ -61,7 +61,7 @@ static bool test_num_calls(struct torture_context *tctx, memset(stub_in.data, 0xFF, stub_in.length); for (i=0;i<200;i++) { - status = dcerpc_request(p, NULL, i, false, mem_ctx, &stub_in, &stub_out); + status = dcerpc_request(p, NULL, i, mem_ctx, &stub_in, &stub_out); if (!NT_STATUS_IS_OK(status) && p->last_fault_code == DCERPC_FAULT_OP_RNG_ERROR) { break; -- cgit