r14735: Use dcerpc_syntax_id rather then seperate GUID + if_version everywhere

(This used to be commit a316b33057f3ec8532677980e093cd327d33f257)

8 files changed, 13 insertions, 15 deletions

diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c
index aaae0f7ce6..bb67ca7bba 100644
--- a/source4/torture/com/simple.c
+++ b/source4/torture/com/simple.c
@@ -46,8 +46,8 @@ static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host)
 	com_init_ctx(&ctx, NULL);
 	dcom_client_init(ctx, cmdline_credentials);
 
-	IID[0] = dcerpc_table_IStream.uuid;
-	IID[1] = dcerpc_table_IUnknown.uuid;
+	IID[0] = dcerpc_table_IStream.syntax_id.uuid;
+	IID[1] = dcerpc_table_IUnknown.syntax_id.uuid;
 	GUID_from_string(CLSID_SIMPLE, &clsid);
 
 	if (host) {
diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index c0428b561a..8c98d9f9aa 100644
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -60,7 +60,7 @@ BOOL torture_rpc_alter_context(struct torture_context *torture)
 	}
 
 	tmptbl = dcerpc_table_dssetup;
-	tmptbl.if_version += 100;
+	tmptbl.syntax_id.if_version += 100;
 	printf("Opening bad secondary connection\n");
 	status = dcerpc_secondary_context(p, &p2, &tmptbl);
 	if (NT_STATUS_IS_OK(status)) {
diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c
index 74335a060d..56f3e9a040 100644
--- a/source4/torture/rpc/bind.c
+++ b/source4/torture/rpc/bind.c
@@ -67,7 +67,7 @@ BOOL torture_multi_bind(struct torture_context *torture)
 
 	if (NT_STATUS_IS_OK(status)) {
 		printf("(incorrectly) allowed re-bind to uuid %s - %s\n", 
-			GUID_string(mem_ctx, &dcerpc_table_lsarpc.uuid), nt_errstr(status));
+			GUID_string(mem_ctx, &dcerpc_table_lsarpc.syntax_id.uuid), nt_errstr(status));
 		ret = False;
 	} else {
 		printf("\n");
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index 9e477625db..e0abdcff0b 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -48,8 +48,7 @@ static BOOL test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct GUID uuid;
 	struct policy_handle handle;
 	int i;
-	struct GUID if_uuid;
-	uint16_t if_version;
+	struct dcerpc_syntax_id syntax;
 
 	ZERO_STRUCT(uuid);
 	ZERO_STRUCT(handle);
@@ -60,10 +59,10 @@ static BOOL test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.out.entry_handle = &handle;
 	r.in.max_towers = 100;
 
-	dcerpc_floor_get_lhs_data(&twr->tower.floors[0], &if_uuid, &if_version);
+	dcerpc_floor_get_lhs_data(&twr->tower.floors[0], &syntax);
 
 	printf("epm_Map results for '%s':\n", 
-	       idl_pipe_name(&if_uuid, if_version));
+	       idl_pipe_name(&syntax.uuid, syntax.if_version));
 
 	twr->tower.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN;
 	twr->tower.floors[2].lhs.lhs_data = data_blob(NULL, 0);
@@ -261,7 +260,7 @@ static BOOL test_InqObject(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	struct epm_InqObject r;
 
 	r.in.epm_object = talloc(mem_ctx, struct GUID);
-	*r.in.epm_object = dcerpc_table_epmapper.uuid;
+	*r.in.epm_object = dcerpc_table_epmapper.syntax_id.uuid;
 
 	status = dcerpc_epm_InqObject(p, mem_ctx, &r);
 	if (NT_STATUS_IS_ERR(status)) {
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index db503b3775..51dbdd5b16 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -214,7 +214,7 @@ BOOL torture_rpc_mgmt(struct torture_context *torture)
 			status = dcerpc_epm_map_binding(loop_ctx, b, l->table, NULL);
 			if (!NT_STATUS_IS_OK(status)) {
 				printf("Failed to map port for uuid %s\n", 
-					   GUID_string(loop_ctx, &l->table->uuid));
+					   GUID_string(loop_ctx, &l->table->syntax_id.uuid));
 				talloc_free(loop_ctx);
 				continue;
 			}
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index c56d4b6e86..11ec5f2749 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -45,7 +45,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
 	r.in.num_protseqs = 3;
 	r.in.protseq = protseq;
 	r.in.Interfaces = 1;
-	iids[0] = dcerpc_table_IUnknown.uuid;
+	iids[0] = dcerpc_table_IUnknown.syntax_id.uuid;
 	r.in.pIIDs = iids;
 
 	status = dcerpc_RemoteActivation(p, mem_ctx, &r);
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 97dd9e93fb..35ec8c0f76 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -48,7 +48,7 @@ _PUBLIC_ NTSTATUS torture_rpc_connection(TALLOC_CTX *parent_ctx,
 		printf("Failed to connect to remote server: %s %s\n", binding, nt_errstr(status));
 	}
 
-        return status;
+    return status;
 }
 
 /* open a rpc connection to a specific transport */
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index 765151f1b8..89c0cb485e 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -43,8 +43,7 @@ static BOOL test_num_calls(const struct dcerpc_interface_table *iface,
 	/* FIXME: This should be fixed when torture_rpc_connection 
 	 * takes a dcerpc_syntax_id */
 	tbl.name = iface->name;
-	tbl.uuid = id->uuid;
-	tbl.if_version = id->if_version;
+	tbl.syntax_id = *id;
 
 	status = torture_rpc_connection(mem_ctx, &p, iface);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -177,7 +176,7 @@ BOOL torture_rpc_scanner(struct torture_context *torture)
 			status = dcerpc_epm_map_binding(mem_ctx, b, l->table, NULL);
 			if (!NT_STATUS_IS_OK(status)) {
 				printf("Failed to map port for uuid %s\n", 
-					   GUID_string(loop_ctx, &l->table->uuid));
+					   GUID_string(loop_ctx, &l->table->syntax_id.uuid));
 				talloc_free(loop_ctx);
 				continue;
 			}