summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/epmapper.c2
-rw-r--r--source4/torture/rpc/mgmt.c5
-rw-r--r--source4/torture/rpc/scanner.c9
3 files changed, 7 insertions, 9 deletions
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index afc83a512d..2b704659d6 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -104,7 +104,7 @@ static BOOL test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
{
NTSTATUS status;
struct epm_Map r;
- GUID uuid;
+ struct GUID uuid;
const char *uuid_str;
struct policy_handle handle;
int i;
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 24bf080ffb..3a50732c7e 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -55,10 +55,9 @@ static BOOL test_inq_if_ids(struct dcerpc_pipe *p,
uuid = GUID_string(mem_ctx, &id->uuid);
- printf("\tuuid %s version 0x%04x:0x%04x '%s'\n",
+ printf("\tuuid %s version 0x%08x '%s'\n",
uuid,
- id->major_version, id->minor_version,
- idl_pipe_name(uuid, id->major_version));
+ id->if_version, idl_pipe_name(uuid, id->if_version));
}
return True;
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index 3469294552..99c047bf2e 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -39,7 +39,7 @@ static BOOL test_num_calls(const struct dcerpc_interface_table *iface,
uuid = GUID_string(mem_ctx, &id->uuid);
status = torture_rpc_connection(&p, iface->name,
- uuid, id->major_version);
+ uuid, id->if_version);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed to connect to '%s' on '%s' - %s\n",
uuid, iface->name, nt_errstr(status));
@@ -69,7 +69,7 @@ static BOOL test_num_calls(const struct dcerpc_interface_table *iface,
}
printf("\t%d calls available\n", i);
- idl_calls = idl_num_calls(uuid, id->major_version);
+ idl_calls = idl_num_calls(uuid, id->if_version);
if (idl_calls == -1) {
printf("\tinterface not known in local IDL\n");
} else if (i != idl_calls) {
@@ -117,10 +117,9 @@ static BOOL test_inq_if_ids(struct dcerpc_pipe *p,
uuid = GUID_string(mem_ctx, &id->uuid),
- printf("\n\tuuid %s version 0x%04x:0x%04x '%s'\n",
+ printf("\n\tuuid %s version 0x%08x '%s'\n",
uuid,
- id->major_version, id->minor_version,
- idl_pipe_name(uuid, id->major_version));
+ id->if_version, idl_pipe_name(uuid, id->if_version));
test_num_calls(iface, mem_ctx, id);
}