r24560: rename some DCERPC_ prefixes into NDR_

[ira/wip.git] / source / librpc / rpc / dcerpc_schannel.c

diff --git a/source/librpc/rpc/dcerpc_schannel.c b/source/librpc/rpc/dcerpc_schannel.c
index 611c2a6bca278671a5594d565b563bf32da3284b..c6b3a5fc0f380cf0302ee4b1c1eac3c4f7672d71 100644 (file)
--- a/source/librpc/rpc/dcerpc_schannel.c
+++ b/source/librpc/rpc/dcerpc_schannel.c
@@ -68,7 +68,7 @@ static void continue_epm_map_binding(struct composite_context *ctx)
        c->status = dcerpc_epm_map_binding_recv(ctx);
        if (!NT_STATUS_IS_OK(c->status)) {
                DEBUG(0,("Failed to map DCERPC/TCP NCACN_NP pipe for '%s' - %s\n",
-                        DCERPC_NETLOGON_UUID, nt_errstr(c->status)));
+                        NDR_NETLOGON_UUID, nt_errstr(c->status)));
                composite_error(c, c->status);
                return;
        }
@@ -102,7 +102,7 @@ static void continue_secondary_connection(struct composite_context *ctx)
        talloc_steal(s, s->pipe2);
 
        /* initiate a non-authenticated bind */
-       auth_none_req = dcerpc_bind_auth_none_send(c, s->pipe2, &dcerpc_table_netlogon);
+       auth_none_req = dcerpc_bind_auth_none_send(c, s->pipe2, &ndr_table_netlogon);
        if (composite_nomem(auth_none_req, c)) return;
 
        composite_continue(c, auth_none_req, continue_bind_auth_none, c);
@@ -261,7 +261,7 @@ struct composite_context *dcerpc_schannel_key_send(TALLOC_CTX *mem_ctx,
 
        /* request the netlogon endpoint mapping */
        epm_map_req = dcerpc_epm_map_binding_send(c, s->binding,
-                                                 &dcerpc_table_netlogon,
+                                                 &ndr_table_netlogon,
                                                  s->pipe->conn->event_ctx);
        if (composite_nomem(epm_map_req, c)) return c;
 
@@ -285,7 +285,7 @@ NTSTATUS dcerpc_schannel_key_recv(struct composite_context *c)
 struct auth_schannel_state {
        struct dcerpc_pipe *pipe;
        struct cli_credentials *credentials;
-       const struct dcerpc_interface_table *table;
+       const struct ndr_interface_table *table;
        uint8_t auth_level;
 };
 
@@ -344,7 +344,7 @@ static void continue_bind_auth(struct composite_context *ctx)
 */
 struct composite_context *dcerpc_bind_auth_schannel_send(TALLOC_CTX *tmp_ctx, 
                                                         struct dcerpc_pipe *p,
-                                                        const struct dcerpc_interface_table *table,
+                                                        const struct ndr_interface_table *table,
                                                         struct cli_credentials *credentials,
                                                         uint8_t auth_level)
 {
@@ -392,7 +392,7 @@ NTSTATUS dcerpc_bind_auth_schannel_recv(struct composite_context *c)
  */
 NTSTATUS dcerpc_bind_auth_schannel(TALLOC_CTX *tmp_ctx, 
                                   struct dcerpc_pipe *p,
-                                  const struct dcerpc_interface_table *table,
+                                  const struct ndr_interface_table *table,
                                   struct cli_credentials *credentials,
                                   uint8_t auth_level)
 {