s3:passdb Remove use of uint8 uint16 and uint32 in favour of C99 types

[samba.git] / source3 / include / passdb.h

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index 1d0f5c1abff691dfe359bd28fa7d85e50bc5b014..860eff9b20fd0aa4ddcc21de6d32150dfabcbf10 100644 (file)
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -104,8 +104,8 @@ enum pdb_value_state {
 /* cache for bad password lockout data, to be used on replicated SAMs */
 struct login_cache {
        time_t entry_timestamp;
-       uint32 acct_ctrl;
-       uint16 bad_password_count;
+       uint32_t acct_ctrl;
+       uint16_t bad_password_count;
        time_t bad_password_time;
 };
 
@@ -153,18 +153,18 @@ struct samu {
        DATA_BLOB nt_pw_his; /* nt hashed password history .data is Null if not available */
        char* plaintext_pw; /* is Null if not available */
 
-       uint32 acct_ctrl; /* account info (ACB_xxxx bit-mask) */
-       uint32 fields_present; /* 0x00ff ffff */
+       uint32_t acct_ctrl; /* account info (ACB_xxxx bit-mask) */
+       uint32_t fields_present; /* 0x00ff ffff */
 
-       uint16 logon_divs; /* 168 - number of hours in a week */
-       uint32 hours_len; /* normally 21 bytes */
-       uint8 hours[MAX_HOURS_LEN];
+       uint16_t logon_divs; /* 168 - number of hours in a week */
+       uint32_t hours_len; /* normally 21 bytes */
+       uint8_t hours[MAX_HOURS_LEN];
 
        /* Was unknown_5. */
-       uint16 bad_password_count;
-       uint16 logon_count;
+       uint16_t bad_password_count;
+       uint16_t logon_count;
 
-       uint32 unknown_6; /* 0x0000 04ec */
+       uint32_t unknown_6; /* 0x0000 04ec */
 
        /* a tag for who added the private methods */
 
@@ -180,13 +180,13 @@ struct samu {
 struct acct_info {
        fstring acct_name; /* account name */
        fstring acct_desc; /* account name */
-       uint32 rid; /* domain-relative RID */
+       uint32_t rid; /* domain-relative RID */
 };
 
 struct samr_displayentry {
-       uint32 idx;
-       uint32 rid;
-       uint32 acct_flags;
+       uint32_t idx;
+       uint32_t rid;
+       uint32_t acct_flags;
        const char *account_name;
        const char *fullname;
        const char *description;
@@ -201,7 +201,7 @@ enum pdb_search_type {
 struct pdb_search {
        enum pdb_search_type type;
        struct samr_displayentry *cache;
-       uint32 num_entries;
+       uint32_t num_entries;
        ssize_t cache_size;
        bool search_ended;
        void *private_data;
@@ -249,7 +249,7 @@ enum pdb_policy_type {
  * samr_lookup_rids twice. It was done in the srv_samr_nt.c code as well as in
  * the pdb module. Remove the latter, this might happen more often. VL.
  * changed to version 14 to move lookup_rids and lookup_names to return
- * enum lsa_SidType rather than uint32.
+ * enum lsa_SidType rather than uint32_t.
  * Changed to 16 for access to the trusted domain passwords (obnox).
  * Changed to 17, the sampwent interface is gone.
  * Changed to 18, pdb_rid_algorithm -> pdb_capabilities
@@ -270,8 +270,8 @@ struct pdb_methods
        NTSTATUS (*getsampwsid)(struct pdb_methods *, struct samu *sam_acct, const DOM_SID *sid);
 
        NTSTATUS (*create_user)(struct pdb_methods *, TALLOC_CTX *tmp_ctx,
-                               const char *name, uint32 acct_flags,
-                               uint32 *rid);
+                               const char *name, uint32_t acct_flags,
+                               uint32_t *rid);
 
        NTSTATUS (*delete_user)(struct pdb_methods *, TALLOC_CTX *tmp_ctx,
                                struct samu *sam_acct);
@@ -294,10 +294,10 @@ struct pdb_methods
 
        NTSTATUS (*create_dom_group)(struct pdb_methods *methods,
                                     TALLOC_CTX *mem_ctx, const char *name,
-                                    uint32 *rid);
+                                    uint32_t *rid);
 
        NTSTATUS (*delete_dom_group)(struct pdb_methods *methods,
-                                    TALLOC_CTX *mem_ctx, uint32 rid);
+                                    TALLOC_CTX *mem_ctx, uint32_t rid);
 
        NTSTATUS (*add_group_mapping_entry)(struct pdb_methods *methods,
                                            GROUP_MAP *map);
@@ -316,7 +316,7 @@ struct pdb_methods
        NTSTATUS (*enum_group_members)(struct pdb_methods *methods,
                                       TALLOC_CTX *mem_ctx,
                                       const DOM_SID *group,
-                                      uint32 **pp_member_rids,
+                                      uint32_t **pp_member_rids,
                                       size_t *p_num_members);
 
        NTSTATUS (*enum_group_memberships)(struct pdb_methods *methods,
@@ -331,14 +331,14 @@ struct pdb_methods
 
        NTSTATUS (*add_groupmem)(struct pdb_methods *methods,
                                 TALLOC_CTX *mem_ctx,
-                                uint32 group_rid, uint32 member_rid);
+                                uint32_t group_rid, uint32_t member_rid);
 
        NTSTATUS (*del_groupmem)(struct pdb_methods *methods,
                                 TALLOC_CTX *mem_ctx,
-                                uint32 group_rid, uint32 member_rid);
+                                uint32_t group_rid, uint32_t member_rid);
 
        NTSTATUS (*create_alias)(struct pdb_methods *methods,
-                                const char *name, uint32 *rid);
+                                const char *name, uint32_t *rid);
 
        NTSTATUS (*delete_alias)(struct pdb_methods *methods,
                                 const DOM_SID *sid);
@@ -363,13 +363,13 @@ struct pdb_methods
                                           const DOM_SID *domain_sid,
                                           const DOM_SID *members,
                                           size_t num_members,
-                                          uint32 **pp_alias_rids,
+                                          uint32_t **pp_alias_rids,
                                           size_t *p_num_alias_rids);
 
        NTSTATUS (*lookup_rids)(struct pdb_methods *methods,
                                const DOM_SID *domain_sid,
                                int num_rids,
-                               uint32 *rids,
+                               uint32_t *rids,
                                const char **pp_names,
                                enum lsa_SidType *attrs);
 
@@ -377,7 +377,7 @@ struct pdb_methods
                                 const DOM_SID *domain_sid,
                                 int num_names,
                                 const char **pp_names,
-                                uint32 *rids,
+                                uint32_t *rids,
                                 enum lsa_SidType *attrs);
 
        NTSTATUS (*get_account_policy)(struct pdb_methods *methods,
@@ -392,7 +392,7 @@ struct pdb_methods
 
        bool (*search_users)(struct pdb_methods *methods,
                             struct pdb_search *search,
-                            uint32 acct_flags);
+                            uint32_t acct_flags);
        bool (*search_groups)(struct pdb_methods *methods,
                              struct pdb_search *search);
        bool (*search_aliases)(struct pdb_methods *methods,
@@ -407,7 +407,7 @@ struct pdb_methods
                          union unid_t *id, enum lsa_SidType *type);
 
        uint32_t (*capabilities)(struct pdb_methods *methods);
-       bool (*new_rid)(struct pdb_methods *methods, uint32 *rid);
+       bool (*new_rid)(struct pdb_methods *methods, uint32_t *rid);
 
 
        bool (*get_trusteddom_pw)(struct pdb_methods *methods,
@@ -419,7 +419,7 @@ struct pdb_methods
        bool (*del_trusteddom_pw)(struct pdb_methods *methods, 
                                  const char *domain);
        NTSTATUS (*enum_trusteddoms)(struct pdb_methods *methods,
-                                    TALLOC_CTX *mem_ctx, uint32 *num_domains,
+                                    TALLOC_CTX *mem_ctx, uint32_t *num_domains,
                                     struct trustdom_info ***domains);
 
        void *private_data;  /* Private data of some kind */