summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-02-27 10:59:14 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-01 16:11:55 +0100
commitc84b4b23c8b7f7c32ce0a17b5dfb526dbda66f6a (patch)
treedae79fc9330b988e86fd87c7efe82a9f2f0cd5ac
parent598cf9f5097aafac95c9e9b420b849ad6090c30e (diff)
downloadsamba-c84b4b23c8b7f7c32ce0a17b5dfb526dbda66f6a.tar.gz
samba-c84b4b23c8b7f7c32ce0a17b5dfb526dbda66f6a.tar.bz2
samba-c84b4b23c8b7f7c32ce0a17b5dfb526dbda66f6a.zip
s4:torture/rpc: make use of explicit dcerpc_*_recv functions
metze
-rw-r--r--source4/torture/rpc/echo.c6
-rw-r--r--source4/torture/rpc/lsa.c2
-rw-r--r--source4/torture/rpc/netlogon.c2
-rw-r--r--source4/torture/rpc/samr.c2
-rw-r--r--source4/torture/rpc/schannel.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 043b386efd..00dbc0f216 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -262,7 +262,7 @@ static bool test_sleep(struct torture_context *tctx,
rcv[i] = timeval_current();
diff[i] = timeval_until(&snd[i], &rcv[i]);
rounded_tdiff = (int)(0.5 + diff[i].tv_sec + (1.0e-6*diff[i].tv_usec));
- status = dcerpc_ndr_request_recv(req[i]);
+ status = dcerpc_echo_TestSleep_recv(req[i]);
torture_comment(tctx, "rounded_tdiff=%d\n", rounded_tdiff);
torture_assert_ntstatus_ok(tctx, status,
talloc_asprintf(tctx, "TestSleep(%d) failed", i));
@@ -395,7 +395,7 @@ static bool test_timeout(struct torture_context *tctx,
}
req->ignore_timeout = true;
- status = dcerpc_ndr_request_recv(req);
+ status = dcerpc_echo_TestSleep_recv(req);
torture_assert_ntstatus_equal(tctx, status, NT_STATUS_IO_TIMEOUT,
"request should have timed out");
@@ -413,7 +413,7 @@ static bool test_timeout(struct torture_context *tctx,
goto failed;
}
req->ignore_timeout = true;
- status = dcerpc_ndr_request_recv(req);
+ status = dcerpc_echo_TestSleep_recv(req);
torture_assert_ntstatus_equal(tctx, status, NT_STATUS_IO_TIMEOUT,
"request should have timed out");
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 22fb28f076..4c402f3ba4 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -752,7 +752,7 @@ static void lookupsids_cb(struct rpc_request *req)
int *replies = (int *)req->async.private_data;
NTSTATUS status;
- status = dcerpc_ndr_request_recv(req);
+ status = dcerpc_lsa_LookupSids_recv(req);
if (!NT_STATUS_IS_OK(status)) {
printf("lookupsids returned %s\n", nt_errstr(status));
*replies = -1;
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 0270a5aea9..091f48a9c0 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -2698,7 +2698,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
}
for (i=0;i<ASYNC_COUNT;i++) {
- status = dcerpc_ndr_request_recv(req[i]);
+ status = dcerpc_netr_LogonGetDomainInfo_recv(req[i]);
torture_assert_ntstatus_ok(tctx, status, "netr_LogonGetDomainInfo_async");
torture_assert_ntstatus_ok(tctx, r.out.result, "netr_LogonGetDomainInfo_async");
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 92a255e0fb..3620211bae 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -5897,7 +5897,7 @@ static bool test_EnumDomainUsers_async(struct dcerpc_pipe *p, struct torture_con
}
for (i=0;i<ASYNC_COUNT;i++) {
- status = dcerpc_ndr_request_recv(req[i]);
+ status = dcerpc_samr_EnumDomainUsers_recv(req[i]);
if (!NT_STATUS_IS_OK(status)) {
torture_warning(tctx, "EnumDomainUsers[%d] failed - %s\n",
i, nt_errstr(status));
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 2f9d60ad30..0e8fd5a02e 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -645,7 +645,7 @@ static void torture_schannel_bench_recv(struct rpc_request *req)
struct torture_schannel_bench *s = talloc_get_type(conn->s,
struct torture_schannel_bench);
- s->error = dcerpc_ndr_request_recv(req);
+ s->error = dcerpc_netr_LogonSamLogonEx_recv(req);
if (!NT_STATUS_IS_OK(s->error)) {
return;
}