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.
(This used to be commit 8aae0f168e54c01d0866ad6e0da141dbd828574f)

1 files changed, 3 insertions, 5 deletions

diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index e926fc3778..6b94734f9b 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -51,13 +51,13 @@ static NTSTATUS libnet_RpcConnectSrv(struct libnet_context *ctx, TALLOC_CTX *mem
 
 	/* connect to remote dcerpc pipe */
 	status = dcerpc_pipe_connect(mem_ctx, &r->out.dcerpc_pipe,
-				     binding, r->in.dcerpc_iface_uuid, r->in.dcerpc_iface_version,
+				     binding, r->in.dcerpc_iface,
 				     ctx->cred, ctx->event_ctx);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		r->out.error_string = talloc_asprintf(mem_ctx,
 						      "dcerpc_pipe_connect to pipe %s failed with %s\n",
-						      r->in.dcerpc_iface_name, binding);
+						      r->in.dcerpc_iface->name, binding);
 		return status;
 	}
 
@@ -98,9 +98,7 @@ static NTSTATUS libnet_RpcConnectPdc(struct libnet_context *ctx, TALLOC_CTX *mem
 	/* ok, pdc has been found so do attempt to rpc connect */
 	r2.level		    = LIBNET_RPC_CONNECT_SERVER;
 	r2.in.domain_name	    = talloc_strdup(mem_ctx, f.out.address[0]);
-	r2.in.dcerpc_iface_name     = r->in.dcerpc_iface_name;
-	r2.in.dcerpc_iface_uuid	    = r->in.dcerpc_iface_uuid;
-	r2.in.dcerpc_iface_version  = r->in.dcerpc_iface_version;
+	r2.in.dcerpc_iface     = r->in.dcerpc_iface;
 	
 	status = libnet_RpcConnect(ctx, mem_ctx, &r2);