Change all uint32/16/8 to 32_t/16_t/8_t in winbindd.

[kamenim/samba-autobuild/.git] / source3 / winbindd / winbindd_samr.c

diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index 8a717008086574b5772834da60de4170ef1bb2f1..b94dfc8dc6e55fdd1a4afbf80aebfdc894f99d8c 100644 (file)
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -39,50 +39,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-static NTSTATUS open_internal_samr_pipe(TALLOC_CTX *mem_ctx,
-                                       struct rpc_pipe_client **samr_pipe)
-{
-       struct rpc_pipe_client *cli = NULL;
-       struct auth_session_info *session_info = NULL;
-       NTSTATUS status;
-
-       status = make_session_info_system(mem_ctx, &session_info);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("open_samr_pipe: Could not create auth_session_info: %s\n",
-                         nt_errstr(status)));
-               return status;
-       }
-
-       /* create a samr connection */
-       if (lp_parm_bool(-1, "winbindd", "use external pipes", false)) {
-               status = rpc_pipe_open_interface(mem_ctx,
-                                                &ndr_table_samr,
-                                                session_info,
-                                                NULL,
-                                                winbind_messaging_context(),
-                                                &cli);
-       } else {
-               status = rpc_pipe_open_internal(mem_ctx,
-                                               &ndr_table_samr.syntax_id,
-                                               session_info,
-                                               NULL,
-                                               winbind_messaging_context(),
-                                               &cli);
-       }
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("open_samr_pipe: Could not connect to samr_pipe: %s\n",
-                         nt_errstr(status)));
-               return status;
-       }
-
-       if (samr_pipe) {
-               *samr_pipe = cli;
-       }
-
-       return NT_STATUS_OK;
-}
-
 NTSTATUS open_internal_samr_conn(TALLOC_CTX *mem_ctx,
                                 struct winbindd_domain *domain,
                                 struct rpc_pipe_client **samr_pipe,
@@ -92,7 +48,7 @@ NTSTATUS open_internal_samr_conn(TALLOC_CTX *mem_ctx,
        struct policy_handle samr_connect_hnd;
        struct dcerpc_binding_handle *b;
 
-       status = open_internal_samr_pipe(mem_ctx, samr_pipe);
+       status = wb_open_internal_pipe(mem_ctx, &ndr_table_samr, samr_pipe);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -124,56 +80,13 @@ NTSTATUS open_internal_samr_conn(TALLOC_CTX *mem_ctx,
        return result;
 }
 
-static NTSTATUS open_internal_lsa_pipe(TALLOC_CTX *mem_ctx,
-                                      struct rpc_pipe_client **lsa_pipe)
-{
-       struct rpc_pipe_client *cli = NULL;
-       struct auth_session_info *session_info = NULL;
-       NTSTATUS status;
-
-       status = make_session_info_system(mem_ctx, &session_info);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("open_lsa_pipe: Could not create auth_session_info: %s\n",
-                         nt_errstr(status)));
-               return status;
-       }
-
-       /* create a lsa connection */
-       if (lp_parm_bool(-1, "winbindd", "use external pipes", false)) {
-               status = rpc_pipe_open_interface(mem_ctx,
-                                                &ndr_table_lsarpc,
-                                                session_info,
-                                                NULL,
-                                                winbind_messaging_context(),
-                                                &cli);
-       } else {
-               status = rpc_pipe_open_internal(mem_ctx,
-                                               &ndr_table_lsarpc.syntax_id,
-                                               session_info,
-                                               NULL,
-                                               winbind_messaging_context(),
-                                               &cli);
-       }
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("open_lsa_pipe: Could not connect to lsa_pipe: %s\n",
-                         nt_errstr(status)));
-               return status;
-       }
-
-       if (lsa_pipe) {
-               *lsa_pipe = cli;
-       }
-
-       return NT_STATUS_OK;
-}
-
-static NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
-                                      struct rpc_pipe_client **lsa_pipe,
-                                      struct policy_handle *lsa_hnd)
+NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
+                               struct rpc_pipe_client **lsa_pipe,
+                               struct policy_handle *lsa_hnd)
 {
        NTSTATUS status;
 
-       status = open_internal_lsa_pipe(mem_ctx, lsa_pipe);
+       status = wb_open_internal_pipe(mem_ctx, &ndr_table_lsarpc, lsa_pipe);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -512,7 +425,7 @@ done:
 /* List all domain groups */
 static NTSTATUS builtin_enum_dom_groups(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 *num_entries,
+                               uint32_t *num_entries,
                                struct wb_acct_info **info)
 {
        /* BUILTIN doesn't have domain groups */
@@ -524,7 +437,7 @@ static NTSTATUS builtin_enum_dom_groups(struct winbindd_domain *domain,
 /* Query display info for a domain */
 static NTSTATUS builtin_query_user_list(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 *num_entries,
+                               uint32_t *num_entries,
                                struct wbint_userinfo **info)
 {
        /* We don't have users */
@@ -757,7 +670,7 @@ done:
 static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
                                  const struct dom_sid *domain_sid,
-                                 uint32 *rids,
+                                 uint32_t *rids,
                                  size_t num_rids,
                                  char **pdomain_name,
                                  char ***pnames,