From: Richard Sharpe Date: Fri, 15 May 2015 01:08:27 +0000 (-0700) Subject: Covert all uint32/16/8 to _t in source3/rpc_server. X-Git-Tag: tevent-0.9.25~478 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=0dde2106bb9a3be356e5feef8db172888a8cc8cf Covert all uint32/16/8 to _t in source3/rpc_server. This can be committed regardless of the state of the PIDL changes. Signed-off-by: Richard Sharpe Reviewed-by: Jeremy Allison --- diff --git a/source3/rpc_server/echo/srv_echo_nt.c b/source3/rpc_server/echo/srv_echo_nt.c index f1bb5d3d7d0..5fd1a2e6142 100644 --- a/source3/rpc_server/echo/srv_echo_nt.c +++ b/source3/rpc_server/echo/srv_echo_nt.c @@ -48,7 +48,7 @@ void _echo_EchoData(struct pipes_struct *p, struct echo_EchoData *r) return; } - r->out.out_data = talloc_array(p->mem_ctx, uint8, r->in.len); + r->out.out_data = talloc_array(p->mem_ctx, uint8_t, r->in.len); memcpy( r->out.out_data, r->in.in_data, r->in.len ); return; } @@ -67,7 +67,7 @@ void _echo_SinkData(struct pipes_struct *p, struct echo_SinkData *r) void _echo_SourceData(struct pipes_struct *p, struct echo_SourceData *r) { - uint32 i; + uint32_t i; DEBUG(10, ("_echo_SourceData\n")); @@ -76,7 +76,7 @@ void _echo_SourceData(struct pipes_struct *p, struct echo_SourceData *r) return; } - r->out.data = talloc_array(p->mem_ctx, uint8, r->in.len ); + r->out.data = talloc_array(p->mem_ctx, uint8_t, r->in.len ); for (i = 0; i < r->in.len; i++ ) { r->out.data[i] = i & 0xff; @@ -97,7 +97,7 @@ NTSTATUS _echo_TestCall2(struct pipes_struct *p, struct echo_TestCall2 *r) return NT_STATUS_OK; } -uint32 _echo_TestSleep(struct pipes_struct *p, struct echo_TestSleep *r) +uint32_t _echo_TestSleep(struct pipes_struct *p, struct echo_TestSleep *r) { smb_msleep(r->in.seconds * 1000); return 0; @@ -115,7 +115,7 @@ void _echo_TestSurrounding(struct pipes_struct *p, struct echo_TestSurrounding * return; } -uint16 _echo_TestDoublePointer(struct pipes_struct *p, struct echo_TestDoublePointer *r) +uint16_t _echo_TestDoublePointer(struct pipes_struct *p, struct echo_TestDoublePointer *r) { p->fault_state = DCERPC_FAULT_OP_RNG_ERROR; return 0; diff --git a/source3/rpc_server/eventlog/srv_eventlog_nt.c b/source3/rpc_server/eventlog/srv_eventlog_nt.c index a3e719a38bc..ce27dd530e1 100644 --- a/source3/rpc_server/eventlog/srv_eventlog_nt.c +++ b/source3/rpc_server/eventlog/srv_eventlog_nt.c @@ -41,11 +41,11 @@ typedef struct { char *logname; ELOG_TDB *etdb; - uint32 current_record; - uint32 num_records; - uint32 oldest_entry; - uint32 flags; - uint32 access_granted; + uint32_t current_record; + uint32_t num_records; + uint32_t oldest_entry; + uint32_t flags; + uint32_t access_granted; } EVENTLOG_INFO; /******************************************************************** diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c index ef189630245..1e3f9f92a23 100644 --- a/source3/rpc_server/lsa/srv_lsa_nt.c +++ b/source3/rpc_server/lsa/srv_lsa_nt.c @@ -65,7 +65,7 @@ enum lsa_handle_type { struct lsa_info { struct dom_sid sid; const char *name; - uint32 access; + uint32_t access; enum lsa_handle_type type; struct security_descriptor *sd; }; @@ -134,7 +134,7 @@ static NTSTATUS lookup_lsa_rids(TALLOC_CTX *mem_ctx, int flags, uint32_t *pmapped_count) { - uint32 mapped_count, i; + uint32_t mapped_count, i; SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS); @@ -143,7 +143,7 @@ static NTSTATUS lookup_lsa_rids(TALLOC_CTX *mem_ctx, for (i = 0; i < num_entries; i++) { struct dom_sid sid; - uint32 rid; + uint32_t rid; int dom_idx; const char *full_name; const char *domain; @@ -215,9 +215,9 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx, uint32_t num_entries, struct lsa_String *name, int flags, - uint32 *pmapped_count) + uint32_t *pmapped_count) { - uint32 mapped_count, i; + uint32_t mapped_count, i; SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS); @@ -226,7 +226,7 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx, for (i = 0; i < num_entries; i++) { struct dom_sid sid; - uint32 rid; + uint32_t rid; int dom_idx; const char *full_name; const char *domain; @@ -386,8 +386,8 @@ NTSTATUS _lsa_OpenPolicy2(struct pipes_struct *p, { struct security_descriptor *psd = NULL; size_t sd_size; - uint32 des_access = r->in.access_mask; - uint32 acc_granted; + uint32_t des_access = r->in.access_mask; + uint32_t acc_granted; NTSTATUS status; if (p->transport != NCACN_NP && p->transport != NCALRPC) { @@ -634,7 +634,7 @@ NTSTATUS _lsa_QueryInfoPolicy(struct pipes_struct *p, case LSA_POLICY_INFO_AUDIT_EVENTS: { - uint32 policy_def = LSA_AUDIT_POLICY_ALL; + uint32_t policy_def = LSA_AUDIT_POLICY_ALL; /* check if the user has enough rights */ if (!(handle->access & LSA_POLICY_VIEW_AUDIT_INFORMATION)) { @@ -810,7 +810,7 @@ static NTSTATUS _lsa_lookup_sids_internal(struct pipes_struct *p, int i; const struct dom_sid **sids = NULL; struct lsa_RefDomainList *ref = NULL; - uint32 mapped_count = 0; + uint32_t mapped_count = 0; struct lsa_dom_info *dom_infos = NULL; struct lsa_name_info *name_infos = NULL; struct lsa_TranslatedName2 *names = NULL; @@ -912,7 +912,7 @@ NTSTATUS _lsa_LookupSids(struct pipes_struct *p, NTSTATUS status; struct lsa_info *handle; int num_sids = r->in.sids->num_sids; - uint32 mapped_count = 0; + uint32_t mapped_count = 0; struct lsa_RefDomainList *domains = NULL; struct lsa_TranslatedName *names_out = NULL; struct lsa_TranslatedName2 *names = NULL; @@ -994,7 +994,7 @@ static NTSTATUS _lsa_LookupSids_common(struct pipes_struct *p, NTSTATUS status; struct lsa_info *handle; int num_sids = r->in.sids->num_sids; - uint32 mapped_count = 0; + uint32_t mapped_count = 0; struct lsa_RefDomainList *domains = NULL; struct lsa_TranslatedName2 *names = NULL; bool check_policy = true; @@ -1143,10 +1143,10 @@ NTSTATUS _lsa_LookupNames(struct pipes_struct *p, NTSTATUS status = NT_STATUS_NONE_MAPPED; struct lsa_info *handle; struct lsa_String *names = r->in.names; - uint32 num_entries = r->in.num_names; + uint32_t num_entries = r->in.num_names; struct lsa_RefDomainList *domains = NULL; struct lsa_TranslatedSid *rids = NULL; - uint32 mapped_count = 0; + uint32_t mapped_count = 0; int flags = 0; if (p->transport != NCACN_NP && p->transport != NCALRPC) { @@ -1279,10 +1279,10 @@ static NTSTATUS _lsa_LookupNames_common(struct pipes_struct *p, NTSTATUS status; struct lsa_info *handle; struct lsa_String *names = r->in.names; - uint32 num_entries = r->in.num_names; + uint32_t num_entries = r->in.num_names; struct lsa_RefDomainList *domains = NULL; struct lsa_TranslatedSid3 *trans_sids = NULL; - uint32 mapped_count = 0; + uint32_t mapped_count = 0; int flags = 0; bool check_policy = true; @@ -2546,8 +2546,8 @@ NTSTATUS _lsa_EnumPrivs(struct pipes_struct *p, struct lsa_EnumPrivs *r) { struct lsa_info *handle; - uint32 i; - uint32 enum_context = *r->in.resume_handle; + uint32_t i; + uint32_t enum_context = *r->in.resume_handle; int num_privs = num_privileges_in_short_list(); struct lsa_PrivEntry *entries = NULL; @@ -3377,7 +3377,7 @@ static NTSTATUS init_lsa_right_set(TALLOC_CTX *mem_ctx, struct lsa_RightSet *r, PRIVILEGE_SET *privileges) { - uint32 i; + uint32_t i; const char *privname; const char **privname_array = NULL; size_t num_priv = 0; diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c index e899306bf5c..ad710bbb895 100644 --- a/source3/rpc_server/samr/srv_samr_chgpasswd.c +++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c @@ -671,10 +671,10 @@ static NTSTATUS check_oem_password(const char *user, { uchar null_pw[16]; uchar null_ntpw[16]; - uint8 *password_encrypted; - const uint8 *encryption_key; - const uint8 *lanman_pw, *nt_pw; - uint32 acct_ctrl; + uint8_t *password_encrypted; + const uint8_t *encryption_key; + const uint8_t *lanman_pw, *nt_pw; + uint32_t acct_ctrl; size_t new_pw_len; uchar new_nt_hash[16]; uchar new_lm_hash[16]; @@ -896,9 +896,9 @@ static bool password_in_history(uint8_t nt_pw[NT_HASH_LEN], static bool check_passwd_history(struct samu *sampass, const char *plaintext) { uchar new_nt_p16[NT_HASH_LEN]; - const uint8 *nt_pw; - const uint8 *pwhistory; - uint32 pwHisLen, curr_pwHisLen; + const uint8_t *nt_pw; + const uint8_t *pwhistory; + uint32_t pwHisLen, curr_pwHisLen; pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY, &pwHisLen); if (pwHisLen == 0) { @@ -986,8 +986,8 @@ static NTSTATUS change_oem_password(struct samu *hnd, const char *rhost, bool as_root, enum samPwdChangeReason *samr_reject_reason) { - uint32 min_len; - uint32 refuse; + uint32_t min_len; + uint32_t refuse; TALLOC_CTX *tosctx = talloc_tos(); struct passwd *pass = NULL; const char *username = pdb_get_username(hnd); diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c index 0a7a915a1c9..4b4b77a7dcf 100644 --- a/source3/rpc_server/samr/srv_samr_nt.c +++ b/source3/rpc_server/samr/srv_samr_nt.c @@ -132,7 +132,7 @@ static const struct generic_mapping ali_generic_mapping = { static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, struct security_descriptor **psd, size_t *sd_size, const struct generic_mapping *map, - struct dom_sid *sid, uint32 sid_access ) + struct dom_sid *sid, uint32_t sid_access ) { struct dom_sid domadmin_sid; struct security_ace ace[5]; /* at most 5 entries */ @@ -346,7 +346,7 @@ static void samr_clear_sam_passwd(struct samu *sam_pass) pdb_set_nt_passwd(sam_pass, NULL, PDB_DEFAULT); } -static uint32 count_sam_users(struct disp_info *info, uint32 acct_flags) +static uint32_t count_sam_users(struct disp_info *info, uint32_t acct_flags) { struct samr_displayentry *entry; @@ -370,7 +370,7 @@ static uint32 count_sam_users(struct disp_info *info, uint32 acct_flags) return info->users->num_entries; } -static uint32 count_sam_groups(struct disp_info *info) +static uint32_t count_sam_groups(struct disp_info *info) { struct samr_displayentry *entry; @@ -394,7 +394,7 @@ static uint32 count_sam_groups(struct disp_info *info) return info->groups->num_entries; } -static uint32 count_sam_aliases(struct disp_info *info) +static uint32_t count_sam_aliases(struct disp_info *info) { struct samr_displayentry *entry; @@ -437,8 +437,8 @@ NTSTATUS _samr_OpenDomain(struct pipes_struct *p, { struct samr_domain_info *dinfo; struct security_descriptor *psd = NULL; - uint32 acc_granted; - uint32 des_access = r->in.access_mask; + uint32_t acc_granted; + uint32_t des_access = r->in.access_mask; NTSTATUS status; size_t sd_size; uint32_t extra_access = SAMR_DOMAIN_ACCESS_CREATE_USER; @@ -571,7 +571,7 @@ NTSTATUS _samr_SetSecurity(struct pipes_struct *p, struct samr_SetSecurity *r) { struct samr_user_info *uinfo; - uint32 i; + uint32_t i; struct security_acl *dacl; bool ret; struct samu *sampass=NULL; @@ -825,10 +825,10 @@ NTSTATUS _samr_EnumDomainUsers(struct pipes_struct *p, NTSTATUS status; struct samr_domain_info *dinfo; int num_account; - uint32 enum_context = *r->in.resume_handle; + uint32_t enum_context = *r->in.resume_handle; enum remote_arch_types ra_type = get_remote_arch(); int max_sam_entries = (ra_type == RA_WIN95) ? MAX_SAM_ENTRIES_W95 : MAX_SAM_ENTRIES_W2K; - uint32 max_entries = max_sam_entries; + uint32_t max_entries = max_sam_entries; struct samr_displayentry *entries = NULL; struct samr_SamArray *samr_array = NULL; struct samr_SamEntry *samr_entries = NULL; @@ -964,7 +964,7 @@ NTSTATUS _samr_EnumDomainGroups(struct pipes_struct *p, NTSTATUS status; struct samr_domain_info *dinfo; struct samr_displayentry *groups; - uint32 num_groups; + uint32_t num_groups; struct samr_SamArray *samr_array = NULL; struct samr_SamEntry *samr_entries = NULL; @@ -1041,7 +1041,7 @@ NTSTATUS _samr_EnumDomainAliases(struct pipes_struct *p, NTSTATUS status; struct samr_domain_info *dinfo; struct samr_displayentry *aliases; - uint32 num_aliases = 0; + uint32_t num_aliases = 0; struct samr_SamArray *samr_array = NULL; struct samr_SamEntry *samr_entries = NULL; @@ -1110,7 +1110,7 @@ static NTSTATUS init_samr_dispinfo_1(TALLOC_CTX *ctx, uint32_t start_idx, struct samr_displayentry *entries) { - uint32 i; + uint32_t i; DEBUG(10, ("init_samr_dispinfo_1: num_entries: %d\n", num_entries)); @@ -1307,15 +1307,15 @@ NTSTATUS _samr_QueryDisplayInfo(struct pipes_struct *p, { NTSTATUS status; struct samr_domain_info *dinfo; - uint32 struct_size=0x20; /* W2K always reply that, client doesn't care */ + uint32_t struct_size=0x20; /* W2K always reply that, client doesn't care */ - uint32 max_entries = r->in.max_entries; + uint32_t max_entries = r->in.max_entries; union samr_DispInfo *disp_info = r->out.info; - uint32 temp_size=0; + uint32_t temp_size=0; NTSTATUS disp_ret = NT_STATUS_UNSUCCESSFUL; - uint32 num_account = 0; + uint32_t num_account = 0; enum remote_arch_types ra_type = get_remote_arch(); int max_sam_entries = (ra_type == RA_WIN95) ? MAX_SAM_ENTRIES_W95 : MAX_SAM_ENTRIES_W2K; struct samr_displayentry *entries = NULL; @@ -1633,7 +1633,7 @@ NTSTATUS _samr_LookupNames(struct pipes_struct *p, { struct samr_domain_info *dinfo; NTSTATUS status; - uint32 *rid; + uint32_t *rid; enum lsa_SidType *type; int i; int num_rids = r->in.num_names; @@ -1654,7 +1654,7 @@ NTSTATUS _samr_LookupNames(struct pipes_struct *p, DEBUG(5,("_samr_LookupNames: truncating entries to %d\n", num_rids)); } - rid = talloc_array(p->mem_ctx, uint32, num_rids); + rid = talloc_array(p->mem_ctx, uint32_t, num_rids); NT_STATUS_HAVE_NO_MEMORY(rid); type = talloc_array(p->mem_ctx, enum lsa_SidType, num_rids); @@ -1917,7 +1917,7 @@ NTSTATUS _samr_ChangePasswordUser3(struct pipes_struct *p, NT_STATUS_EQUAL(status, NT_STATUS_ACCOUNT_RESTRICTION)) { time_t u_expire, u_min_age; - uint32 account_policy_temp; + uint32_t account_policy_temp; dominfo = talloc_zero(p->mem_ctx, struct samr_DomInfo1); if (!dominfo) { @@ -1976,7 +1976,7 @@ NTSTATUS _samr_ChangePasswordUser3(struct pipes_struct *p, makes a SAMR_R_LOOKUP_RIDS structure. ********************************************************************/ -static bool make_samr_lookup_rids(TALLOC_CTX *ctx, uint32 num_names, +static bool make_samr_lookup_rids(TALLOC_CTX *ctx, uint32_t num_names, const char **names, struct lsa_String **lsa_name_array_p) { @@ -2013,7 +2013,7 @@ NTSTATUS _samr_LookupRids(struct pipes_struct *p, NTSTATUS status; const char **names; enum lsa_SidType *attrs = NULL; - uint32 *wire_attrs = NULL; + uint32_t *wire_attrs = NULL; int num_rids = (int)r->in.num_rids; int i; struct lsa_Strings names_array; @@ -2038,7 +2038,7 @@ NTSTATUS _samr_LookupRids(struct pipes_struct *p, if (num_rids) { names = talloc_zero_array(p->mem_ctx, const char *, num_rids); attrs = talloc_zero_array(p->mem_ctx, enum lsa_SidType, num_rids); - wire_attrs = talloc_zero_array(p->mem_ctx, uint32, num_rids); + wire_attrs = talloc_zero_array(p->mem_ctx, uint32_t, num_rids); if ((names == NULL) || (attrs == NULL) || (wire_attrs==NULL)) return NT_STATUS_NO_MEMORY; @@ -2062,9 +2062,9 @@ NTSTATUS _samr_LookupRids(struct pipes_struct *p, return NT_STATUS_NO_MEMORY; } - /* Convert from enum lsa_SidType to uint32 for wire format. */ + /* Convert from enum lsa_SidType to uint32_t for wire format. */ for (i = 0; i < num_rids; i++) { - wire_attrs[i] = (uint32)attrs[i]; + wire_attrs[i] = (uint32_t)attrs[i]; } names_array.count = num_rids; @@ -2093,8 +2093,8 @@ NTSTATUS _samr_OpenUser(struct pipes_struct *p, struct samr_domain_info *dinfo; struct samr_user_info *uinfo; struct security_descriptor *psd = NULL; - uint32 acc_granted; - uint32 des_access = r->in.access_mask; + uint32_t acc_granted; + uint32_t des_access = r->in.access_mask; uint32_t extra_access = 0; size_t sd_size; bool ret; @@ -2835,7 +2835,7 @@ NTSTATUS _samr_QueryUserInfo(struct pipes_struct *p, union samr_UserInfo *user_info = NULL; struct samr_user_info *uinfo; struct dom_sid domain_sid; - uint32 rid; + uint32_t rid; bool ret = false; struct samu *pwd = NULL; uint32_t acc_required, acc_granted; @@ -3054,7 +3054,7 @@ NTSTATUS _samr_GetGroupsForUser(struct pipes_struct *p, struct dom_sid *sids; struct samr_RidWithAttribute dom_gid; struct samr_RidWithAttribute *gids = NULL; - uint32 primary_group_rid; + uint32_t primary_group_rid; uint32_t num_groups = 0; gid_t *unix_gids; uint32_t i, num_gids; @@ -3642,11 +3642,11 @@ NTSTATUS _samr_CreateUser2(struct pipes_struct *p, struct samr_domain_info *dinfo; struct samr_user_info *uinfo; NTSTATUS nt_status; - uint32 acc_granted; + uint32_t acc_granted; struct security_descriptor *psd; size_t sd_size; /* check this, when giving away 'add computer to domain' privs */ - uint32 des_access = GENERIC_RIGHTS_USER_ALL_ACCESS; + uint32_t des_access = GENERIC_RIGHTS_USER_ALL_ACCESS; bool can_add_account = False; /* Which privilege is needed to override the ACL? */ @@ -3797,7 +3797,7 @@ NTSTATUS _samr_Connect(struct pipes_struct *p, { uint32_t acc_granted; struct policy_handle hnd; - uint32 des_access = r->in.access_mask; + uint32_t des_access = r->in.access_mask; NTSTATUS status; /* Access check */ @@ -3842,8 +3842,8 @@ NTSTATUS _samr_Connect2(struct pipes_struct *p, { struct policy_handle hnd; struct security_descriptor *psd = NULL; - uint32 acc_granted; - uint32 des_access = r->in.access_mask; + uint32_t acc_granted; + uint32_t des_access = r->in.access_mask; NTSTATUS nt_status; size_t sd_size; const char *fn = "_samr_Connect2"; @@ -4062,12 +4062,12 @@ NTSTATUS _samr_OpenAlias(struct pipes_struct *p, struct samr_OpenAlias *r) { struct dom_sid sid; - uint32 alias_rid = r->in.rid; + uint32_t alias_rid = r->in.rid; struct samr_alias_info *ainfo; struct samr_domain_info *dinfo; struct security_descriptor *psd = NULL; - uint32 acc_granted; - uint32 des_access = r->in.access_mask; + uint32_t acc_granted; + uint32_t des_access = r->in.access_mask; size_t sd_size; NTSTATUS status; @@ -4679,11 +4679,11 @@ static NTSTATUS set_user_info_23(TALLOC_CTX *mem_ctx, set_user_info_pw ********************************************************************/ -static bool set_user_info_pw(uint8 *pass, const char *rhost, struct samu *pwd) +static bool set_user_info_pw(uint8_t *pass, const char *rhost, struct samu *pwd) { size_t len = 0; char *plaintext_buf = NULL; - uint32 acct_ctrl; + uint32_t acct_ctrl; DEBUG(5, ("Attempting administrator password change for user %s\n", pdb_get_username(pwd))); @@ -5215,7 +5215,7 @@ NTSTATUS _samr_GetAliasMembership(struct pipes_struct *p, struct samr_GetAliasMembership *r) { size_t num_alias_rids; - uint32 *alias_rids; + uint32_t *alias_rids; struct samr_domain_info *dinfo; size_t i; @@ -5342,8 +5342,8 @@ NTSTATUS _samr_QueryGroupMember(struct pipes_struct *p, struct samr_group_info *ginfo; size_t i, num_members; - uint32 *rid=NULL; - uint32 *attr=NULL; + uint32_t *rid=NULL; + uint32_t *attr=NULL; NTSTATUS status; struct samr_RidAttrArray *rids = NULL; @@ -5379,7 +5379,7 @@ NTSTATUS _samr_QueryGroupMember(struct pipes_struct *p, return status; if (num_members) { - attr=talloc_zero_array(p->mem_ctx, uint32, num_members); + attr=talloc_zero_array(p->mem_ctx, uint32_t, num_members); if (attr == NULL) { return NT_STATUS_NO_MEMORY; } @@ -5480,7 +5480,7 @@ NTSTATUS _samr_AddGroupMember(struct pipes_struct *p, { struct samr_group_info *ginfo; NTSTATUS status; - uint32 group_rid; + uint32_t group_rid; ginfo = policy_handle_find(p, r->in.group_handle, SAMR_GROUP_ACCESS_ADD_MEMBER, NULL, @@ -5519,7 +5519,7 @@ NTSTATUS _samr_DeleteGroupMember(struct pipes_struct *p, { struct samr_group_info *ginfo; NTSTATUS status; - uint32 group_rid; + uint32_t group_rid; /* * delete the group member named r->in.rid @@ -5630,7 +5630,7 @@ NTSTATUS _samr_DeleteDomainGroup(struct pipes_struct *p, { struct samr_group_info *ginfo; NTSTATUS status; - uint32 group_rid; + uint32_t group_rid; DEBUG(5, ("samr_DeleteDomainGroup: %d\n", __LINE__)); @@ -5907,7 +5907,7 @@ NTSTATUS _samr_QueryGroupInfo(struct pipes_struct *p, switch (r->in.level) { case 1: { - uint32 *members; + uint32_t *members; size_t num_members; become_root(); @@ -5937,7 +5937,7 @@ NTSTATUS _samr_QueryGroupInfo(struct pipes_struct *p, break; case 5: { /* - uint32 *members; + uint32_t *members; size_t num_members; */ @@ -6196,8 +6196,8 @@ NTSTATUS _samr_OpenGroup(struct pipes_struct *p, struct samr_domain_info *dinfo; struct samr_group_info *ginfo; struct security_descriptor *psd = NULL; - uint32 acc_granted; - uint32 des_access = r->in.access_mask; + uint32_t acc_granted; + uint32_t des_access = r->in.access_mask; size_t sd_size; NTSTATUS status; bool ret; diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 482f711f757..0639b87a559 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -86,21 +86,21 @@ struct printer_handle { struct printer_handle *prev, *next; bool document_started; bool page_started; - uint32 jobid; /* jobid in printing backend */ + uint32_t jobid; /* jobid in printing backend */ int printer_type; const char *servername; fstring sharename; - uint32 type; - uint32 access_granted; + uint32_t type; + uint32_t access_granted; struct { - uint32 flags; - uint32 options; + uint32_t flags; + uint32_t options; fstring localmachine; - uint32 printerlocal; + uint32_t printerlocal; struct spoolss_NotifyOption *option; struct policy_handle cli_hnd; struct notify_back_channel *cli_chan; - uint32 change; + uint32_t change; /* are we in a FindNextPrinterChangeNotify() call? */ bool fnpcn; struct messaging_context *msg_ctx; diff --git a/source3/rpc_server/srv_access_check.c b/source3/rpc_server/srv_access_check.c index f27d8ecb867..7d4a6ae1c3a 100644 --- a/source3/rpc_server/srv_access_check.c +++ b/source3/rpc_server/srv_access_check.c @@ -48,7 +48,7 @@ NTSTATUS access_check_object( struct security_descriptor *psd, struct security_token *token, enum sec_privilege needed_priv_1, enum sec_privilege needed_priv_2, uint32_t rights_mask, - uint32_t des_access, uint32 *acc_granted, + uint32_t des_access, uint32_t *acc_granted, const char *debug ) { NTSTATUS status = NT_STATUS_ACCESS_DENIED; diff --git a/source3/rpc_server/srv_access_check.h b/source3/rpc_server/srv_access_check.h index 0e161689a86..4f309897c6a 100644 --- a/source3/rpc_server/srv_access_check.h +++ b/source3/rpc_server/srv_access_check.h @@ -35,7 +35,7 @@ NTSTATUS access_check_object( struct security_descriptor *psd, struct security_token *token, enum sec_privilege needed_priv_1, enum sec_privilege needed_priv_2, uint32_t rights_mask, - uint32_t des_access, uint32 *acc_granted, + uint32_t des_access, uint32_t *acc_granted, const char *debug ); void map_max_allowed_access(const struct security_token *nt_token, const struct security_unix_token *unix_token, diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index bbbdefe681f..be79e6ab2ae 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -92,7 +92,7 @@ static int enum_file_fn(const struct share_mode_entry *e, struct byte_range_lock *brl; int num_locks = 0; char *fullpath = NULL; - uint32 permissions; + uint32_t permissions; const char *username; /* If the pid was not found delete the entry from connections.tdb */ @@ -291,7 +291,7 @@ static void map_generic_share_sd_bits(struct security_descriptor *psd) for (i = 0; i < ps_dacl->num_aces; i++) { struct security_ace *psa = &ps_dacl->aces[i]; - uint32 orig_mask = psa->access_mask; + uint32_t orig_mask = psa->access_mask; se_map_generic(&psa->access_mask, &file_generic_mapping); psa->access_mask |= orig_mask; @@ -917,7 +917,7 @@ static WERROR init_srv_sess_info_1(struct pipes_struct *p, W_ERROR_HAVE_NO_MEMORY(ctr1->array); for (num_entries = 0; resume_handle < *total_entries; num_entries++, resume_handle++) { - uint32 connect_time; + uint32_t connect_time; bool guest; connect_time = (uint32_t)(now - session_list[resume_handle].connect_start); @@ -2253,7 +2253,7 @@ WERROR _srvsvc_NetRemoteTOD(struct pipes_struct *p, /* We do this call first as if we do it *after* the gmtime call it overwrites the pointed-to values. JRA */ - uint32 zone = get_time_zone(unixdate)/60; + uint32_t zone = get_time_zone(unixdate)/60; DEBUG(5,("_srvsvc_NetRemoteTOD: %d\n", __LINE__)); @@ -2573,14 +2573,14 @@ error_exit: static const char *server_disks[] = {"C:"}; -static uint32 get_server_disk_count(void) +static uint32_t get_server_disk_count(void) { return sizeof(server_disks)/sizeof(server_disks[0]); } -static uint32 init_server_disk_enum(uint32 *resume) +static uint32_t init_server_disk_enum(uint32_t *resume) { - uint32 server_disk_count = get_server_disk_count(); + uint32_t server_disk_count = get_server_disk_count(); /*resume can be an offset into the list for now*/ @@ -2593,7 +2593,7 @@ static uint32 init_server_disk_enum(uint32 *resume) return server_disk_count - *resume; } -static const char *next_server_disk_enum(uint32 *resume) +static const char *next_server_disk_enum(uint32_t *resume) { const char *disk; @@ -2616,7 +2616,7 @@ static const char *next_server_disk_enum(uint32 *resume) WERROR _srvsvc_NetDiskEnum(struct pipes_struct *p, struct srvsvc_NetDiskEnum *r) { - uint32 i; + uint32_t i; const char *disk_name; TALLOC_CTX *ctx = p->mem_ctx; WERROR werr; @@ -2718,7 +2718,7 @@ static int enum_file_close_fn(const struct share_mode_entry *e, state->r->out.result = ntstatus_to_werror( messaging_send_buf(state->msg_ctx, e->pid, MSG_SMB_CLOSE_FILE, - (uint8 *)msg, sizeof(msg))); + (uint8_t *)msg, sizeof(msg))); return 0; } diff --git a/source3/rpc_server/svcctl/srv_svcctl_nt.c b/source3/rpc_server/svcctl/srv_svcctl_nt.c index 4623113c6e1..d2c6383eb06 100644 --- a/source3/rpc_server/svcctl/srv_svcctl_nt.c +++ b/source3/rpc_server/svcctl/srv_svcctl_nt.c @@ -135,7 +135,7 @@ static struct service_control_op* find_service_by_name( const char *name ) ********************************************************************/ static NTSTATUS svcctl_access_check( struct security_descriptor *sec_desc, struct security_token *token, - uint32 access_desired, uint32 *access_granted ) + uint32_t access_desired, uint32_t *access_granted ) { if ( geteuid() == sec_initial_uid() ) { DEBUG(5,("svcctl_access_check: using root's token\n")); @@ -273,7 +273,7 @@ WERROR _svcctl_OpenSCManagerW(struct pipes_struct *p, struct svcctl_OpenSCManagerW *r) { struct security_descriptor *sec_desc; - uint32 access_granted = 0; + uint32_t access_granted = 0; NTSTATUS status; /* perform access checks */ @@ -298,7 +298,7 @@ WERROR _svcctl_OpenServiceW(struct pipes_struct *p, struct svcctl_OpenServiceW *r) { struct security_descriptor *sec_desc; - uint32 access_granted = 0; + uint32_t access_granted = 0; NTSTATUS status; const char *service = NULL; @@ -507,7 +507,7 @@ WERROR _svcctl_EnumServicesStatusW(struct pipes_struct *p, } *r->out.needed = (buffer_size > r->in.offered) ? buffer_size : r->in.offered; - *r->out.services_returned = (uint32)num_services; + *r->out.services_returned = (uint32_t)num_services; if (r->out.resume_handle) { *r->out.resume_handle = 0; } @@ -614,7 +614,7 @@ WERROR _svcctl_QueryServiceStatusEx(struct pipes_struct *p, struct svcctl_QueryServiceStatusEx *r) { SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle ); - uint32 buffer_size; + uint32_t buffer_size; /* perform access checks */ @@ -733,7 +733,7 @@ WERROR _svcctl_QueryServiceConfigW(struct pipes_struct *p, struct svcctl_QueryServiceConfigW *r) { SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle ); - uint32 buffer_size; + uint32_t buffer_size; WERROR wresult; /* perform access checks */ @@ -951,7 +951,7 @@ WERROR _svcctl_SetServiceObjectSecurity(struct pipes_struct *p, { SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle ); struct security_descriptor *sec_desc = NULL; - uint32 required_access; + uint32_t required_access; NTSTATUS status; if ( !info || !(info->type & (SVC_HANDLE_IS_SERVICE|SVC_HANDLE_IS_SCM)) ) diff --git a/source3/rpc_server/winreg/srv_winreg_nt.c b/source3/rpc_server/winreg/srv_winreg_nt.c index 40362fa71d6..f45c3b9ff9d 100644 --- a/source3/rpc_server/winreg/srv_winreg_nt.c +++ b/source3/rpc_server/winreg/srv_winreg_nt.c @@ -866,7 +866,7 @@ WERROR _winreg_GetKeySecurity(struct pipes_struct *p, struct registry_key *key = find_regkey_by_hnd(p, r->in.handle); WERROR err = WERR_OK; struct security_descriptor *secdesc = NULL; - uint8 *data = NULL; + uint8_t *data = NULL; size_t len = 0; if ( !key )