r19479: Remove more unused functions. These are handled via authentication

abstractions now.

Andrew Bartlett
(This used to be commit df31237c0cac0213c4f32fc491bcec2ea9f885c3)

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 53d0e1b65b53897cf8f83cd90399c005bfc39ab4..e763c81f1350eb2eceed05292b487b1bce7b487f 100644 (file)
--- 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;
@@ -733,22 +733,6 @@ NTSTATUS dcerpc_bind_recv(struct composite_context *ctx)
        return result;
 }
 
-/* 
-   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)
 */
@@ -784,41 +768,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 a6afcd5c895818ab0ec214368d0a75c9a7f33192..990288b7e8d9bd63287cd1640d21fa762051d1de 100644 (file)
--- 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