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

[samba.git] / source3 / winbindd / winbindd_cache.c

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index def5fa0da56266b8f1bbbfb6c40807179c6a0e4d..8b5ff560ae9bcd9a6cd579bf658d4083a4eff514 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -99,10 +99,10 @@ struct winbind_cache {
 
 struct cache_entry {
        NTSTATUS status;
-       uint32 sequence_number;
+       uint32_t sequence_number;
        uint64_t timeout;
-       uint8 *data;
-       uint32 len, ofs;
+       uint8_t *data;
+       uint32_t len, ofs;
 };
 
 void (*smb_panic_fn)(const char *const why) = smb_panic;
@@ -228,11 +228,11 @@ static uint64_t centry_uint64_t(struct cache_entry *centry)
 }
 
 /*
-  pull a uint32 from a cache entry 
+  pull a uint32_t from a cache entry
 */
-static uint32 centry_uint32(struct cache_entry *centry)
+static uint32_t centry_uint32(struct cache_entry *centry)
 {
-       uint32 ret;
+       uint32_t ret;
 
        if (!centry_check_bytes(centry, 4)) {
                smb_panic_fn("centry_uint32");
@@ -243,11 +243,11 @@ static uint32 centry_uint32(struct cache_entry *centry)
 }
 
 /*
-  pull a uint16 from a cache entry 
+  pull a uint16_t from a cache entry
 */
-static uint16 centry_uint16(struct cache_entry *centry)
+static uint16_t centry_uint16(struct cache_entry *centry)
 {
-       uint16 ret;
+       uint16_t ret;
        if (!centry_check_bytes(centry, 2)) {
                smb_panic_fn("centry_uint16");
        }
@@ -257,11 +257,11 @@ static uint16 centry_uint16(struct cache_entry *centry)
 }
 
 /*
-  pull a uint8 from a cache entry 
+  pull a uint8_t from a cache entry
 */
-static uint8 centry_uint8(struct cache_entry *centry)
+static uint8_t centry_uint8(struct cache_entry *centry)
 {
-       uint8 ret;
+       uint8_t ret;
        if (!centry_check_bytes(centry, 1)) {
                smb_panic_fn("centry_uint8");
        }
@@ -299,7 +299,7 @@ static time_t centry_time(struct cache_entry *centry)
 */
 static char *centry_string(struct cache_entry *centry, TALLOC_CTX *mem_ctx)
 {
-       uint32 len;
+       uint32_t len;
        char *ret;
 
        len = centry_uint8(centry);
@@ -328,7 +328,7 @@ static char *centry_string(struct cache_entry *centry, TALLOC_CTX *mem_ctx)
 */
 static char *centry_hash16(struct cache_entry *centry, TALLOC_CTX *mem_ctx)
 {
-       uint32 len;
+       uint32_t len;
        char *ret;
 
        len = centry_uint8(centry);
@@ -444,7 +444,7 @@ static bool wcache_fetch_seqnum(const char *domain_name, uint32_t *seqnum,
 
 static NTSTATUS fetch_cache_seqnum( struct winbindd_domain *domain, time_t now )
 {
-       uint32 last_check, time_diff;
+       uint32_t last_check, time_diff;
 
        if (!wcache_fetch_seqnum(domain->name, &domain->sequence_number,
                                 &last_check)) {
@@ -458,13 +458,13 @@ static NTSTATUS fetch_cache_seqnum( struct winbindd_domain *domain, time_t now )
        if ( time_diff > lp_winbind_cache_time() ) {
                DEBUG(10,("fetch_cache_seqnum: timeout [%s][%u @ %u]\n",
                        domain->name, domain->sequence_number,
-                       (uint32)domain->last_seq_check));
+                       (uint32_t)domain->last_seq_check));
                return NT_STATUS_UNSUCCESSFUL;
        }
 
        DEBUG(10,("fetch_cache_seqnum: success [%s][%u @ %u]\n", 
                domain->name, domain->sequence_number, 
-               (uint32)domain->last_seq_check));
+               (uint32_t)domain->last_seq_check));
 
        return NT_STATUS_OK;
 }
@@ -759,7 +759,7 @@ static void wcache_delete(const char *format, ...)
 /*
   make sure we have at least len bytes available in a centry 
 */
-static void centry_expand(struct cache_entry *centry, uint32 len)
+static void centry_expand(struct cache_entry *centry, uint32_t len)
 {
        if (centry->len - centry->ofs >= len)
                return;
@@ -783,9 +783,9 @@ static void centry_put_uint64_t(struct cache_entry *centry, uint64_t v)
 }
 
 /*
-  push a uint32 into a centry 
+  push a uint32_t into a centry
 */
-static void centry_put_uint32(struct cache_entry *centry, uint32 v)
+static void centry_put_uint32(struct cache_entry *centry, uint32_t v)
 {
        centry_expand(centry, 4);
        SIVAL(centry->data, centry->ofs, v);
@@ -793,9 +793,9 @@ static void centry_put_uint32(struct cache_entry *centry, uint32 v)
 }
 
 /*
-  push a uint16 into a centry 
+  push a uint16_t into a centry
 */
-static void centry_put_uint16(struct cache_entry *centry, uint16 v)
+static void centry_put_uint16(struct cache_entry *centry, uint16_t v)
 {
        centry_expand(centry, 2);
        SSVAL(centry->data, centry->ofs, v);
@@ -803,9 +803,9 @@ static void centry_put_uint16(struct cache_entry *centry, uint16 v)
 }
 
 /*
-  push a uint8 into a centry 
+  push a uint8_t into a centry
 */
-static void centry_put_uint8(struct cache_entry *centry, uint8 v)
+static void centry_put_uint8(struct cache_entry *centry, uint8_t v)
 {
        centry_expand(centry, 1);
        SCVAL(centry->data, centry->ofs, v);
@@ -840,7 +840,7 @@ static void centry_put_string(struct cache_entry *centry, const char *s)
 /* 
    push a 16 byte hash into a centry - treat as 16 byte string.
  */
-static void centry_put_hash16(struct cache_entry *centry, const uint8 val[16])
+static void centry_put_hash16(struct cache_entry *centry, const uint8_t val[16])
 {
        centry_put_uint8(centry, 16);
        centry_expand(centry, 16);
@@ -860,7 +860,7 @@ static void centry_put_sid(struct cache_entry *centry, const struct dom_sid *sid
 */
 static void centry_put_ntstatus(struct cache_entry *centry, NTSTATUS status)
 {
-       uint32 status_value = NT_STATUS_V(status);
+       uint32_t status_value = NT_STATUS_V(status);
        centry_put_uint32(centry, status_value);
 }
 
@@ -1288,7 +1288,7 @@ NTSTATUS wcache_cached_creds_exist(struct winbindd_domain *domain, const struct
        struct winbind_cache *cache = get_cache(domain);
        TDB_DATA data;
        fstring key_str, tmp;
-       uint32 rid;
+       uint32_t rid;
 
        if (!cache->tdb) {
                return NT_STATUS_INTERNAL_DB_ERROR;
@@ -1319,13 +1319,13 @@ 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)
 {
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
-       uint32 rid;
+       uint32_t rid;
        fstring tmp;
 
        if (!cache->tdb) {
@@ -1363,7 +1363,7 @@ NTSTATUS wcache_get_creds(struct winbindd_domain *domain,
           sort this out. It can tell as we only return the cached_salt
           if we are returning a salted cred. */
 
-       *cached_nt_pass = (const uint8 *)centry_hash16(centry, mem_ctx);
+       *cached_nt_pass = (const uint8_t *)centry_hash16(centry, mem_ctx);
        if (*cached_nt_pass == NULL) {
                fstring sidstr;
 
@@ -1380,7 +1380,7 @@ NTSTATUS wcache_get_creds(struct winbindd_domain *domain,
 
        /* We only have 17 bytes more data in the salted cred case. */
        if (centry->len - centry->ofs == 17) {
-               *cached_salt = (const uint8 *)centry_hash16(centry, mem_ctx);
+               *cached_salt = (const uint8_t *)centry_hash16(centry, mem_ctx);
        } else {
                *cached_salt = NULL;
        }
@@ -1403,13 +1403,13 @@ NTSTATUS wcache_get_creds(struct winbindd_domain *domain,
 
 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])
 {
        struct cache_entry *centry;
        fstring sid_string;
-       uint32 rid;
-       uint8 cred_salt[NT_HASH_LEN];
-       uint8 salted_hash[NT_HASH_LEN];
+       uint32_t rid;
+       uint8_t cred_salt[NT_HASH_LEN];
+       uint8_t salted_hash[NT_HASH_LEN];
 
        if (is_null_sid(sid)) {
                return NT_STATUS_INVALID_SID;
@@ -1447,7 +1447,7 @@ NTSTATUS wcache_save_creds(struct winbindd_domain *domain,
 /* Query display info. This is the basic user list fn */
 static NTSTATUS query_user_list(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 *num_entries, 
+                               uint32_t *num_entries,
                                struct wbint_userinfo **info)
 {
        struct winbind_cache *cache = get_cache(domain);
@@ -1598,7 +1598,7 @@ skip_save:
 /* list all domain groups */
 static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 *num_entries, 
+                               uint32_t *num_entries,
                                struct wb_acct_info **info)
 {
        struct winbind_cache *cache = get_cache(domain);
@@ -1693,7 +1693,7 @@ skip_save:
 /* list all domain groups */
 static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 *num_entries, 
+                               uint32_t *num_entries,
                                struct wb_acct_info **info)
 {
        struct winbind_cache *cache = get_cache(domain);
@@ -2019,7 +2019,7 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
 static NTSTATUS 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 **domain_name,
                              char ***names,
@@ -2462,7 +2462,7 @@ NTSTATUS wcache_lookup_usergroups(struct winbindd_domain *domain,
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
                                  const struct dom_sid *user_sid,
-                                 uint32 *num_groups, struct dom_sid **user_gids)
+                                 uint32_t *num_groups, struct dom_sid **user_gids)
 {
        struct cache_entry *centry = NULL;
        NTSTATUS status;
@@ -2612,8 +2612,8 @@ NTSTATUS wcache_lookup_useraliases(struct winbindd_domain *domain,
 
 static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
                                   TALLOC_CTX *mem_ctx,
-                                  uint32 num_sids, const struct dom_sid *sids,
-                                  uint32 *num_aliases, uint32 **alias_rids)
+                                  uint32_t num_sids, const struct dom_sid *sids,
+                                  uint32_t *num_aliases, uint32_t **alias_rids)
 {
        struct cache_entry *centry = NULL;
        NTSTATUS status;
@@ -2747,9 +2747,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
                                const struct dom_sid *group_sid,
                                enum lsa_SidType type,
-                               uint32 *num_names,
+                               uint32_t *num_names,
                                struct dom_sid **sid_mem, char ***names,
-                               uint32 **name_types)
+                               uint32_t **name_types)
 {
        struct cache_entry *centry = NULL;
        NTSTATUS status;
@@ -2818,7 +2818,7 @@ skip_save:
 }
 
 /* find the sequence number for a domain */
-static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
+static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32_t *seq)
 {
        refresh_sequence_number(domain, false);
 
@@ -3224,7 +3224,7 @@ bool init_wcache(void)
 bool initialize_winbindd_cache(void)
 {
        bool cache_bad = true;
-       uint32 vers;
+       uint32_t vers;
 
        if (!init_wcache()) {
                DEBUG(0,("initialize_winbindd_cache: init_wcache failed.\n"));
@@ -4182,9 +4182,9 @@ static int cache_traverse_validate_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_D
        }
 
        DEBUG(0,("cache_traverse_validate_fn: unknown cache entry\nkey :\n"));
-       dump_data(0, (uint8 *)kbuf.dptr, kbuf.dsize);
+       dump_data(0, (uint8_t *)kbuf.dptr, kbuf.dsize);
        DEBUG(0,("data :\n"));
-       dump_data(0, (uint8 *)dbuf.dptr, dbuf.dsize);
+       dump_data(0, (uint8_t *)dbuf.dptr, dbuf.dsize);
        v_state->unknown_key = true;
        v_state->success = false;
        return 1; /* terminate. */
@@ -4554,7 +4554,7 @@ static size_t unpack_tdc_domains( unsigned char *buf, int buflen,
                                  struct winbindd_tdc_domain **domains )
 {
        fstring domain_name, dns_name, sid_string;      
-       uint32 type, attribs, flags;
+       uint32_t type, attribs, flags;
        int num_domains;
        int len = 0;
        int i;
@@ -4860,7 +4860,7 @@ static void wcache_save_user_pwinfo(struct winbindd_domain *domain,
                                    const char *homedir,
                                    const char *shell,
                                    const char *gecos,
-                                   uint32 gid)
+                                   uint32_t gid)
 {
        struct cache_entry *centry;
        fstring tmp;