Convert all uses of uint32/16/8 to _t in source3/rpc_client.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 974538b87bd5c0ca8b560a474316586b6debba0f..f50a5e92d03676c589f052c92df3b9c89c71a180 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -81,7 +81,7 @@ NTSTATUS dcerpc_lsa_open_policy(struct dcerpc_binding_handle *h,
 
 NTSTATUS rpccli_lsa_open_policy(struct rpc_pipe_client *cli,
                                TALLOC_CTX *mem_ctx,
-                               bool sec_qos, uint32 des_access,
+                               bool sec_qos, uint32_t des_access,
                                struct policy_handle *pol)
 {
        NTSTATUS status;
@@ -140,7 +140,7 @@ NTSTATUS dcerpc_lsa_open_policy2(struct dcerpc_binding_handle *h,
 
 NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx, bool sec_qos,
-                                uint32 des_access, struct policy_handle *pol)
+                                uint32_t des_access, struct policy_handle *pol)
 {
        NTSTATUS status;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;

diff --git a/source3/rpc_client/cli_lsarpc.h b/source3/rpc_client/cli_lsarpc.h
index 36afe0bdfb0f6f1bda2b798b4141cf6385a5586a..4f9464d5b0589deb789259d4fad489c15a680a3a 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.h
+++ b/source3/rpc_client/cli_lsarpc.h
@@ -54,7 +54,7 @@ NTSTATUS dcerpc_lsa_open_policy(struct dcerpc_binding_handle *h,
                                NTSTATUS *result);
 NTSTATUS rpccli_lsa_open_policy(struct rpc_pipe_client *cli,
                                TALLOC_CTX *mem_ctx,
-                               bool sec_qos, uint32 des_access,
+                               bool sec_qos, uint32_t des_access,
                                struct policy_handle *pol);
 
 /**
@@ -83,7 +83,7 @@ NTSTATUS dcerpc_lsa_open_policy2(struct dcerpc_binding_handle *h,
                                 NTSTATUS *result);
 NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx, bool sec_qos,
-                                uint32 des_access, struct policy_handle *pol);
+                                uint32_t des_access, struct policy_handle *pol);
 
 /**
  * @brief Look up the names that correspond to an array of sids.

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 4fd71554ffc37f169ae3f4a960395d259343eb96..166f31803a6382859943dcc27ed6a8734482c414 100644 (file)
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -371,7 +371,7 @@ NTSTATUS rpccli_netlogon_password_logon(struct netlogon_creds_cli_context *creds
        }
        case NetlogonNetworkInformation: {
                struct netr_NetworkInfo *network_info;
-               uint8 chal[8];
+               uint8_t chal[8];
                unsigned char local_lm_response[24];
                unsigned char local_nt_response[24];
                struct netr_ChallengeResponse lm;
@@ -459,7 +459,7 @@ NTSTATUS rpccli_netlogon_network_logon(struct netlogon_creds_cli_context *creds,
                                       const char *username,
                                       const char *domain,
                                       const char *workstation,
-                                      const uint8 chal[8],
+                                      const uint8_t chal[8],
                                       DATA_BLOB lm_response,
                                       DATA_BLOB nt_response,
                                       uint8_t *authoritative,

diff --git a/source3/rpc_client/cli_netlogon.h b/source3/rpc_client/cli_netlogon.h
index b04f3a2a96588b1153a3b0ebe357761f1edd9bf0..d63805bce7dd9256d2c6a2781739746a423f6744 100644 (file)
--- a/source3/rpc_client/cli_netlogon.h
+++ b/source3/rpc_client/cli_netlogon.h
@@ -73,7 +73,7 @@ NTSTATUS rpccli_netlogon_network_logon(struct netlogon_creds_cli_context *creds,
                                       const char *username,
                                       const char *domain,
                                       const char *workstation,
-                                      const uint8 chal[8],
+                                      const uint8_t chal[8],
                                       DATA_BLOB lm_response,
                                       DATA_BLOB nt_response,
                                       uint8_t *authoritative,

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 915fb78a90ff2d256def0c72f634a2e8fe865245..6cff27a8d4d4e712189739660a4cd6f426a22600 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -56,9 +56,9 @@ static const char *rpccli_pipe_txt(TALLOC_CTX *mem_ctx,
  Rpc pipe call id.
  ********************************************************************/
 
-static uint32 get_rpc_call_id(void)
+static uint32_t get_rpc_call_id(void)
 {
-       static uint32 call_id = 0;
+       static uint32_t call_id = 0;
        return ++call_id;
 }
 
@@ -1039,14 +1039,14 @@ static NTSTATUS create_generic_auth_rpc_bind_req(struct rpc_pipe_client *cli,
 
 static NTSTATUS create_bind_or_alt_ctx_internal(TALLOC_CTX *mem_ctx,
                                                enum dcerpc_pkt_type ptype,
-                                               uint32 rpc_call_id,
+                                               uint32_t rpc_call_id,
                                                const struct ndr_syntax_id *abstract,
                                                const struct ndr_syntax_id *transfer,
                                                const DATA_BLOB *auth_info,
                                                bool client_hdr_signing,
                                                DATA_BLOB *blob)
 {
-       uint16 auth_len = auth_info->length;
+       uint16_t auth_len = auth_info->length;
        NTSTATUS status;
        union dcerpc_payload u;
        struct dcerpc_ctx_list ctx_list;
@@ -1093,7 +1093,7 @@ static NTSTATUS create_bind_or_alt_ctx_internal(TALLOC_CTX *mem_ctx,
 static NTSTATUS create_rpc_bind_req(TALLOC_CTX *mem_ctx,
                                    struct rpc_pipe_client *cli,
                                    struct pipe_auth_data *auth,
-                                   uint32 rpc_call_id,
+                                   uint32_t rpc_call_id,
                                    const struct ndr_syntax_id *abstract,
                                    const struct ndr_syntax_id *transfer,
                                    DATA_BLOB *rpc_out)
@@ -1629,7 +1629,7 @@ static bool check_bind_response(const struct dcerpc_bind_ack *r,
 
 static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx,
                                struct rpc_pipe_client *cli,
-                               uint32 rpc_call_id,
+                               uint32_t rpc_call_id,
                                enum dcerpc_AuthType auth_type,
                                enum dcerpc_AuthLevel auth_level,
                                DATA_BLOB *pauth_blob,
@@ -1676,7 +1676,7 @@ static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx,
 static NTSTATUS create_rpc_alter_context(TALLOC_CTX *mem_ctx,
                                        enum dcerpc_AuthType auth_type,
                                        enum dcerpc_AuthLevel auth_level,
-                                       uint32 rpc_call_id,
+                                       uint32_t rpc_call_id,
                                        const struct ndr_syntax_id *abstract,
                                        const struct ndr_syntax_id *transfer,
                                        const DATA_BLOB *pauth_blob, /* spnego auth blob already created. */

diff --git a/source3/rpc_client/rpc_client.h b/source3/rpc_client/rpc_client.h
index 7c5ff0e818189f3e082f700fbafbd284a5627119..b033da6c3d72e0f65306497afd0ff6bef99309e1 100644 (file)
--- a/source3/rpc_client/rpc_client.h
+++ b/source3/rpc_client/rpc_client.h
@@ -44,8 +44,8 @@ struct rpc_pipe_client {
        char *desthost;
        char *srv_name_slash;
 
-       uint16 max_xmit_frag;
-       uint16 max_recv_frag;
+       uint16_t max_xmit_frag;
+       uint16_t max_recv_frag;
 
        struct pipe_auth_data *auth;
 };