Last lot of convert uint32 to uint32_t in winbindd, I promise.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed May  6 07:03:27 CEST 2015 on sn-devel-104

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 8e7143d67b223c55395df3d851fe02d5ca9293b8..87bc5324272dc743668d949fc9c3672b376aa465 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -496,7 +496,7 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx,
                                       struct server_id server_id,
                                       DATA_BLOB *data)
 {
-       uint8 ret;
+       uint8_t ret;
        pid_t child_pid;
        NTSTATUS status;
 
@@ -535,7 +535,7 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx,
        /* install default SIGCHLD handler: validation code uses fork/waitpid */
        CatchSignal(SIGCHLD, SIG_DFL);
 
-       ret = (uint8)winbindd_validate_cache_nobackup();
+       ret = (uint8_t)winbindd_validate_cache_nobackup();
        DEBUG(10, ("winbindd_msg_validata_cache: got return value %d\n", ret));
        messaging_send_buf(msg_ctx, server_id, MSG_WINBIND_VALIDATE_CACHE, &ret,
                           (size_t)1);

diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index 8fc9eca5fd9d689bcd54c5da811009c4a3737aa6..f676b1e317af375f4e9276fcaf8d8a59d6a6597a 100644 (file)
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -388,6 +388,6 @@ struct WINBINDD_CCACHE_ENTRY {
 #define WINBINDD_ESTABLISH_LOOP 30
 #define WINBINDD_RESCAN_FREQ lp_winbind_cache_time()
 #define WINBINDD_PAM_AUTH_KRB5_RENEW_TIME 2592000 /* one month */
-#define DOM_SEQUENCE_NONE ((uint32)-1)
+#define DOM_SEQUENCE_NONE ((uint32_t)-1)
 
 #endif /* _WINBINDD_H */

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 3bdf4c975cc693bbf1d37c3ac2b2b1b9fff06a8e..f1f7976b10e9b236801fea2f67131ccce943ace8 100644 (file)
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -1244,7 +1244,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
        if (num_members) {
                (*sid_mem) = talloc_zero_array(mem_ctx, struct dom_sid, num_members);
                (*names) = talloc_zero_array(mem_ctx, char *, num_members);
-               (*name_types) = talloc_zero_array(mem_ctx, uint32, num_members);
+               (*name_types) = talloc_zero_array(mem_ctx, uint32_t, num_members);
                (sid_mem_nocache) = talloc_zero_array(tmp_ctx, struct dom_sid, num_members);
 
                if ((members == NULL) || (*sid_mem == NULL) ||
@@ -1448,7 +1448,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
        NTSTATUS                result = NT_STATUS_UNSUCCESSFUL;
        WERROR werr;
        int                     i;
-       uint32                  flags;  
+       uint32_t                flags;
        struct rpc_pipe_client *cli;
        int ret_count;
        struct dcerpc_binding_handle *b;

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 8b5ff560ae9bcd9a6cd579bf658d4083a4eff514..ea30945cf5e511ffeae9fd971dd7e93cf39ad4ae 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -901,7 +901,7 @@ static struct cache_entry *centry_start(struct winbindd_domain *domain,
        centry = SMB_XMALLOC_P(struct cache_entry);
 
        centry->len = 8192; /* reasonable default */
-       centry->data = SMB_XMALLOC_ARRAY(uint8, centry->len);
+       centry->data = SMB_XMALLOC_ARRAY(uint8_t, centry->len);
        centry->ofs = 0;
        centry->sequence_number = domain->sequence_number;
        centry->timeout = lp_winbind_cache_time() + time(NULL);
@@ -2718,7 +2718,7 @@ NTSTATUS wcache_lookup_groupmem(struct winbindd_domain *domain,
 
        *sid_mem = talloc_array(mem_ctx, struct dom_sid, *num_names);
        *names = talloc_array(mem_ctx, char *, *num_names);
-       *name_types = talloc_array(mem_ctx, uint32, *num_names);
+       *name_types = talloc_array(mem_ctx, uint32_t, *num_names);
 
        if ((*sid_mem == NULL) || (*names == NULL) || (*name_types == NULL)) {
                TALLOC_FREE(*sid_mem);

diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c
index 6bbd0ffd9d134bd7dc6206d6d3bea2d97ad13a13..37176415488cde0892ac4769ca1d6668cc04bee4 100644 (file)
--- a/source3/winbindd/winbindd_creds.c
+++ b/source3/winbindd/winbindd_creds.c
@@ -32,8 +32,8 @@ NTSTATUS winbindd_get_creds(struct winbindd_domain *domain,
                            TALLOC_CTX *mem_ctx,
                            const struct dom_sid *sid,
                            struct netr_SamInfo3 **info3,
-                           const uint8 *cached_nt_pass[NT_HASH_LEN],
-                           const uint8 *cred_salt[NT_HASH_LEN])
+                           const uint8_t *cached_nt_pass[NT_HASH_LEN],
+                           const uint8_t *cred_salt[NT_HASH_LEN])
 {
        struct netr_SamInfo3 *info;
        NTSTATUS status;

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 35838e6a15e41b97be7f06c6cdd8e233d841ae6c..5bb7cd0edbc20de70dd052c74d84e575e63e6a88 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -786,7 +786,7 @@ void winbind_msg_onlinestatus(struct messaging_context *msg_ctx,
        }
 
        messaging_send_buf(msg_ctx, *sender, MSG_WINBIND_ONLINESTATUS, 
-                          (const uint8 *)message, strlen(message) + 1);
+                          (const uint8_t *)message, strlen(message) + 1);
 
        talloc_destroy(mem_ctx);
 }

diff --git a/source3/winbindd/winbindd_getgrnam.c b/source3/winbindd/winbindd_getgrnam.c
index bc970cbf22636a9ce3d2d7375f84e0ca710078aa..12b16513caa893d73cf08582b858822e15df9d2a 100644 (file)
--- a/source3/winbindd/winbindd_getgrnam.c
+++ b/source3/winbindd/winbindd_getgrnam.c
@@ -170,7 +170,7 @@ NTSTATUS winbindd_getgrnam_recv(struct tevent_req *req,
                return status;
        }
 
-       response->data.gr.num_gr_mem = (uint32)num_members;
+       response->data.gr.num_gr_mem = (uint32_t)num_members;
 
        /* Group membership lives at start of extra data */
 

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 93654e13c1830614a8814c0d81b8d7bd64d46dec..fedbbe736a31e424d5a6f3657ee62543ddec9514 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -61,11 +61,11 @@ NTSTATUS wcache_cached_creds_exist(struct winbindd_domain *domain, const struct
 NTSTATUS wcache_get_creds(struct winbindd_domain *domain, 
                          TALLOC_CTX *mem_ctx, 
                          const struct dom_sid *sid,
-                         const uint8 **cached_nt_pass,
-                         const uint8 **cached_salt);
+                         const uint8_t **cached_nt_pass,
+                         const uint8_t **cached_salt);
 NTSTATUS wcache_save_creds(struct winbindd_domain *domain, 
                           const struct dom_sid *sid,
-                          const uint8 nt_pass[NT_HASH_LEN]);
+                          const uint8_t nt_pass[NT_HASH_LEN]);
 void wcache_invalidate_samlogon(struct winbindd_domain *domain, 
                                const struct dom_sid *user_sid);
 bool wcache_invalidate_cache(void);
@@ -104,8 +104,8 @@ NTSTATUS wcache_query_user_fullname(struct winbindd_domain *domain,
                                    const char **full_name);
 NTSTATUS wcache_lookup_useraliases(struct winbindd_domain *domain,
                                   TALLOC_CTX *mem_ctx,
-                                  uint32 num_sids, const struct dom_sid *sids,
-                                  uint32 *pnum_aliases, uint32 **paliases);
+                                  uint32_t num_sids, const struct dom_sid *sids,
+                                  uint32_t *pnum_aliases, uint32 **paliases);
 NTSTATUS wcache_lookup_usergroups(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
                                  const struct dom_sid *user_sid,
@@ -219,8 +219,8 @@ NTSTATUS winbindd_get_creds(struct winbindd_domain *domain,
                            TALLOC_CTX *mem_ctx,
                            const struct dom_sid *sid,
                            struct netr_SamInfo3 **info3,
-                           const uint8 *cached_nt_pass[NT_HASH_LEN],
-                           const uint8 *cred_salt[NT_HASH_LEN]);
+                           const uint8_t *cached_nt_pass[NT_HASH_LEN],
+                           const uint8_t *cred_salt[NT_HASH_LEN]);
 NTSTATUS winbindd_store_creds(struct winbindd_domain *domain,
                              const char *user, 
                              const char *pass, 
@@ -436,7 +436,7 @@ int winbindd_num_clients(void);
 NTSTATUS lookup_usergroups_cached(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
                                  const struct dom_sid *user_sid,
-                                 uint32 *p_num_groups, struct dom_sid **user_sids);
+                                 uint32_t *p_num_groups, struct dom_sid **user_sids);
 
 NTSTATUS normalize_name_map(TALLOC_CTX *mem_ctx,
                             struct winbindd_domain *domain,