1 files changed, 1 insertions, 184 deletions

diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 443b8b458a..3e49e6972b 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -5,7 +5,7 @@
 
    Copyright (C) Andrew Tridgell 2003
    Copyright (C) Jelmer Vernooij 2004
-   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005-2007
    Copyright (C) Rafal Szczesniak  2005
    
    This program is free software; you can redistribute it and/or modify
@@ -915,186 +915,3 @@ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx,
 	return dcerpc_pipe_connect_recv(c, parent_ctx, pp);
 }
 
-
-struct sec_conn_state {
-	struct dcerpc_pipe *pipe;
-	struct dcerpc_pipe *pipe2;
-	struct dcerpc_binding *binding;
-	struct smbcli_tree *tree;
-};
-
-
-static void continue_open_smb(struct composite_context *ctx);
-static void continue_open_tcp(struct composite_context *ctx);
-static void continue_open_pipe(struct composite_context *ctx);
-static void continue_pipe_open(struct composite_context *c);
-
-
-/*
-  Send request to create a secondary dcerpc connection from a primary
-  connection
-*/
-struct composite_context* dcerpc_secondary_connection_send(struct dcerpc_pipe *p,
-							   struct dcerpc_binding *b)
-{
-	struct composite_context *c;
-	struct sec_conn_state *s;
-	struct composite_context *pipe_smb_req;
-	struct composite_context *pipe_tcp_req;
-	struct composite_context *pipe_ncalrpc_req;
-	
-	/* composite context allocation and setup */
-	c = composite_create(p, p->conn->event_ctx);
-	if (c == NULL) return NULL;
-
-	s = talloc_zero(c, struct sec_conn_state);
-	if (composite_nomem(s, c)) return c;
-	c->private_data = s;
-
-	s->pipe     = p;
-	s->binding  = b;
-
-	/* initialise second dcerpc pipe based on primary pipe's event context */
-	s->pipe2 = dcerpc_pipe_init(c, s->pipe->conn->event_ctx);
-	if (composite_nomem(s->pipe2, c)) return c;
-
-	/* open second dcerpc pipe using the same transport as for primary pipe */
-	switch (s->pipe->conn->transport.transport) {
-	case NCACN_NP:
-		/* get smb tree of primary dcerpc pipe opened on smb */
-		s->tree = dcerpc_smb_tree(s->pipe->conn);
-		if (!s->tree) {
-			composite_error(c, NT_STATUS_INVALID_PARAMETER);
-			return c;
-		}
-
-		pipe_smb_req = dcerpc_pipe_open_smb_send(s->pipe2, s->tree,
-							 s->binding->endpoint);
-		composite_continue(c, pipe_smb_req, continue_open_smb, c);
-		return c;
-
-	case NCACN_IP_TCP:
-		pipe_tcp_req = dcerpc_pipe_open_tcp_send(s->pipe2->conn,
-							 s->binding->host,
-							 s->binding->target_hostname,
-							 atoi(s->binding->endpoint));
-		composite_continue(c, pipe_tcp_req, continue_open_tcp, c);
-		return c;
-
-	case NCALRPC:
-		pipe_ncalrpc_req = dcerpc_pipe_open_pipe_send(s->pipe2->conn,
-							      s->binding->endpoint);
-		composite_continue(c, pipe_ncalrpc_req, continue_open_pipe, c);
-		return c;
-
-	default:
-		/* looks like a transport we don't support */
-		composite_error(c, NT_STATUS_NOT_SUPPORTED);
-	}
-
-	return c;
-}
-
-
-/*
-  Stage 2 of secondary_connection: Receive result of pipe open request on smb
-*/
-static void continue_open_smb(struct composite_context *ctx)
-{
-	struct composite_context *c = talloc_get_type(ctx->async.private_data,
-						      struct composite_context);
-	
-	c->status = dcerpc_pipe_open_smb_recv(ctx);
-	if (!composite_is_ok(c)) return;
-
-	continue_pipe_open(c);
-}
-
-
-/*
-  Stage 2 of secondary_connection: Receive result of pipe open request on tcp/ip
-*/
-static void continue_open_tcp(struct composite_context *ctx)
-{
-	struct composite_context *c = talloc_get_type(ctx->async.private_data,
-						      struct composite_context);
-	
-	c->status = dcerpc_pipe_open_tcp_recv(ctx);
-	if (!composite_is_ok(c)) return;
-
-	continue_pipe_open(c);
-}
-
-
-/*
-  Stage 2 of secondary_connection: Receive result of pipe open request on ncalrpc
-*/
-static void continue_open_pipe(struct composite_context *ctx)
-{
-	struct composite_context *c = talloc_get_type(ctx->async.private_data,
-						      struct composite_context);
-
-	c->status = dcerpc_pipe_open_pipe_recv(ctx);
-	if (!composite_is_ok(c)) return;
-
-	continue_pipe_open(c);
-}
-
-
-/*
-  Stage 3 of secondary_connection: Get binding data and flags from primary pipe
-  and say if we're done ok.
-*/
-static void continue_pipe_open(struct composite_context *c)
-{
-	struct sec_conn_state *s;
-
-	s = talloc_get_type(c->private_data, struct sec_conn_state);
-
-	s->pipe2->conn->flags = s->pipe->conn->flags;
-	s->pipe2->binding     = s->binding;
-	if (!talloc_reference(s->pipe2, s->binding)) {
-		composite_error(c, NT_STATUS_NO_MEMORY);
-		return;
-	}
-
-	composite_done(c);
-}
-
-
-/*
-  Receive result of secondary rpc connection request and return
-  second dcerpc pipe.
-*/
-NTSTATUS dcerpc_secondary_connection_recv(struct composite_context *c,
-					  struct dcerpc_pipe **p2)
-{
-	NTSTATUS status = composite_wait(c);
-	struct sec_conn_state *s;
-
-	s = talloc_get_type(c->private_data, struct sec_conn_state);
-
-	if (NT_STATUS_IS_OK(status)) {
-		*p2 = talloc_steal(s->pipe, s->pipe2);
-	}
-
-	talloc_free(c);
-	return status;
-}
-
-/*
-  Create a secondary dcerpc connection from a primary connection
-  - sync version
-
-  If the primary is a SMB connection then the secondary connection
-  will be on the same SMB connection, but using a new fnum
-*/
-NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p,
-				     struct dcerpc_pipe **p2,
-				     struct dcerpc_binding *b)
-{
-	struct composite_context *c;
-	
-	c = dcerpc_secondary_connection_send(p, b);
-	return dcerpc_secondary_connection_recv(c, p2);
-}