s3-rpc_server: Use struct pipes_struct.

diff --git a/source3/include/client.h b/source3/include/client.h
index 861ae5aace4739267ee4d9fcdfbe12c8074a413f..ee5afc827365ead9e88ba37a1e28b3de179baf45 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -140,7 +140,7 @@ struct rpc_pipe_client {
        struct netlogon_creds_CredentialState *dc;
 
        /* Used by internal rpc_pipe_client */
-       pipes_struct *pipes_struct;
+       struct pipes_struct *pipes_struct;
 };
 
 /* Transport encryption state. */

diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index e073fe45a283f299a0b62d19bcc6b3e3ab1bacf2..57a3cd44eb93bd8d937298fad72d28a778e38997 100644 (file)
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -60,7 +60,7 @@ static bool is_samr_lsa_pipe(const struct ndr_syntax_id *syntax)
                || ndr_syntax_id_equal(syntax, &ndr_table_lsarpc.syntax_id));
 }
 
-size_t num_pipe_handles(pipes_struct *p)
+size_t num_pipe_handles(struct pipes_struct *p)
 {
        if (p->pipe_handles == NULL) {
                return 0;
@@ -73,9 +73,9 @@ size_t num_pipe_handles(pipes_struct *p)
  pipes of the same name.
 ****************************************************************************/
 
-bool init_pipe_handles(pipes_struct *p, const struct ndr_syntax_id *syntax)
+bool init_pipe_handles(struct pipes_struct *p, const struct ndr_syntax_id *syntax)
 {
-       pipes_struct *plist;
+       struct pipes_struct *plist;
        struct handle_list *hl;
 
        for (plist = get_first_internal_pipe();
@@ -140,7 +140,7 @@ bool init_pipe_handles(pipes_struct *p, const struct ndr_syntax_id *syntax)
   data_ptr is TALLOC_FREE()'ed
 ****************************************************************************/
 
-static struct dcesrv_handle *create_rpc_handle_internal(pipes_struct *p,
+static struct dcesrv_handle *create_rpc_handle_internal(struct pipes_struct *p,
                                struct policy_handle *hnd, void *data_ptr)
 {
        struct dcesrv_handle *rpc_hnd;
@@ -197,7 +197,7 @@ static struct dcesrv_handle *create_rpc_handle_internal(pipes_struct *p,
        return rpc_hnd;
 }
 
-bool create_policy_hnd(pipes_struct *p, struct policy_handle *hnd,
+bool create_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd,
                       void *data_ptr)
 {
        struct dcesrv_handle *rpc_hnd;
@@ -213,7 +213,7 @@ bool create_policy_hnd(pipes_struct *p, struct policy_handle *hnd,
   find policy by handle - internal version.
 ****************************************************************************/
 
-static struct dcesrv_handle *find_policy_by_hnd_internal(pipes_struct *p,
+static struct dcesrv_handle *find_policy_by_hnd_internal(struct pipes_struct *p,
                                const struct policy_handle *hnd, void **data_p)
 {
        struct dcesrv_handle *h;
@@ -248,7 +248,7 @@ static struct dcesrv_handle *find_policy_by_hnd_internal(pipes_struct *p,
   find policy by handle
 ****************************************************************************/
 
-bool find_policy_by_hnd(pipes_struct *p, const struct policy_handle *hnd,
+bool find_policy_by_hnd(struct pipes_struct *p, const struct policy_handle *hnd,
                        void **data_p)
 {
        struct dcesrv_handle *rpc_hnd;
@@ -264,7 +264,7 @@ bool find_policy_by_hnd(pipes_struct *p, const struct policy_handle *hnd,
   Close a policy.
 ****************************************************************************/
 
-bool close_policy_hnd(pipes_struct *p, struct policy_handle *hnd)
+bool close_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd)
 {
        struct dcesrv_handle *rpc_hnd;
 
@@ -289,7 +289,7 @@ bool close_policy_hnd(pipes_struct *p, struct policy_handle *hnd)
  Close a pipe - free the handle set if it was the last pipe reference.
 ****************************************************************************/
 
-void close_policy_by_pipe(pipes_struct *p)
+void close_policy_by_pipe(struct pipes_struct *p)
 {
        p->pipe_handles->pipe_ref_count--;
 
@@ -313,7 +313,7 @@ will be checking a security descriptor to determine whether a user
 token has enough access to access the pipe.
 ********************************************************************/
 
-bool pipe_access_check(pipes_struct *p)
+bool pipe_access_check(struct pipes_struct *p)
 {
        /* Don't let anonymous users access this RPC if restrict
           anonymous > 0 */

diff --git a/source3/rpc_server/rpc_ncacn_np_internal.c b/source3/rpc_server/rpc_ncacn_np_internal.c
index b79b479a08a30ab7a75a1fa3c936288396bbc0bc..a82633590aa45603ba2f7632f8e1d9152a876742 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np_internal.c
+++ b/source3/rpc_server/rpc_ncacn_np_internal.c
@@ -45,12 +45,12 @@ static int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
  Internal Pipe iterator functions.
 ****************************************************************************/
 
-pipes_struct *get_first_internal_pipe(void)
+struct pipes_struct *get_first_internal_pipe(void)
 {
        return InternalPipes;
 }
 
-pipes_struct *get_next_internal_pipe(pipes_struct *p)
+struct pipes_struct *get_next_internal_pipe(struct pipes_struct *p)
 {
        return p->next;
 }
@@ -71,7 +71,7 @@ static void free_pipe_rpc_context_internal( PIPE_RPC_FNS *list )
 
 bool check_open_pipes(void)
 {
-       pipes_struct *p;
+       struct pipes_struct *p;
 
        for (p = InternalPipes; p != NULL; p = p->next) {
                if (num_pipe_handles(p) != 0) {
@@ -117,7 +117,7 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
                                              const char *client_address,
                                              struct auth_serversupplied_info *server_info)
 {
-       pipes_struct *p;
+       struct pipes_struct *p;
 
        DEBUG(4,("Create pipe requested %s\n",
                 get_pipe_name_from_syntax(talloc_tos(), syntax)));

diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index f212773f4df8f1f8976204166562dc7709c8f2aa..c9e5ac0901fd46b82e4e1a044d6e4465fd06e666 100644 (file)
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -20,7 +20,7 @@
 #ifndef _RPC_SERVER_H_
 #define _RPC_SERVER_H_
 
-void set_incoming_fault(pipes_struct *p);
-void process_complete_pdu(pipes_struct *p);
+void set_incoming_fault(struct pipes_struct *p);
+void process_complete_pdu(struct pipes_struct *p);
 
 #endif /* _PRC_SERVER_H_ */