Revert "HACK s4 client reorder prototypes"

This reverts commit 70cec6d08ded965dcf948ed9d9d2733add3869a7.

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 19fccf12e588c29ce56e884b7d191bcccbce2063..9619c7894592058aed042935d90066d166e18521 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -107,12 +107,22 @@ struct smbXcli_session;
 struct smbXcli_tcon;
 struct roh_connection;
 struct tstream_tls_params;
-struct composite_context;
+struct socket_address;
 
+NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx, 
+                            struct dcerpc_pipe **pp, 
+                            const char *binding,
+                            const struct ndr_interface_table *table,
+                            struct cli_credentials *credentials,
+                            struct tevent_context *ev,
+                            struct loadparm_context *lp_ctx);
 const char *dcerpc_server_name(struct dcerpc_pipe *p);
 struct dcerpc_pipe *dcerpc_pipe_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev);
 NTSTATUS dcerpc_fetch_session_key(struct dcerpc_pipe *p,
                                  DATA_BLOB *session_key);
+struct composite_context;
+NTSTATUS dcerpc_secondary_connection_recv(struct composite_context *c,
+                                         struct dcerpc_pipe **p2);
 
 struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent_ctx,
                                                     const struct dcerpc_binding *binding,
@@ -123,6 +133,7 @@ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent_ctx,
 
 NTSTATUS dcerpc_pipe_connect_b_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
                                    struct dcerpc_pipe **p);
+
 NTSTATUS dcerpc_pipe_connect_b(TALLOC_CTX *parent_ctx,
                               struct dcerpc_pipe **pp,
                               const struct dcerpc_binding *binding,
@@ -131,6 +142,25 @@ NTSTATUS dcerpc_pipe_connect_b(TALLOC_CTX *parent_ctx,
                               struct tevent_context *ev,
                               struct loadparm_context *lp_ctx);
 
+NTSTATUS dcerpc_pipe_auth(TALLOC_CTX *mem_ctx,
+                         struct dcerpc_pipe **p, 
+                         const struct dcerpc_binding *binding,
+                         const struct ndr_interface_table *table,
+                         struct cli_credentials *credentials,
+                         struct loadparm_context *lp_ctx);
+NTSTATUS dcerpc_init(void);
+struct composite_context *dcerpc_secondary_smb_send(struct dcecli_connection *c1,
+                                                   struct dcecli_connection *c2,
+                                                   const char *pipe_name);
+NTSTATUS dcerpc_secondary_smb_recv(struct composite_context *c);
+NTSTATUS dcerpc_secondary_context(struct dcerpc_pipe *p, 
+                                 struct dcerpc_pipe **pp2,
+                                 const struct ndr_interface_table *table);
+NTSTATUS dcerpc_alter_context(struct dcerpc_pipe *p, 
+                             TALLOC_CTX *mem_ctx,
+                             const struct ndr_syntax_id *syntax,
+                             const struct ndr_syntax_id *transfer_syntax);
+
 struct composite_context* dcerpc_pipe_connect_send(TALLOC_CTX *parent_ctx,
                                                   const char *binding,
                                                   const struct ndr_interface_table *table,
@@ -139,32 +169,16 @@ struct composite_context* dcerpc_pipe_connect_send(TALLOC_CTX *parent_ctx,
 NTSTATUS dcerpc_pipe_connect_recv(struct composite_context *c,
                                  TALLOC_CTX *mem_ctx,
                                  struct dcerpc_pipe **pp);
-NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx,
-                            struct dcerpc_pipe **pp,
-                            const char *binding,
-                            const struct ndr_interface_table *table,
-                            struct cli_credentials *credentials,
-                            struct tevent_context *ev,
-                            struct loadparm_context *lp_ctx);
-
-NTSTATUS dcerpc_pipe_auth(TALLOC_CTX *mem_ctx,
-                         struct dcerpc_pipe **p, 
-                         const struct dcerpc_binding *binding,
-                         const struct ndr_interface_table *table,
-                         struct cli_credentials *credentials,
-                         struct loadparm_context *lp_ctx);
-
-struct composite_context* dcerpc_secondary_connection_send(struct dcerpc_pipe *p,
-                                                          const struct dcerpc_binding *b);
-NTSTATUS dcerpc_secondary_connection_recv(struct composite_context *c,
-                                         struct dcerpc_pipe **p2);
 
+NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding,
+                               const struct ndr_interface_table *table, struct tevent_context *ev,
+                               struct loadparm_context *lp_ctx);
 struct composite_context* dcerpc_secondary_auth_connection_send(struct dcerpc_pipe *p,
                                                                const struct dcerpc_binding *binding,
                                                                const struct ndr_interface_table *table,
                                                                struct cli_credentials *credentials,
                                                                struct loadparm_context *lp_ctx);
-NTSTATUS dcerpc_secondary_auth_connection_recv(struct composite_context *c,
+NTSTATUS dcerpc_secondary_auth_connection_recv(struct composite_context *c, 
                                               TALLOC_CTX *mem_ctx,
                                               struct dcerpc_pipe **p);
 NTSTATUS dcerpc_secondary_auth_connection(struct dcerpc_pipe *p,
@@ -173,20 +187,10 @@ NTSTATUS dcerpc_secondary_auth_connection(struct dcerpc_pipe *p,
                                        struct cli_credentials *credentials,
                                        struct loadparm_context *lp_ctx,
                                        TALLOC_CTX *mem_ctx,
-NTSTATUS dcerpc_init(void);
-struct composite_context *dcerpc_secondary_smb_send(struct dcecli_connection *c1,
-                                                   struct dcecli_connection *c2,
-                                                   const char *pipe_name);
-NTSTATUS dcerpc_secondary_smb_recv(struct composite_context *c);
-NTSTATUS dcerpc_secondary_context(struct dcerpc_pipe *p, 
-                                 struct dcerpc_pipe **pp2,
-                                 const struct ndr_interface_table *table);
-
-
-NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *binding,
-                               const struct ndr_interface_table *table, struct tevent_context *ev,
-                               struct loadparm_context *lp_ctx);
+                                       struct dcerpc_pipe **p2);
 
+struct composite_context* dcerpc_secondary_connection_send(struct dcerpc_pipe *p,
+                                                          const struct dcerpc_binding *b);
 void dcerpc_log_packet(const char *lockdir, 
                       const struct ndr_interface_table *ndr,
                       uint32_t opnum, uint32_t flags,