r12510: Change the DCE/RPC interfaces to take a pointer to a

dcerpc_interface_table struct rather then a tuple of interface 
name, UUID and version. 

This removes the requirement for having a global list of DCE/RPC interfaces, 
except for these parts of the code that use that list explicitly 
(ndrdump and the scanner torture test).

This should also allow us to remove the hack that put the authservice parameter 
in the dcerpc_binding struct as it can now be read directly from 
dcerpc_interface_table.

I will now modify some of these functions to take a dcerpc_syntax_id 
structure rather then a full dcerpc_interface_table.

5 files changed, 10 insertions, 26 deletions

diff --git a/source/torture/libnet/domain.c b/source/torture/libnet/domain.c
index 98c44cd942f..7f8600d2dd2 100644
--- a/source/torture/libnet/domain.c
+++ b/source/torture/libnet/domain.c
@@ -83,9 +83,7 @@ BOOL torture_domainopen(void)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					DCERPC_SAMR_NAME,
-					DCERPC_SAMR_UUID,
-					DCERPC_SAMR_VERSION);
+					&dcerpc_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
diff --git a/source/torture/libnet/libnet_rpc.c b/source/torture/libnet/libnet_rpc.c
index 4cd04ecb429..071fe990043 100644
--- a/source/torture/libnet/libnet_rpc.c
+++ b/source/torture/libnet/libnet_rpc.c
@@ -31,15 +31,13 @@ BOOL test_lsa_connect(struct libnet_context *ctx)
 	struct libnet_RpcConnect connect;
 	connect.level                     = LIBNET_RPC_CONNECT_PDC;
 	connect.in.domain_name            = lp_workgroup();
-	connect.in.dcerpc_iface_name      = DCERPC_LSARPC_NAME;
-	connect.in.dcerpc_iface_uuid      = DCERPC_LSARPC_UUID;
-	connect.in.dcerpc_iface_version   = DCERPC_LSARPC_VERSION;
+	connect.in.dcerpc_iface			  = &dcerpc_table_lsarpc;
 
 	status = libnet_RpcConnect(ctx, ctx, &connect);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Couldn't connect to rpc service %s on %s: %s\n",
-		       connect.in.dcerpc_iface_name, connect.in.domain_name,
+		       connect.in.dcerpc_iface->name, connect.in.domain_name,
 		       nt_errstr(status));
 
 		return False;
@@ -55,15 +53,13 @@ BOOL test_samr_connect(struct libnet_context *ctx)
 	struct libnet_RpcConnect connect;
 	connect.level                     = LIBNET_RPC_CONNECT_PDC;
 	connect.in.domain_name            = lp_workgroup();
-	connect.in.dcerpc_iface_name      = DCERPC_SAMR_NAME;
-	connect.in.dcerpc_iface_uuid      = DCERPC_SAMR_UUID;
-	connect.in.dcerpc_iface_version   = DCERPC_SAMR_VERSION;
+	connect.in.dcerpc_iface      	  = &dcerpc_table_samr;
 
 	status = libnet_RpcConnect(ctx, ctx, &connect);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Couldn't connect to rpc service %s on %s: %s\n",
-		       connect.in.dcerpc_iface_name, connect.in.domain_name,
+		       connect.in.dcerpc_iface->name, connect.in.domain_name,
 		       nt_errstr(status));
 
 		return False;
diff --git a/source/torture/libnet/libnet_share.c b/source/torture/libnet/libnet_share.c
index 3d770b4ca10..1f0f5eacd37 100644
--- a/source/torture/libnet/libnet_share.c
+++ b/source/torture/libnet/libnet_share.c
@@ -218,9 +218,7 @@ BOOL torture_delshare(void)
 
 	status = torture_rpc_connection(mem_ctx,
 					&p,
-					DCERPC_SRVSVC_NAME,
-					DCERPC_SRVSVC_UUID,
-					DCERPC_SRVSVC_VERSION);
+					&dcerpc_table_srvsvc);
 
 	if (!test_addshare(p, mem_ctx, host, TEST_SHARENAME)) {
 		ret = False;
diff --git a/source/torture/libnet/userinfo.c b/source/torture/libnet/userinfo.c
index 63724bc8b1e..b987bd5c218 100644
--- a/source/torture/libnet/userinfo.c
+++ b/source/torture/libnet/userinfo.c
@@ -279,9 +279,7 @@ BOOL torture_userinfo(void)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					DCERPC_SAMR_NAME,
-					DCERPC_SAMR_UUID,
-					DCERPC_SAMR_VERSION);
+					&dcerpc_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
diff --git a/source/torture/libnet/userman.c b/source/torture/libnet/userman.c
index fc2a32c913f..6ec5d9a7b7b 100644
--- a/source/torture/libnet/userman.c
+++ b/source/torture/libnet/userman.c
@@ -313,9 +313,7 @@ BOOL torture_useradd(void)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					DCERPC_SAMR_NAME,
-					DCERPC_SAMR_UUID,
-					DCERPC_SAMR_VERSION);
+					&dcerpc_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
@@ -374,9 +372,7 @@ BOOL torture_userdel(void)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					DCERPC_SAMR_NAME,
-					DCERPC_SAMR_UUID,
-					DCERPC_SAMR_VERSION);
+					&dcerpc_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
@@ -437,9 +433,7 @@ BOOL torture_usermod(void)
 
 	status = torture_rpc_connection(mem_ctx, 
 					&p,
-					DCERPC_SAMR_NAME,
-					DCERPC_SAMR_UUID,
-					DCERPC_SAMR_VERSION);
+					&dcerpc_table_samr);
 	
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;