summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-03-15 10:59:05 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-16 15:35:29 +0100
commit004a8413178f14825d7c7ab0a9bdfc37592bfb64 (patch)
treefe8e1b718cb6d1a6ec54bba4fc2a59c83afc72fe
parent8c9b9d3336b9a51203fcf336879a5de93f204cea (diff)
downloadsamba-004a8413178f14825d7c7ab0a9bdfc37592bfb64.tar.gz
samba-004a8413178f14825d7c7ab0a9bdfc37592bfb64.tar.bz2
samba-004a8413178f14825d7c7ab0a9bdfc37592bfb64.zip
s4:torture/rpc/epmapper.c: make use of dcerpc_binding_handle stubs
metze
-rw-r--r--source4/torture/rpc/epmapper.c30
1 files changed, 18 insertions, 12 deletions
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index 37a55d1523..024ef3e9f0 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -39,7 +39,8 @@ static void display_tower(TALLOC_CTX *mem_ctx, struct epm_tower *twr)
}
-static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_Map(struct dcerpc_binding_handle *b,
+ TALLOC_CTX *mem_ctx,
struct epm_twr_t *twr)
{
NTSTATUS status;
@@ -77,7 +78,7 @@ static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
twr->tower.floors[4].lhs.lhs_data = data_blob(NULL, 0);
twr->tower.floors[4].rhs.ip.ipaddr = "0.0.0.0";
- status = dcerpc_epm_Map(p, mem_ctx, &r);
+ status = dcerpc_epm_Map_r(b, mem_ctx, &r);
if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
for (i=0;i<*r.out.num_towers;i++) {
if (r.out.towers[i].twr) {
@@ -90,7 +91,7 @@ static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
twr->tower.floors[3].lhs.lhs_data = data_blob(NULL, 0);
twr->tower.floors[3].rhs.http.port = 0;
- status = dcerpc_epm_Map(p, mem_ctx, &r);
+ status = dcerpc_epm_Map_r(b, mem_ctx, &r);
if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
for (i=0;i<*r.out.num_towers;i++) {
if (r.out.towers[i].twr) {
@@ -103,7 +104,7 @@ static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
twr->tower.floors[3].lhs.lhs_data = data_blob(NULL, 0);
twr->tower.floors[3].rhs.http.port = 0;
- status = dcerpc_epm_Map(p, mem_ctx, &r);
+ status = dcerpc_epm_Map_r(b, mem_ctx, &r);
if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
for (i=0;i<*r.out.num_towers;i++) {
if (r.out.towers[i].twr) {
@@ -120,7 +121,7 @@ static bool test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
twr->tower.floors[4].lhs.lhs_data = data_blob(NULL, 0);
twr->tower.floors[4].rhs.netbios.name = "";
- status = dcerpc_epm_Map(p, mem_ctx, &r);
+ status = dcerpc_epm_Map_r(b, mem_ctx, &r);
if (NT_STATUS_IS_OK(status) && r.out.result == 0) {
for (i=0;i<*r.out.num_towers;i++) {
if (r.out.towers[i].twr) {
@@ -143,6 +144,7 @@ static bool test_Lookup(struct torture_context *tctx,
struct rpc_if_id_t iface;
struct policy_handle handle;
uint32_t num_ents;
+ struct dcerpc_binding_handle *b = p->binding_handle;
ZERO_STRUCT(handle);
@@ -161,7 +163,7 @@ static bool test_Lookup(struct torture_context *tctx,
ZERO_STRUCT(uuid);
ZERO_STRUCT(iface);
- status = dcerpc_epm_Lookup(p, tctx, &r);
+ status = dcerpc_epm_Lookup_r(b, tctx, &r);
if (!NT_STATUS_IS_OK(status) || r.out.result != 0) {
break;
}
@@ -173,7 +175,7 @@ static bool test_Lookup(struct torture_context *tctx,
printf("\nFound '%s'\n", r.out.entries[i].annotation);
display_tower(tctx, &r.out.entries[i].tower->tower);
if (r.out.entries[i].tower->tower.num_floors == 5) {
- test_Map(p, tctx, r.out.entries[i].tower);
+ test_Map(b, tctx, r.out.entries[i].tower);
}
}
} while (NT_STATUS_IS_OK(status) &&
@@ -186,7 +188,9 @@ static bool test_Lookup(struct torture_context *tctx,
return true;
}
-static bool test_Delete(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct epm_entry_t *entries)
+static bool test_Delete(struct dcerpc_binding_handle *b,
+ TALLOC_CTX *mem_ctx,
+ struct epm_entry_t *entries)
{
NTSTATUS status;
struct epm_Delete r;
@@ -194,7 +198,7 @@ static bool test_Delete(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct epm_e
r.in.num_ents = 1;
r.in.entries = entries;
- status = dcerpc_epm_Delete(p, mem_ctx, &r);
+ status = dcerpc_epm_Delete_r(b, mem_ctx, &r);
if (NT_STATUS_IS_ERR(status)) {
printf("Delete failed - %s\n", nt_errstr(status));
return false;
@@ -214,6 +218,7 @@ static bool test_Insert(struct torture_context *tctx,
NTSTATUS status;
struct epm_Insert r;
struct dcerpc_binding *bd;
+ struct dcerpc_binding_handle *b = p->binding_handle;
r.in.num_ents = 1;
@@ -232,12 +237,12 @@ static bool test_Insert(struct torture_context *tctx,
r.in.replace = 0;
- status = dcerpc_epm_Insert(p, tctx, &r);
+ status = dcerpc_epm_Insert_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "Insert failed");
torture_assert(tctx, r.out.result == 0, "Insert failed");
- if (!test_Delete(p, tctx, r.in.entries)) {
+ if (!test_Delete(b, tctx, r.in.entries)) {
return false;
}
@@ -248,11 +253,12 @@ static bool test_InqObject(struct torture_context *tctx, struct dcerpc_pipe *p)
{
NTSTATUS status;
struct epm_InqObject r;
+ struct dcerpc_binding_handle *b = p->binding_handle;
r.in.epm_object = talloc(tctx, struct GUID);
*r.in.epm_object = ndr_table_epmapper.syntax_id.uuid;
- status = dcerpc_epm_InqObject(p, tctx, &r);
+ status = dcerpc_epm_InqObject_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "InqObject failed");
return true;