2 files changed, 16 insertions, 52 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 53d0e1b65b..e763c81f13 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -52,7 +52,7 @@ static int dcerpc_connection_destructor(struct dcerpc_connection *c)
 /* initialise a dcerpc connection. 
    the event context is optional
 */
-struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, 
+static struct dcerpc_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx, 
 						 struct event_context *ev)
 {
 	struct dcerpc_connection *c;
@@ -734,22 +734,6 @@ NTSTATUS dcerpc_bind_recv(struct composite_context *ctx)
 }
 
 /* 
-   perform a bind using the given syntax 
-
-   the auth_info structure is updated with the reply authentication info
-   on success
-*/
-NTSTATUS dcerpc_bind(struct dcerpc_pipe *p, 
-		     TALLOC_CTX *mem_ctx,
-		     const struct dcerpc_syntax_id *syntax,
-		     const struct dcerpc_syntax_id *transfer_syntax)
-{
-	struct composite_context *creq;
-	creq = dcerpc_bind_send(p, mem_ctx, syntax, transfer_syntax);
-	return dcerpc_bind_recv(creq);
-}
-
-/* 
    perform a continued bind (and auth3)
 */
 NTSTATUS dcerpc_auth3(struct dcerpc_connection *c, 
@@ -785,41 +769,6 @@ NTSTATUS dcerpc_auth3(struct dcerpc_connection *c,
 
 
 /*
-  return the rpc syntax and transfer syntax given the pipe uuid and version
-*/
-NTSTATUS dcerpc_init_syntaxes(const struct dcerpc_interface_table *table,
-			      struct dcerpc_syntax_id *syntax,
-			      struct dcerpc_syntax_id *transfer_syntax)
-{
-	syntax->uuid = table->syntax_id.uuid;
-	syntax->if_version = table->syntax_id.if_version;
-
-	*transfer_syntax = ndr_transfer_syntax;
-
-	return NT_STATUS_OK;
-}
-
-/* perform a dcerpc bind, using the uuid as the key */
-NTSTATUS dcerpc_bind_byuuid(struct dcerpc_pipe *p, 
-			    TALLOC_CTX *mem_ctx,
-			    const struct dcerpc_interface_table *table)
-{
-	struct dcerpc_syntax_id syntax;
-	struct dcerpc_syntax_id transfer_syntax;
-	NTSTATUS status;
-
-	status = dcerpc_init_syntaxes(table,
-				      &syntax, &transfer_syntax);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(2,("Invalid uuid string in dcerpc_bind_byuuid\n"));
-		return status;
-	}
-
-	return dcerpc_bind(p, mem_ctx, &syntax, &transfer_syntax);
-}
-
-
-/*
   process a fragment received from the transport layer during a
   request
 
diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c
index a6afcd5c89..990288b7e8 100644
--- a/source4/librpc/rpc/dcerpc_auth.c
+++ b/source4/librpc/rpc/dcerpc_auth.c
@@ -27,6 +27,21 @@
 #include "auth/gensec/gensec.h"
 #include "librpc/rpc/dcerpc.h"
 
+/*
+  return the rpc syntax and transfer syntax given the pipe uuid and version
+*/
+static NTSTATUS dcerpc_init_syntaxes(const struct dcerpc_interface_table *table,
+			      struct dcerpc_syntax_id *syntax,
+			      struct dcerpc_syntax_id *transfer_syntax)
+{
+	syntax->uuid = table->syntax_id.uuid;
+	syntax->if_version = table->syntax_id.if_version;
+
+	*transfer_syntax = ndr_transfer_syntax;
+
+	return NT_STATUS_OK;
+}
+
 
 /*
   Send request to do a non-authenticated dcerpc bind