sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Convert all uint8/16/32 to _t in all modules.

Browse Source 
Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Richard Sharpe 2015-05-02 20:11:02 -07:00 committed by Jeremy Allison
parent f9056de9bf
commit e60cc280d6
28 changed files with 134 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/modules/nfs4_acls.c
View File

@ -40,7 +40,7 @@ extern const struct generic_mapping file_generic_mapping;
#define SMB_ACE4_INT_MAGIC 0x76F8A967
typedef struct _SMB_ACE4_INT_T
{
uint32 magic;
uint32_t magic;
SMB_ACE4PROP_T prop;
void *next;
} SMB_ACE4_INT_T;
@ -48,9 +48,9 @@ typedef struct _SMB_ACE4_INT_T
#define SMB_ACL4_INT_MAGIC 0x29A3E792
typedef struct _SMB_ACL4_INT_T
{
uint32 magic;
uint32_t magic;
uint16_t controlflags;
uint32 naces;
uint32_t naces;
SMB_ACE4_INT_T *first;
SMB_ACE4_INT_T *last;
} SMB_ACL4_INT_T;
@ -281,7 +281,7 @@ SMB4ACE_T *smb_first_ace4(SMB4ACL_T *theacl)
return (SMB4ACE_T *)aclint->first;
}
uint32 smb_get_naces(SMB4ACL_T *theacl)
uint32_t smb_get_naces(SMB4ACL_T *theacl)
{
SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
if (aclint==NULL)
@ -525,7 +525,7 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx,
static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
smbacl4_vfs_params *params,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc,
SMB4ACL_T *theacl)
@ -583,7 +583,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
}
NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc,
SMB4ACL_T *theacl)
@ -608,7 +608,7 @@ NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
NTSTATUS smb_get_nt_acl_nfs4(struct connection_struct *conn,
const char *name,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc,
SMB4ACL_T *theacl)
@ -915,7 +915,7 @@ static SMB4ACL_T *smbacl4_win2nfs4(
)
{
SMB4ACL_T *theacl;
uint32 i;
uint32_t i;
const char *filename = fsp->fsp_name->base_name;
DEBUG(10, ("smbacl4_win2nfs4 invoked\n"));
@ -959,7 +959,7 @@ static SMB4ACL_T *smbacl4_win2nfs4(
}
NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd,
set_nfs4acl_native_fn_t set_nfs4_native)
{

24
source3/modules/nfs4_acls.h
View File

@ -31,9 +31,9 @@
* used in the NFS4 ACL structures.
*/
typedef union _SMB_NFS4_ACEWHOID_T {
uid_t uid; /* User id */
gid_t gid; /* Group id */
uint32 special_id; /* Identifies special identities in NFS4 */
uid_t uid; /* User id */
gid_t gid; /* Group id */
uint32_t special_id; /* Identifies special identities in NFS4 */
#define SMB_ACE4_WHO_OWNER 0x00000001 /*The owner of the file. */
#define SMB_ACE4_WHO_GROUP 0x00000002 /*The group associated with the file. */
@ -46,11 +46,11 @@ typedef union _SMB_NFS4_ACEWHOID_T {
#define SMB_ACE4_WHO_AUTHENTICATED 0x00000009 /*Any authenticated user (opposite of ANONYMOUS) */
#define SMB_ACE4_WHO_SERVICE 0x0000000A /*Access from a system service. */
#define SMB_ACE4_WHO_MAX SMB_ACE4_WHO_SERVICE /* largest valid ACE4_WHO */
uint32 id;
uint32_t id;
} SMB_NFS4_ACEWHOID_T;
typedef struct _SMB_ACE4PROP_T {
uint32 flags; /* Bit mask defining details of ACE */
uint32_t flags; /* Bit mask defining details of ACE */
/*The following are constants for flags field */
/* #define SMB_ACE4_ID_NOT_VALID 0x00000001 - from aix/jfs2 */
#define SMB_ACE4_ID_SPECIAL 0x00000002
@ -59,7 +59,7 @@ typedef struct _SMB_ACE4PROP_T {
/* The following part of ACE has the same layout as NFSv4 wire format. */
uint32 aceType; /* Type of ACE PERMIT/ALLOW etc*/
uint32_t aceType; /* Type of ACE PERMIT/ALLOW etc*/
/*The constants used for the type field (acetype4) are as follows: */
#define SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE 0x00000000
#define SMB_ACE4_ACCESS_DENIED_ACE_TYPE 0x00000001
@ -67,7 +67,7 @@ typedef struct _SMB_ACE4PROP_T {
#define SMB_ACE4_SYSTEM_ALARM_ACE_TYPE 0x00000003
#define SMB_ACE4_MAX_TYPE ACE4_SYSTEM_ALARM_ACE_TYPE /* largest valid ACE4_TYPE */
uint32 aceFlags; /* Controls Inheritance and such */
uint32_t aceFlags; /* Controls Inheritance and such */
/*The bitmask constants used for the flag field are as follows: */
#define SMB_ACE4_FILE_INHERIT_ACE 0x00000001
#define SMB_ACE4_DIRECTORY_INHERIT_ACE 0x00000002
@ -81,7 +81,7 @@ typedef struct _SMB_ACE4PROP_T {
| SMB_ACE4_NO_PROPAGATE_INHERIT_ACE | SMB_ACE4_INHERIT_ONLY_ACE | SMB_ACE4_SUCCESSFUL_ACCESS_ACE_FLAG \
| SMB_ACE4_FAILED_ACCESS_ACE_FLAG | SMB_ACE4_IDENTIFIER_GROUP | SMB_ACE4_INHERITED_ACE)
uint32 aceMask; /* Access rights */
uint32_t aceMask; /* Access rights */
/*The bitmask constants used for the access mask field are as follows: */
#define SMB_ACE4_READ_DATA 0x00000001
#define SMB_ACE4_LIST_DIRECTORY 0x00000001
@ -128,20 +128,20 @@ SMB4ACE_T *smb_first_ace4(SMB4ACL_T *theacl);
/* Returns NULL in the end - or error */
SMB4ACE_T *smb_next_ace4(SMB4ACE_T *ace);
uint32 smb_get_naces(SMB4ACL_T *theacl);
uint32_t smb_get_naces(SMB4ACL_T *theacl);
uint16_t smbacl4_get_controlflags(SMB4ACL_T *theacl);
bool smbacl4_set_controlflags(SMB4ACL_T *theacl, uint16_t controlflags);
NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc, SMB4ACL_T *theacl);
NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
const char *name,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc, SMB4ACL_T *theacl);
@ -150,7 +150,7 @@ NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
typedef bool (*set_nfs4acl_native_fn_t)(vfs_handle_struct *handle, files_struct *, SMB4ACL_T *);
NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd,
set_nfs4acl_native_fn_t set_nfs4_native);

6
source3/modules/vfs_acl_tdb.c
View File

@ -99,7 +99,7 @@ static struct db_record *acl_tdb_lock(TALLOC_CTX *mem_ctx,
struct db_context *db,
const struct file_id *id)
{
uint8 id_buf[16];
uint8_t id_buf[16];
/* For backwards compatibility only store the dev/inode. */
push_file_id_16((char *)id_buf, id);
@ -146,7 +146,7 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx,
const char *name,
DATA_BLOB *pblob)
{
uint8 id_buf[16];
uint8_t id_buf[16];
TDB_DATA data;
struct file_id id;
struct db_context *db = acl_db;
@ -202,7 +202,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle,
files_struct *fsp,
DATA_BLOB *pblob)
{
uint8 id_buf[16];
uint8_t id_buf[16];
struct file_id id;
TDB_DATA data;
struct db_context *db = acl_db;

60
source3/modules/vfs_afsacl.c
View File

@ -52,7 +52,7 @@ struct afs_ace {
char *name;
struct dom_sid sid;
enum lsa_SidType type;
uint32 rights;
uint32_t rights;
struct afs_ace *next;
};
@ -65,7 +65,7 @@ struct afs_acl {
struct afs_iob {
char *in, *out;
uint16 in_size, out_size;
uint16_t in_size, out_size;
};
@ -110,7 +110,7 @@ static struct afs_ace *clone_afs_ace(TALLOC_CTX *mem_ctx, struct afs_ace *ace)
static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
bool positive,
const char *name, uint32 rights)
const char *name, uint32_t rights)
{
struct dom_sid sid;
enum lsa_SidType type;
@ -193,7 +193,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
static void add_afs_ace(struct afs_acl *acl,
bool positive,
const char *name, uint32 rights)
const char *name, uint32_t rights)
{
struct afs_ace *ace;
@ -262,7 +262,7 @@ static bool parse_afs_acl(struct afs_acl *acl, const char *acl_str)
const char *namep;
fstring name;
uint32 rights;
uint32_t rights;
char *space;
namep = p;
@ -333,9 +333,9 @@ static bool unparse_afs_acl(struct afs_acl *acl, char *acl_str)
return true;
}
static uint32 afs_to_nt_file_rights(uint32 rights)
static uint32_t afs_to_nt_file_rights(uint32_t rights)
{
uint32 result = 0;
uint32_t result = 0;
if (rights & PRSFS_READ)
result |= FILE_READ_DATA | FILE_READ_EA |
@ -355,8 +355,8 @@ static uint32 afs_to_nt_file_rights(uint32 rights)
return result;
}
static void afs_to_nt_dir_rights(uint32 afs_rights, uint32 *nt_rights,
uint8 *flag)
static void afs_to_nt_dir_rights(uint32_t afs_rights, uint32_t *nt_rights,
uint8_t *flag)
{
*nt_rights = 0;
*flag = SEC_ACE_FLAG_OBJECT_INHERIT |
@ -475,10 +475,10 @@ static void merge_afs_acls(struct afs_acl *dir_acl,
#define PERMS_FULL 0x001f01ff
static struct static_dir_ace_mapping {
uint8 type;
uint8 flags;
uint32 mask;
uint32 afs_rights;
uint8_t type;
uint8_t flags;
uint32_t mask;
uint32_t afs_rights;
} ace_mappings[] = {
/* Full control */
@ -532,11 +532,11 @@ static struct static_dir_ace_mapping {
{ 0, 0, 0, 9999 }
};
static uint32 nt_to_afs_dir_rights(const char *filename, const struct security_ace *ace)
static uint32_t nt_to_afs_dir_rights(const char *filename, const struct security_ace *ace)
{
uint32 result = 0;
uint32 rights = ace->access_mask;
uint8 flags = ace->flags;
uint32_t result = 0;
uint32_t rights = ace->access_mask;
uint8_t flags = ace->flags;
struct static_dir_ace_mapping *m;
@ -573,10 +573,10 @@ static uint32 nt_to_afs_dir_rights(const char *filename, const struct security_a
return result;
}
static uint32 nt_to_afs_file_rights(const char *filename, const struct security_ace *ace)
static uint32_t nt_to_afs_file_rights(const char *filename, const struct security_ace *ace)
{
uint32 result = 0;
uint32 rights = ace->access_mask;
uint32_t result = 0;
uint32_t rights = ace->access_mask;
if (rights & (GENERIC_READ_ACCESS|FILE_READ_DATA)) {
result |= PRSFS_READ;
@ -591,7 +591,7 @@ static uint32 nt_to_afs_file_rights(const char *filename, const struct security_
static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
SMB_STRUCT_STAT *psbuf,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -620,7 +620,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
while (afs_ace != NULL) {
uint32_t nt_rights;
uint8 flag = SEC_ACE_FLAG_OBJECT_INHERIT |
uint8_t flag = SEC_ACE_FLAG_OBJECT_INHERIT |
SEC_ACE_FLAG_CONTAINER_INHERIT;
if (afs_ace->type == SID_NAME_UNKNOWN) {
@ -660,7 +660,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
struct connection_struct *conn,
struct smb_filename *smb_fname,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -682,7 +682,7 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
static size_t afs_fto_nt_acl(struct afs_acl *afs_acl,
struct files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -727,9 +727,9 @@ static bool mappable_sid(const struct dom_sid *sid)
}
static bool nt_to_afs_acl(const char *filename,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd,
uint32 (*nt_to_afs_rights)(const char *filename,
uint32_t (*nt_to_afs_rights)(const char *filename,
const struct security_ace *ace),
struct afs_acl *afs_acl)
{
@ -899,7 +899,7 @@ static void merge_unknown_aces(struct afs_acl *src, struct afs_acl *dst)
}
static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd)
{
struct afs_acl old_afs_acl, new_afs_acl;
@ -1008,7 +1008,7 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
static NTSTATUS afsacl_fget_nt_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -1031,7 +1031,7 @@ static NTSTATUS afsacl_fget_nt_acl(struct vfs_handle_struct *handle,
}
static NTSTATUS afsacl_get_nt_acl(struct vfs_handle_struct *handle,
const char *name, uint32 security_info,
const char *name, uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -1064,7 +1064,7 @@ static NTSTATUS afsacl_get_nt_acl(struct vfs_handle_struct *handle,
static NTSTATUS afsacl_fset_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd)
{
return afs_set_nt_acl(handle, fsp, security_info_sent, psd);

4
source3/modules/vfs_aio_linux.c
View File

@ -36,7 +36,7 @@ static unsigned num_busy;
static void aio_linux_done(struct tevent_context *event_ctx,
struct tevent_fd *event,
uint16 flags, void *private_data);
uint16_t flags, void *private_data);
/************************************************************************
Housekeeping. Cleanup if no activity for 30 seconds.
@ -249,7 +249,7 @@ static struct tevent_req *aio_linux_fsync_send(
static void aio_linux_done(struct tevent_context *event_ctx,
struct tevent_fd *event,
uint16 flags, void *private_data)
uint16_t flags, void *private_data)
{
uint64_t num_events = 0;

4
source3/modules/vfs_aio_pthread.c
View File

@ -41,7 +41,7 @@ static bool init_aio_threadpool(struct tevent_context *ev_ctx,
struct pthreadpool **pp_pool,
void (*completion_fn)(struct tevent_context *,
struct tevent_fd *,
uint16,
uint16_t,
void *))
{
struct tevent_fd *sock_event = NULL;
@ -152,7 +152,7 @@ static struct aio_open_private_data *find_open_private_data_by_mid(uint64_t mid)
static void aio_open_handle_completion(struct tevent_context *event_ctx,
struct tevent_fd *event,
uint16 flags,
uint16_t flags,
void *p)
{
struct aio_open_private_data *opd = NULL;

20
source3/modules/vfs_aixacl2.c
View File

@ -154,7 +154,7 @@ static bool aixjfs2_get_nfs4_acl(TALLOC_CTX *mem_ctx, const char *name,
}
static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle,
files_struct *fsp, uint32 security_info,
files_struct *fsp, uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -187,7 +187,7 @@ static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle,
static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle,
const char *name,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -321,9 +321,9 @@ static int aixjfs2_query_acl_support(
acl_type_t *pacl_type_info
)
{
acl_types_list_t acl_type_list;
size_t acl_type_list_len = sizeof(acl_types_list_t);
uint32_t i;
acl_types_list_t acl_type_list;
size_t acl_type_list_len = sizeof(acl_types_list_t);
uint32_t i;
memset(&acl_type_list, 0, sizeof(acl_type_list));
@ -350,9 +350,9 @@ static bool aixjfs2_process_smbacl(vfs_handle_struct *handle, files_struct *fsp,
SMB4ACE_T *smbace;
TALLOC_CTX *mem_ctx;
nfs4_acl_int_t *jfs2acl;
int32_t entryLen;
uint32 aclLen, naces;
int rc;
int32_t entryLen;
uint32_t aclLen, naces;
int rc;
acl_type_t acltype;
DEBUG(10, ("jfs2_process_smbacl invoked on %s\n", fsp_str_dbg(fsp)));
@ -420,7 +420,7 @@ static bool aixjfs2_process_smbacl(vfs_handle_struct *handle, files_struct *fsp,
return True;
}
static NTSTATUS aixjfs2_set_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)
static NTSTATUS aixjfs2_set_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp, uint32_t security_info_sent, const struct security_descriptor *psd)
{
acl_type_t acl_type_info;
NTSTATUS result = NT_STATUS_ACCESS_DENIED;
@ -444,7 +444,7 @@ static NTSTATUS aixjfs2_set_nt_acl_common(vfs_handle_struct *handle, files_struc
return result;
}
NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)
NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32_t security_info_sent, const struct security_descriptor *psd)
{
return aixjfs2_set_nt_acl_common(handle, fsp, security_info_sent, psd);
}

2
source3/modules/vfs_audit.c
View File

@ -106,7 +106,7 @@ static void audit_disconnect(vfs_handle_struct *handle)
return;
}
static DIR *audit_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
static DIR *audit_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32_t attr)
{
DIR *result;

2
source3/modules/vfs_cap.c
View File

@ -41,7 +41,7 @@ static uint64_t cap_disk_free(vfs_handle_struct *handle, const char *path,
return SMB_VFS_NEXT_DISK_FREE(handle, cappath, bsize, dfree, dsize);
}
static DIR *cap_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
static DIR *cap_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32_t attr)
{
char *capname = capencode(talloc_tos(), fname);

4
source3/modules/vfs_catia.c
View File

@ -271,7 +271,7 @@ static NTSTATUS catia_string_replace_allocate(connection_struct *conn,
static DIR *catia_opendir(vfs_handle_struct *handle,
const char *fname,
const char *mask,
uint32 attr)
uint32_t attr)
{
char *name_mapped = NULL;
NTSTATUS status;
@ -729,7 +729,7 @@ catia_streaminfo(struct vfs_handle_struct *handle,
static NTSTATUS
catia_get_nt_acl(struct vfs_handle_struct *handle,
const char *path,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{

6
source3/modules/vfs_ceph.c
View File

@ -251,7 +251,7 @@ static int cephwrap_statvfs(struct vfs_handle_struct *handle, const char *path,
/* Directory operations */
static DIR *cephwrap_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
static DIR *cephwrap_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32_t attr)
{
int ret = 0;
struct ceph_dir_result *result;
@ -271,7 +271,7 @@ static DIR *cephwrap_opendir(struct vfs_handle_struct *handle, const char *fnam
static DIR *cephwrap_fdopendir(struct vfs_handle_struct *handle,
struct files_struct *fsp,
const char *mask,
uint32 attributes)
uint32_t attributes)
{
int ret = 0;
struct ceph_dir_result *result;
@ -910,7 +910,7 @@ static bool cephwrap_lock(struct vfs_handle_struct *handle, files_struct *fsp, i
}
static int cephwrap_kernel_flock(struct vfs_handle_struct *handle, files_struct *fsp,
uint32 share_mode, uint32 access_mask)
uint32_t share_mode, uint32_t access_mask)
{
DEBUG(10, ("[CEPH] kernel_flock\n"));
/*

4
source3/modules/vfs_default_quota.c
View File

@ -120,7 +120,7 @@ static int default_quota_get_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYP
case SMB_USER_FS_QUOTA_TYPE:
{
unid_t qid;
uint32 qflags = dq->qflags;
uint32_t qflags = dq->qflags;
qid.uid = DEFAULT_QUOTA_UID(handle);
SMB_VFS_NEXT_GET_QUOTA(handle, SMB_USER_QUOTA_TYPE, qid, dq);
dq->qflags = qflags;
@ -130,7 +130,7 @@ static int default_quota_get_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYP
case SMB_GROUP_FS_QUOTA_TYPE:
{
unid_t qid;
uint32 qflags = dq->qflags;
uint32_t qflags = dq->qflags;
qid.gid = DEFAULT_QUOTA_GID(handle);
SMB_VFS_NEXT_GET_QUOTA(handle, SMB_GROUP_QUOTA_TYPE, qid, dq);
dq->qflags = qflags;

4
source3/modules/vfs_dirsort.c
View File

@ -114,7 +114,7 @@ static bool open_and_sort_dir(vfs_handle_struct *handle,
static DIR *dirsort_opendir(vfs_handle_struct *handle,
const char *fname, const char *mask,
uint32 attr)
uint32_t attr)
{
struct dirsort_privates *list_head = NULL;
struct dirsort_privates *data = NULL;
@ -163,7 +163,7 @@ static DIR *dirsort_opendir(vfs_handle_struct *handle,
static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
files_struct *fsp,
const char *mask,
uint32 attr)
uint32_t attr)
{
struct dirsort_privates *list_head = NULL;
struct dirsort_privates *data = NULL;

2
source3/modules/vfs_extd_audit.c
View File

@ -116,7 +116,7 @@ static void audit_disconnect(vfs_handle_struct *handle)
return;
}
static DIR *audit_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
static DIR *audit_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32_t attr)
{
DIR *result;

4
source3/modules/vfs_fruit.c
View File

@ -3346,7 +3346,7 @@ fail:
static NTSTATUS fruit_fget_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -3404,7 +3404,7 @@ static NTSTATUS fruit_fget_nt_acl(vfs_handle_struct *handle,
static NTSTATUS fruit_fset_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd)
{
NTSTATUS status;

8
source3/modules/vfs_glusterfs.c
View File

@ -355,7 +355,7 @@ static uint32_t vfs_gluster_fs_capabilities(struct vfs_handle_struct *handle,
static DIR *vfs_gluster_opendir(struct vfs_handle_struct *handle,
const char *path, const char *mask,
uint32 attributes)
uint32_t attributes)
{
glfs_fd_t *fd;
@ -370,7 +370,7 @@ static DIR *vfs_gluster_opendir(struct vfs_handle_struct *handle,
static DIR *vfs_gluster_fdopendir(struct vfs_handle_struct *handle,
files_struct *fsp, const char *mask,
uint32 attributes)
uint32_t attributes)
{
return (DIR *) *(glfs_fd_t **)VFS_FETCH_FSP_EXTENSION(handle, fsp);
}
@ -542,7 +542,7 @@ static void aio_glusterfs_done(glfs_fd_t *fd, ssize_t ret, void *data)
*/
static void aio_tevent_fd_done(struct tevent_context *event_ctx,
struct tevent_fd *fde,
uint16 flags, void *data)
uint16_t flags, void *data)
{
struct tevent_req *req = NULL;
int sts = 0;
@ -974,7 +974,7 @@ static bool vfs_gluster_lock(struct vfs_handle_struct *handle,
}
static int vfs_gluster_kernel_flock(struct vfs_handle_struct *handle,
files_struct *fsp, uint32 share_mode,
files_struct *fsp, uint32_t share_mode,
uint32_t access_mask)
{
errno = ENOSYS;

18
source3/modules/vfs_gpfs.c
View File

@ -73,8 +73,8 @@ static inline gpfs_ace_v4_t *gpfs_ace_ptr(gpfs_acl_t *gacl, unsigned int i)
return &gacl->ace_v4[i];
}
static bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
uint32 share_access)
static bool set_gpfs_sharemode(files_struct *fsp, uint32_t access_mask,
uint32_t share_access)
{
unsigned int allow = GPFS_SHARE_NONE;
unsigned int deny = GPFS_DENY_NONE;
@ -119,7 +119,7 @@ static bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
}
static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
uint32 share_mode, uint32 access_mask)
uint32_t share_mode, uint32_t access_mask)
{
struct gpfs_config_data *config;
@ -537,7 +537,7 @@ static int gpfs_get_nfs4_acl(TALLOC_CTX *mem_ctx, const char *fname, SMB4ACL_T *
}
static NTSTATUS gpfsacl_fget_nt_acl(vfs_handle_struct *handle,
files_struct *fsp, uint32 security_info,
files_struct *fsp, uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -585,7 +585,7 @@ static NTSTATUS gpfsacl_fget_nt_acl(vfs_handle_struct *handle,
static NTSTATUS gpfsacl_get_nt_acl(vfs_handle_struct *handle,
const char *name,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx, struct security_descriptor **ppdesc)
{
SMB4ACL_T *pacl = NULL;
@ -759,7 +759,7 @@ static bool gpfsacl_process_smbacl(vfs_handle_struct *handle,
return True;
}
static NTSTATUS gpfsacl_set_nt_acl_internal(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)
static NTSTATUS gpfsacl_set_nt_acl_internal(vfs_handle_struct *handle, files_struct *fsp, uint32_t security_info_sent, const struct security_descriptor *psd)
{
struct gpfs_acl *acl;
NTSTATUS result = NT_STATUS_ACCESS_DENIED;
@ -791,7 +791,7 @@ static NTSTATUS gpfsacl_set_nt_acl_internal(vfs_handle_struct *handle, files_str
return result;
}
static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)
static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32_t security_info_sent, const struct security_descriptor *psd)
{
struct gpfs_config_data *config;
@ -1261,9 +1261,9 @@ static int gpfsacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
* Assumed: mode bits are shiftable and standard
* Output: the new aceMask field for an smb nfs4 ace
*/
static uint32 gpfsacl_mask_filter(uint32 aceType, uint32 aceMask, uint32 rwx)
static uint32_t gpfsacl_mask_filter(uint32_t aceType, uint32_t aceMask, uint32_t rwx)
{
const uint32 posix_nfs4map[3] = {
const uint32_t posix_nfs4map[3] = {
SMB_ACE4_EXECUTE, /* execute */
SMB_ACE4_WRITE_DATA | SMB_ACE4_APPEND_DATA, /* write; GPFS specific */
SMB_ACE4_READ_DATA /* read */

6
source3/modules/vfs_media_harmony.c
View File

@ -762,7 +762,7 @@ err:
static DIR *mh_opendir(vfs_handle_struct *handle,
const char *fname,
const char *mask,
uint32 attr)
uint32_t attr)
{
struct mh_dirinfo_struct *dirInfo;
@ -802,7 +802,7 @@ err:
static DIR *mh_fdopendir(vfs_handle_struct *handle,
files_struct *fsp,
const char *mask,
uint32 attr)
uint32_t attr)
{
struct mh_dirinfo_struct *dirInfo = NULL;
DIR *dirstream;
@ -2017,7 +2017,7 @@ out:
*/
static NTSTATUS mh_get_nt_acl(vfs_handle_struct *handle,
const char *name,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{

4
source3/modules/vfs_netatalk.c
View File

@ -177,7 +177,7 @@ static void atalk_rrmdir(TALLOC_CTX *ctx, char *path)
/* Directory operations */
static DIR *atalk_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
static DIR *atalk_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32_t attr)
{
DIR *ret = 0;
@ -198,7 +198,7 @@ static DIR *atalk_opendir(struct vfs_handle_struct *handle, const char *fname, c
return ret;
}
static DIR *atalk_fdopendir(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
static DIR *atalk_fdopendir(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32_t attr)
{
DIR *ret = 0;

16
source3/modules/vfs_nfs4acl_xattr.c
View File

@ -88,10 +88,10 @@ static NTSTATUS nfs4_get_nfs4_acl_common(TALLOC_CTX *mem_ctx,
for(i=0; i<nfs4acl->a_count; i++) {
SMB_ACE4PROP_T aceprop;
aceprop.aceType = (uint32) nfs4acl->ace[i].e_type;
aceprop.aceFlags = (uint32) nfs4acl->ace[i].e_flags;
aceprop.aceMask = (uint32) nfs4acl->ace[i].e_mask;
aceprop.who.id = (uint32) nfs4acl->ace[i].e_id;
aceprop.aceType = (uint32_t) nfs4acl->ace[i].e_type;
aceprop.aceFlags = (uint32_t) nfs4acl->ace[i].e_flags;
aceprop.aceMask = (uint32_t) nfs4acl->ace[i].e_mask;
aceprop.who.id = (uint32_t) nfs4acl->ace[i].e_id;
if (!strcmp(nfs4acl->ace[i].e_who,
NFS4ACL_XATTR_OWNER_WHO)) {
aceprop.flags = SMB_ACE4_ID_SPECIAL;
@ -333,7 +333,7 @@ static bool nfs4acl_xattr_fset_smb4acl(vfs_handle_struct *handle,
* using the NFSv4 format conversion
*/
static NTSTATUS nfs4_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd)
{
return smb_set_nt_acl_nfs4(handle, fsp, security_info_sent, psd,
@ -515,7 +515,7 @@ static SMB4ACL_T *nfs4acls_inheritacl(vfs_handle_struct *handle,
static NTSTATUS nfs4acl_xattr_fget_nt_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -539,7 +539,7 @@ static NTSTATUS nfs4acl_xattr_fget_nt_acl(struct vfs_handle_struct *handle,
}
static NTSTATUS nfs4acl_xattr_get_nt_acl(struct vfs_handle_struct *handle,
const char *name, uint32 security_info,
const char *name, uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -565,7 +565,7 @@ static NTSTATUS nfs4acl_xattr_get_nt_acl(struct vfs_handle_struct *handle,
static NTSTATUS nfs4acl_xattr_fset_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd)
{
return nfs4_set_nt_acl(handle, fsp, security_info_sent, psd);

6
source3/modules/vfs_notify_fam.c
View File

@ -69,7 +69,7 @@ static bool fam_connection_initialized = False;
static struct fam_watch_context *fam_notify_list;
static void fam_handler(struct tevent_context *event_ctx,
struct tevent_fd *fd_event,
uint16 flags,
uint16_t flags,
void *private_data);
static NTSTATUS fam_open_connection(FAMConnection *fam_conn,
@ -148,7 +148,7 @@ static void fam_reopen(FAMConnection *fam_conn,
static void fam_handler(struct tevent_context *event_ctx,
struct tevent_fd *fd_event,
uint16 flags,
uint16_t flags,
void *private_data)
{
FAMConnection *fam_conn = (FAMConnection *)private_data;
@ -230,7 +230,7 @@ static NTSTATUS fam_watch(vfs_handle_struct *vfs_handle,
void *private_data,
void *handle_p)
{
const uint32 fam_mask = (FILE_NOTIFY_CHANGE_FILE_NAME|
const uint32_t fam_mask = (FILE_NOTIFY_CHANGE_FILE_NAME|
FILE_NOTIFY_CHANGE_DIR_NAME);
struct fam_watch_context *watch;
void **handle = (void **)handle_p;

4
source3/modules/vfs_scannedonly.c
View File

@ -510,7 +510,7 @@ static bool scannedonly_allow_access(vfs_handle_struct * handle,
static DIR *scannedonly_opendir(vfs_handle_struct * handle,
const char *fname,
const char *mask, uint32 attr)
const char *mask, uint32_t attr)
{
DIR *DIRp;
struct scannedonly_DIR *sDIR;
@ -535,7 +535,7 @@ static DIR *scannedonly_opendir(vfs_handle_struct * handle,
static DIR *scannedonly_fdopendir(vfs_handle_struct * handle,
files_struct *fsp,
const char *mask, uint32 attr)
const char *mask, uint32_t attr)
{
DIR *DIRp;
struct scannedonly_DIR *sDIR;

6
source3/modules/vfs_shadow_copy2.c
View File

@ -661,7 +661,7 @@ static void convert_sbuf(vfs_handle_struct *handle, const char *fname,
static DIR *shadow_copy2_opendir(vfs_handle_struct *handle,
const char *fname,
const char *mask,
uint32 attr)
uint32_t attr)
{
time_t timestamp;
char *stripped;
@ -1405,7 +1405,7 @@ static int shadow_copy2_get_shadow_copy_data(
static NTSTATUS shadow_copy2_fget_nt_acl(vfs_handle_struct *handle,
struct files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -1437,7 +1437,7 @@ static NTSTATUS shadow_copy2_fget_nt_acl(vfs_handle_struct *handle,
static NTSTATUS shadow_copy2_get_nt_acl(vfs_handle_struct *handle,
const char *fname,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{

4
source3/modules/vfs_snapper.c
View File

@ -2407,7 +2407,7 @@ done:
static NTSTATUS snapper_gmt_fget_nt_acl(vfs_handle_struct *handle,
struct files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -2439,7 +2439,7 @@ static NTSTATUS snapper_gmt_fget_nt_acl(vfs_handle_struct *handle,
static NTSTATUS snapper_gmt_get_nt_acl(vfs_handle_struct *handle,
const char *fname,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{

2
source3/modules/vfs_streams_depot.c
View File

@ -121,7 +121,7 @@ static char *stream_dir(vfs_handle_struct *handle,
char *tmp;
char *id_hex;
struct file_id id;
uint8 id_buf[16];
uint8_t id_buf[16];
bool check_valid;
const char *rootdir;

8
source3/modules/vfs_streams_xattr.c
View File

@ -944,9 +944,9 @@ static ssize_t streams_xattr_pwrite(vfs_handle_struct *handle,
}
if ((offset + n) > ea.value.length-1) {
uint8 *tmp;
uint8_t *tmp;
tmp = talloc_realloc(talloc_tos(), ea.value.data, uint8,
tmp = talloc_realloc(talloc_tos(), ea.value.data, uint8_t,
offset + n + 1);
if (tmp == NULL) {
@ -1029,7 +1029,7 @@ static int streams_xattr_ftruncate(struct vfs_handle_struct *handle,
off_t offset)
{
int ret;
uint8 *tmp;
uint8_t *tmp;
struct ea_struct ea;
NTSTATUS status;
struct stream_io *sio =
@ -1052,7 +1052,7 @@ static int streams_xattr_ftruncate(struct vfs_handle_struct *handle,
return -1;
}
tmp = talloc_realloc(talloc_tos(), ea.value.data, uint8,
tmp = talloc_realloc(talloc_tos(), ea.value.data, uint8_t,
offset + 1);
if (tmp == NULL) {

6
source3/modules/vfs_unityed_media.c
View File

@ -553,7 +553,7 @@ err:
static DIR *um_opendir(vfs_handle_struct *handle,
const char *fname,
const char *mask,
uint32 attr)
uint32_t attr)
{
struct um_dirinfo_struct *dirInfo;
@ -590,7 +590,7 @@ err:
static DIR *um_fdopendir(vfs_handle_struct *handle,
files_struct *fsp,
const char *mask,
uint32 attr)
uint32_t attr)
{
struct um_dirinfo_struct *dirInfo = NULL;
DIR *dirstream;
@ -1519,7 +1519,7 @@ err:
static NTSTATUS um_get_nt_acl(vfs_handle_struct *handle,
const char *name,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{

16
source3/modules/vfs_zfsacl.c
View File

@ -79,10 +79,10 @@ static NTSTATUS zfs_get_nt_acl_common(TALLOC_CTX *mem_ctx,
for(i=0; i<naces; i++) {
SMB_ACE4PROP_T aceprop;
aceprop.aceType = (uint32) acebuf[i].a_type;
aceprop.aceFlags = (uint32) acebuf[i].a_flags;
aceprop.aceMask = (uint32) acebuf[i].a_access_mask;
aceprop.who.id = (uint32) acebuf[i].a_who;
aceprop.aceType = (uint32_t) acebuf[i].a_type;
aceprop.aceFlags = (uint32_t) acebuf[i].a_flags;
aceprop.aceMask = (uint32_t) acebuf[i].a_access_mask;
aceprop.who.id = (uint32_t) acebuf[i].a_who;
if(aceprop.aceFlags & ACE_OWNER) {
aceprop.flags = SMB_ACE4_ID_SPECIAL;
@ -183,7 +183,7 @@ static bool zfs_process_smbacl(vfs_handle_struct *handle, files_struct *fsp, SMB
* using the NFSv4 format conversion
*/
static NTSTATUS zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd)
{
return smb_set_nt_acl_nfs4(handle, fsp, security_info_sent, psd,
@ -192,7 +192,7 @@ static NTSTATUS zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp,
uint32 security_info,
uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -214,7 +214,7 @@ static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
}
static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
const char *name, uint32 security_info,
const char *name, uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@ -237,7 +237,7 @@ static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
static NTSTATUS zfsacl_fset_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
uint32 security_info_sent,
uint32_t security_info_sent,
const struct security_descriptor *psd)
{
return zfs_set_nt_acl(handle, fsp, security_info_sent, psd);